Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7c1fe9a7
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7c1fe9a7
编写于
2月 09, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - move search out of platform
上级
31e7084f
变更
49
显示空白变更内容
内联
并排
Showing
49 changed file
with
52 addition
and
52 deletion
+52
-52
src/tsconfig.strictNullChecks.json
src/tsconfig.strictNullChecks.json
+4
-4
src/vs/workbench/api/electron-browser/mainThreadSearch.ts
src/vs/workbench/api/electron-browser/mainThreadSearch.ts
+1
-1
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
+1
-1
src/vs/workbench/api/node/extHost.protocol.ts
src/vs/workbench/api/node/extHost.protocol.ts
+1
-1
src/vs/workbench/api/node/extHostSearch.fileIndex.ts
src/vs/workbench/api/node/extHostSearch.fileIndex.ts
+1
-1
src/vs/workbench/api/node/extHostSearch.ts
src/vs/workbench/api/node/extHostSearch.ts
+1
-1
src/vs/workbench/api/node/extHostWorkspace.ts
src/vs/workbench/api/node/extHostWorkspace.ts
+1
-1
src/vs/workbench/contrib/search/browser/openFileHandler.ts
src/vs/workbench/contrib/search/browser/openFileHandler.ts
+1
-1
src/vs/workbench/contrib/search/browser/searchActions.ts
src/vs/workbench/contrib/search/browser/searchActions.ts
+1
-1
src/vs/workbench/contrib/search/browser/searchResultsView.ts
src/vs/workbench/contrib/search/browser/searchResultsView.ts
+1
-1
src/vs/workbench/contrib/search/browser/searchView.ts
src/vs/workbench/contrib/search/browser/searchView.ts
+1
-1
src/vs/workbench/contrib/search/browser/searchWidget.ts
src/vs/workbench/contrib/search/browser/searchWidget.ts
+1
-1
src/vs/workbench/contrib/search/common/queryBuilder.ts
src/vs/workbench/contrib/search/common/queryBuilder.ts
+1
-1
src/vs/workbench/contrib/search/common/search.ts
src/vs/workbench/contrib/search/common/search.ts
+1
-1
src/vs/workbench/contrib/search/common/searchModel.ts
src/vs/workbench/contrib/search/common/searchModel.ts
+2
-2
src/vs/workbench/contrib/search/electron-browser/search.contribution.ts
...ch/contrib/search/electron-browser/search.contribution.ts
+1
-1
src/vs/workbench/contrib/search/test/browser/openFileHandler.test.ts
...bench/contrib/search/test/browser/openFileHandler.test.ts
+1
-1
src/vs/workbench/contrib/search/test/browser/searchActions.test.ts
...rkbench/contrib/search/test/browser/searchActions.test.ts
+1
-1
src/vs/workbench/contrib/search/test/browser/searchViewlet.test.ts
...rkbench/contrib/search/test/browser/searchViewlet.test.ts
+1
-1
src/vs/workbench/contrib/search/test/common/queryBuilder.test.ts
...workbench/contrib/search/test/common/queryBuilder.test.ts
+1
-1
src/vs/workbench/contrib/search/test/common/searchModel.test.ts
.../workbench/contrib/search/test/common/searchModel.test.ts
+1
-1
src/vs/workbench/contrib/search/test/common/searchResult.test.ts
...workbench/contrib/search/test/common/searchResult.test.ts
+1
-1
src/vs/workbench/electron-browser/shell.ts
src/vs/workbench/electron-browser/shell.ts
+1
-1
src/vs/workbench/services/history/electron-browser/history.ts
...vs/workbench/services/history/electron-browser/history.ts
+1
-1
src/vs/workbench/services/search/common/replace.ts
src/vs/workbench/services/search/common/replace.ts
+1
-1
src/vs/workbench/services/search/common/search.ts
src/vs/workbench/services/search/common/search.ts
+0
-0
src/vs/workbench/services/search/common/searchHelpers.ts
src/vs/workbench/services/search/common/searchHelpers.ts
+1
-1
src/vs/workbench/services/search/node/fileSearch.ts
src/vs/workbench/services/search/node/fileSearch.ts
+1
-1
src/vs/workbench/services/search/node/fileSearchManager.ts
src/vs/workbench/services/search/node/fileSearchManager.ts
+1
-1
src/vs/workbench/services/search/node/rawSearchService.ts
src/vs/workbench/services/search/node/rawSearchService.ts
+1
-1
src/vs/workbench/services/search/node/ripgrepFileSearch.ts
src/vs/workbench/services/search/node/ripgrepFileSearch.ts
+1
-1
src/vs/workbench/services/search/node/ripgrepSearchUtils.ts
src/vs/workbench/services/search/node/ripgrepSearchUtils.ts
+1
-1
src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
...workbench/services/search/node/ripgrepTextSearchEngine.ts
+1
-1
src/vs/workbench/services/search/node/search.ts
src/vs/workbench/services/search/node/search.ts
+1
-1
src/vs/workbench/services/search/node/searchHistoryService.ts
...vs/workbench/services/search/node/searchHistoryService.ts
+1
-1
src/vs/workbench/services/search/node/searchIpc.ts
src/vs/workbench/services/search/node/searchIpc.ts
+1
-1
src/vs/workbench/services/search/node/searchService.ts
src/vs/workbench/services/search/node/searchService.ts
+1
-1
src/vs/workbench/services/search/node/textSearchAdapter.ts
src/vs/workbench/services/search/node/textSearchAdapter.ts
+1
-1
src/vs/workbench/services/search/node/textSearchManager.ts
src/vs/workbench/services/search/node/textSearchManager.ts
+1
-1
src/vs/workbench/services/search/test/common/replace.test.ts
src/vs/workbench/services/search/test/common/replace.test.ts
+1
-1
src/vs/workbench/services/search/test/common/search.test.ts
src/vs/workbench/services/search/test/common/search.test.ts
+1
-1
src/vs/workbench/services/search/test/common/searchHelpers.test.ts
...rkbench/services/search/test/common/searchHelpers.test.ts
+1
-1
src/vs/workbench/services/search/test/node/rawSearchService.test.ts
...kbench/services/search/test/node/rawSearchService.test.ts
+1
-1
src/vs/workbench/services/search/test/node/search.test.ts
src/vs/workbench/services/search/test/node/search.test.ts
+1
-1
src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
...h/services/search/test/node/textSearch.integrationTest.ts
+1
-1
src/vs/workbench/services/search/test/node/textSearchManager.test.ts
...bench/services/search/test/node/textSearchManager.test.ts
+1
-1
src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
...workbench/test/electron-browser/api/extHostSearch.test.ts
+1
-1
src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts
...h/test/electron-browser/quickopen.perf.integrationTest.ts
+1
-1
src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts
.../test/electron-browser/textsearch.perf.integrationTest.ts
+1
-1
未找到文件。
src/tsconfig.strictNullChecks.json
浏览文件 @
7c1fe9a7
...
...
@@ -338,10 +338,6 @@
"./vs/platform/request/electron-main/requestService.ts"
,
"./vs/platform/request/node/request.ts"
,
"./vs/platform/request/node/requestService.ts"
,
"./vs/platform/search/common/replace.ts"
,
"./vs/platform/search/common/search.ts"
,
"./vs/platform/search/test/common/replace.test.ts"
,
"./vs/platform/search/test/common/search.test.ts"
,
"./vs/platform/state/common/state.ts"
,
"./vs/platform/state/node/stateService.ts"
,
"./vs/platform/statusbar/common/statusbar.ts"
,
...
...
@@ -730,6 +726,8 @@
"./vs/workbench/services/remote/node/remoteAgentEnvironmentChannel.ts"
,
"./vs/workbench/services/remote/node/remoteAgentService.ts"
,
"./vs/workbench/services/search/common/searchHelpers.ts"
,
"./vs/workbench/services/search/common/replace.ts"
,
"./vs/workbench/services/search/common/search.ts"
,
"./vs/workbench/services/search/node/fileSearch.ts"
,
"./vs/workbench/services/search/node/fileSearchManager.ts"
,
"./vs/workbench/services/search/node/rawSearchService.ts"
,
...
...
@@ -749,6 +747,8 @@
"./vs/workbench/services/search/test/node/search.test.ts"
,
"./vs/workbench/services/search/test/node/textSearch.integrationTest.ts"
,
"./vs/workbench/services/search/test/node/textSearchManager.test.ts"
,
"./vs/workbench/services/search/test/common/replace.test.ts"
,
"./vs/workbench/services/search/test/common/search.test.ts"
,
"./vs/workbench/services/textMate/electron-browser/TMGrammars.ts"
,
"./vs/workbench/services/textMate/electron-browser/TMHelper.ts"
,
"./vs/workbench/services/textMate/electron-browser/TMSyntax.ts"
,
...
...
src/vs/workbench/api/electron-browser/mainThreadSearch.ts
浏览文件 @
7c1fe9a7
...
...
@@ -7,7 +7,7 @@ import { isFalsyOrEmpty } from 'vs/base/common/arrays';
import
{
dispose
,
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
values
}
from
'
vs/base/common/map
'
;
import
{
URI
,
UriComponents
}
from
'
vs/base/common/uri
'
;
import
{
IFileMatch
,
IRawFileMatch2
,
ISearchComplete
,
ISearchCompleteStats
,
ISearchProgressItem
,
ISearchResultProvider
,
ISearchService
,
QueryType
,
SearchProviderType
,
ITextQuery
,
IFileQuery
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFileMatch
,
IRawFileMatch2
,
ISearchComplete
,
ISearchCompleteStats
,
ISearchProgressItem
,
ISearchResultProvider
,
ISearchService
,
QueryType
,
SearchProviderType
,
ITextQuery
,
IFileQuery
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
extHostNamedCustomer
}
from
'
vs/workbench/api/electron-browser/extHostCustomers
'
;
import
{
ExtHostContext
,
ExtHostSearchShape
,
IExtHostContext
,
MainContext
,
MainThreadSearchShape
}
from
'
../node/extHost.protocol
'
;
...
...
src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts
浏览文件 @
7c1fe9a7
...
...
@@ -12,7 +12,7 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
import
{
ExtensionIdentifier
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
IInstantiationService
,
ServicesAccessor
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ILabelService
}
from
'
vs/platform/label/common/label
'
;
import
{
IFileMatch
,
IPatternInfo
,
ISearchProgressItem
,
ISearchService
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFileMatch
,
IPatternInfo
,
ISearchProgressItem
,
ISearchService
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
IStatusbarService
}
from
'
vs/platform/statusbar/common/statusbar
'
;
import
{
IWindowService
}
from
'
vs/platform/windows/common/windows
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
...
...
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
7c1fe9a7
...
...
@@ -25,7 +25,7 @@ import { ResourceLabelFormatter } from 'vs/platform/label/common/label';
import
{
LogLevel
}
from
'
vs/platform/log/common/log
'
;
import
{
IMarkerData
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IPickOptions
,
IQuickInputButton
,
IQuickPickItem
}
from
'
vs/platform/quickinput/common/quickInput
'
;
import
{
IPatternInfo
,
IRawFileMatch2
,
IRawQuery
,
IRawTextQuery
,
ISearchCompleteStats
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IPatternInfo
,
IRawFileMatch2
,
IRawQuery
,
IRawTextQuery
,
ISearchCompleteStats
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
StatusbarAlignment
as
MainThreadStatusBarAlignment
}
from
'
vs/platform/statusbar/common/statusbar
'
;
import
{
ITelemetryInfo
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
ThemeColor
}
from
'
vs/platform/theme/common/themeService
'
;
...
...
src/vs/workbench/api/node/extHostSearch.fileIndex.ts
浏览文件 @
7c1fe9a7
...
...
@@ -14,7 +14,7 @@ import { StopWatch } from 'vs/base/common/stopwatch';
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
compareItemsByScore
,
IItemAccessor
,
prepareQuery
,
ScorerCache
}
from
'
vs/base/parts/quickopen/common/quickOpenScorer
'
;
import
{
ICachedSearchStats
,
IFileIndexProviderStats
,
IFileMatch
,
IFileQuery
,
IFileSearchStats
,
IFolderQuery
,
ISearchCompleteStats
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ICachedSearchStats
,
IFileIndexProviderStats
,
IFileMatch
,
IFileQuery
,
IFileSearchStats
,
IFolderQuery
,
ISearchCompleteStats
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
IDirectoryEntry
,
IDirectoryTree
,
IInternalFileMatch
}
from
'
vs/workbench/services/search/node/fileSearchManager
'
;
import
{
QueryGlobTester
,
resolvePatternsForProvider
}
from
'
vs/workbench/services/search/node/search
'
;
import
*
as
vscode
from
'
vscode
'
;
...
...
src/vs/workbench/api/node/extHostSearch.ts
浏览文件 @
7c1fe9a7
...
...
@@ -8,7 +8,7 @@ import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
import
{
URI
,
UriComponents
}
from
'
vs/base/common/uri
'
;
import
*
as
extfs
from
'
vs/base/node/extfs
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
IFileQuery
,
IFolderQuery
,
IRawFileQuery
,
IRawQuery
,
IRawTextQuery
,
ISearchCompleteStats
,
ITextQuery
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFileQuery
,
IFolderQuery
,
IRawFileQuery
,
IRawQuery
,
IRawTextQuery
,
ISearchCompleteStats
,
ITextQuery
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
FileIndexSearchManager
}
from
'
vs/workbench/api/node/extHostSearch.fileIndex
'
;
import
{
FileSearchManager
}
from
'
vs/workbench/services/search/node/fileSearchManager
'
;
import
{
SearchService
}
from
'
vs/workbench/services/search/node/rawSearchService
'
;
...
...
src/vs/workbench/api/node/extHostWorkspace.ts
浏览文件 @
7c1fe9a7
...
...
@@ -17,7 +17,7 @@ import { URI } from 'vs/base/common/uri';
import
{
localize
}
from
'
vs/nls
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
Severity
}
from
'
vs/platform/notification/common/notification
'
;
import
{
IRawFileMatch2
,
resultIsMatch
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IRawFileMatch2
,
resultIsMatch
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
Workspace
,
WorkspaceFolder
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
Range
,
RelativePattern
}
from
'
vs/workbench/api/node/extHostTypes
'
;
import
{
ITextQueryBuilderOptions
}
from
'
vs/workbench/contrib/search/common/queryBuilder
'
;
...
...
src/vs/workbench/contrib/search/browser/openFileHandler.ts
浏览文件 @
7c1fe9a7
...
...
@@ -23,7 +23,7 @@ import { EditorInput, IWorkbenchEditorConfiguration } from 'vs/workbench/common/
import
{
IResourceInput
}
from
'
vs/platform/editor/common/editor
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ISearchService
,
IFileSearchStats
,
IFileQuery
,
ISearchComplete
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ISearchService
,
IFileSearchStats
,
IFileQuery
,
ISearchComplete
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IRange
}
from
'
vs/editor/common/core/range
'
;
...
...
src/vs/workbench/contrib/search/browser/searchActions.ts
浏览文件 @
7c1fe9a7
...
...
@@ -21,7 +21,7 @@ import { IEditorOptions } from 'vs/platform/editor/common/editor';
import
{
ServicesAccessor
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
WorkbenchObjectTree
}
from
'
vs/platform/list/browser/listService
'
;
import
{
ISearchConfiguration
,
ISearchHistoryService
,
VIEW_ID
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ISearchConfiguration
,
ISearchHistoryService
,
VIEW_ID
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
SearchView
}
from
'
vs/workbench/contrib/search/browser/searchView
'
;
import
*
as
Constants
from
'
vs/workbench/contrib/search/common/constants
'
;
import
{
IReplaceService
}
from
'
vs/workbench/contrib/search/common/replace
'
;
...
...
src/vs/workbench/contrib/search/browser/searchResultsView.ts
浏览文件 @
7c1fe9a7
...
...
@@ -18,7 +18,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import
{
FileKind
}
from
'
vs/platform/files/common/files
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ILabelService
}
from
'
vs/platform/label/common/label
'
;
import
{
ISearchConfigurationProperties
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ISearchConfigurationProperties
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
attachBadgeStyler
}
from
'
vs/platform/theme/common/styler
'
;
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
...
...
src/vs/workbench/contrib/search/browser/searchView.ts
浏览文件 @
7c1fe9a7
...
...
@@ -36,7 +36,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import
{
TreeResourceNavigator2
,
WorkbenchObjectTree
}
from
'
vs/platform/list/browser/listService
'
;
import
{
INotificationService
,
Severity
}
from
'
vs/platform/notification/common/notification
'
;
import
{
IProgressService
}
from
'
vs/platform/progress/common/progress
'
;
import
{
IPatternInfo
,
ISearchComplete
,
ISearchConfiguration
,
ISearchConfigurationProperties
,
ISearchHistoryService
,
ISearchHistoryValues
,
ITextQuery
,
SearchErrorCode
,
VIEW_ID
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IPatternInfo
,
ISearchComplete
,
ISearchConfiguration
,
ISearchConfigurationProperties
,
ISearchHistoryService
,
ISearchHistoryValues
,
ITextQuery
,
SearchErrorCode
,
VIEW_ID
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
IStorageService
,
StorageScope
}
from
'
vs/platform/storage/common/storage
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
diffInserted
,
diffInsertedOutline
,
diffRemoved
,
diffRemovedOutline
,
editorFindMatchHighlight
,
editorFindMatchHighlightBorder
,
listActiveSelectionForeground
}
from
'
vs/platform/theme/common/colorRegistry
'
;
...
...
src/vs/workbench/contrib/search/browser/searchWidget.ts
浏览文件 @
7c1fe9a7
...
...
@@ -25,7 +25,7 @@ import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/con
import
{
IContextViewService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
KeybindingsRegistry
,
KeybindingWeight
}
from
'
vs/platform/keybinding/common/keybindingsRegistry
'
;
import
{
ISearchConfigurationProperties
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ISearchConfigurationProperties
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
attachFindInputBoxStyler
,
attachInputBoxStyler
}
from
'
vs/platform/theme/common/styler
'
;
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
ContextScopedFindInput
,
ContextScopedHistoryInputBox
}
from
'
vs/platform/browser/contextScopedHistoryWidget
'
;
...
...
src/vs/workbench/contrib/search/common/queryBuilder.ts
浏览文件 @
7c1fe9a7
...
...
@@ -16,7 +16,7 @@ import { isMultilineRegexSource } from 'vs/editor/common/model/textModelSearch';
import
*
as
nls
from
'
vs/nls
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
getExcludes
,
ICommonQueryProps
,
IFileQuery
,
IFolderQuery
,
IPatternInfo
,
ISearchConfiguration
,
ITextQuery
,
ITextSearchPreviewOptions
,
pathIncludedInQuery
,
QueryType
}
from
'
vs/
platform
/search/common/search
'
;
import
{
getExcludes
,
ICommonQueryProps
,
IFileQuery
,
IFolderQuery
,
IPatternInfo
,
ISearchConfiguration
,
ITextQuery
,
ITextSearchPreviewOptions
,
pathIncludedInQuery
,
QueryType
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
/**
...
...
src/vs/workbench/contrib/search/common/search.ts
浏览文件 @
7c1fe9a7
...
...
@@ -5,7 +5,7 @@
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
ISearchConfiguration
,
ISearchConfigurationProperties
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ISearchConfiguration
,
ISearchConfigurationProperties
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
SymbolKind
,
Location
,
ProviderResult
}
from
'
vs/editor/common/modes
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
...
...
src/vs/workbench/contrib/search/common/searchModel.ts
浏览文件 @
7c1fe9a7
...
...
@@ -19,8 +19,8 @@ import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
createDecorator
,
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IProgressRunner
}
from
'
vs/platform/progress/common/progress
'
;
import
{
ReplacePattern
}
from
'
vs/
platform
/search/common/replace
'
;
import
{
IFileMatch
,
IPatternInfo
,
ISearchComplete
,
ISearchProgressItem
,
ISearchService
,
ITextQuery
,
ITextSearchPreviewOptions
,
ITextSearchMatch
,
ITextSearchStats
,
resultIsMatch
,
ISearchRange
,
OneLineRange
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ReplacePattern
}
from
'
vs/
workbench/services
/search/common/replace
'
;
import
{
IFileMatch
,
IPatternInfo
,
ISearchComplete
,
ISearchProgressItem
,
ISearchService
,
ITextQuery
,
ITextSearchPreviewOptions
,
ITextSearchMatch
,
ITextSearchStats
,
resultIsMatch
,
ISearchRange
,
OneLineRange
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
overviewRulerFindMatchForeground
}
from
'
vs/platform/theme/common/colorRegistry
'
;
import
{
themeColorFromId
}
from
'
vs/platform/theme/common/themeService
'
;
...
...
src/vs/workbench/contrib/search/electron-browser/search.contribution.ts
浏览文件 @
7c1fe9a7
...
...
@@ -32,7 +32,7 @@ import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
import
{
IListService
,
WorkbenchListFocusContextKey
,
WorkbenchObjectTree
}
from
'
vs/platform/list/browser/listService
'
;
import
{
IQuickOpenService
}
from
'
vs/platform/quickOpen/common/quickOpen
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
ISearchConfigurationProperties
,
VIEW_ID
,
ISearchConfiguration
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ISearchConfigurationProperties
,
VIEW_ID
,
ISearchConfiguration
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
defaultQuickOpenContextKey
}
from
'
vs/workbench/browser/parts/quickopen/quickopen
'
;
import
{
Extensions
as
QuickOpenExtensions
,
IQuickOpenRegistry
,
QuickOpenHandlerDescriptor
}
from
'
vs/workbench/browser/quickopen
'
;
import
{
Extensions
as
ActionExtensions
,
IWorkbenchActionRegistry
}
from
'
vs/workbench/common/actions
'
;
...
...
src/vs/workbench/contrib/search/test/browser/openFileHandler.test.ts
浏览文件 @
7c1fe9a7
...
...
@@ -8,7 +8,7 @@ import * as errors from 'vs/base/common/errors';
import
*
as
objects
from
'
vs/base/common/objects
'
;
import
{
CacheState
}
from
'
vs/workbench/contrib/search/browser/openFileHandler
'
;
import
{
DeferredPromise
}
from
'
vs/base/test/common/utils
'
;
import
{
QueryType
,
IFileQuery
}
from
'
vs/
platform
/search/common/search
'
;
import
{
QueryType
,
IFileQuery
}
from
'
vs/
workbench/services
/search/common/search
'
;
suite
(
'
CacheState
'
,
()
=>
{
...
...
src/vs/workbench/contrib/search/test/browser/searchActions.test.ts
浏览文件 @
7c1fe9a7
...
...
@@ -14,7 +14,7 @@ import { TestConfigurationService } from 'vs/platform/configuration/test/common/
import
{
TestInstantiationService
}
from
'
vs/platform/instantiation/test/common/instantiationServiceMock
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
USLayoutResolvedKeybinding
}
from
'
vs/platform/keybinding/common/usLayoutResolvedKeybinding
'
;
import
{
IFileMatch
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFileMatch
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
ReplaceAction
}
from
'
vs/workbench/contrib/search/browser/searchActions
'
;
import
{
FileMatch
,
FileMatchOrMatch
,
Match
}
from
'
vs/workbench/contrib/search/common/searchModel
'
;
import
{
MockObjectTree
}
from
'
vs/workbench/contrib/search/test/browser/mockSearchTree
'
;
...
...
src/vs/workbench/contrib/search/test/browser/searchViewlet.test.ts
浏览文件 @
7c1fe9a7
...
...
@@ -9,7 +9,7 @@ import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
TestConfigurationService
}
from
'
vs/platform/configuration/test/common/testConfigurationService
'
;
import
{
TestInstantiationService
}
from
'
vs/platform/instantiation/test/common/instantiationServiceMock
'
;
import
{
IFileMatch
,
ITextSearchMatch
,
OneLineRange
,
QueryType
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFileMatch
,
ITextSearchMatch
,
OneLineRange
,
QueryType
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
TestWorkspace
}
from
'
vs/platform/workspace/test/common/testWorkspace
'
;
import
{
FileMatch
,
Match
,
searchMatchComparer
,
SearchResult
}
from
'
vs/workbench/contrib/search/common/searchModel
'
;
...
...
src/vs/workbench/contrib/search/test/common/queryBuilder.test.ts
浏览文件 @
7c1fe9a7
...
...
@@ -10,7 +10,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import
{
TestConfigurationService
}
from
'
vs/platform/configuration/test/common/testConfigurationService
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
TestInstantiationService
}
from
'
vs/platform/instantiation/test/common/instantiationServiceMock
'
;
import
{
IFolderQuery
,
IPatternInfo
,
QueryType
,
ITextQuery
,
IFileQuery
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFolderQuery
,
IPatternInfo
,
QueryType
,
ITextQuery
,
IFileQuery
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
IWorkspaceContextService
,
toWorkspaceFolders
,
Workspace
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
ISearchPathsResult
,
QueryBuilder
}
from
'
vs/workbench/contrib/search/common/queryBuilder
'
;
import
{
TestContextService
,
TestEnvironmentService
}
from
'
vs/workbench/test/workbenchTestServices
'
;
...
...
src/vs/workbench/contrib/search/test/common/searchModel.test.ts
浏览文件 @
7c1fe9a7
...
...
@@ -14,7 +14,7 @@ import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
TestConfigurationService
}
from
'
vs/platform/configuration/test/common/testConfigurationService
'
;
import
{
TestInstantiationService
}
from
'
vs/platform/instantiation/test/common/instantiationServiceMock
'
;
import
{
IFileMatch
,
IFileSearchStats
,
IFolderQuery
,
ISearchComplete
,
ISearchProgressItem
,
ISearchQuery
,
ISearchService
,
ITextSearchMatch
,
OneLineRange
,
TextSearchMatch
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFileMatch
,
IFileSearchStats
,
IFolderQuery
,
ISearchComplete
,
ISearchProgressItem
,
ISearchQuery
,
ISearchService
,
ITextSearchMatch
,
OneLineRange
,
TextSearchMatch
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
NullTelemetryService
}
from
'
vs/platform/telemetry/common/telemetryUtils
'
;
import
{
SearchModel
}
from
'
vs/workbench/contrib/search/common/searchModel
'
;
...
...
src/vs/workbench/contrib/search/test/common/searchResult.test.ts
浏览文件 @
7c1fe9a7
...
...
@@ -7,7 +7,7 @@ import * as sinon from 'sinon';
import
{
TestInstantiationService
}
from
'
vs/platform/instantiation/test/common/instantiationServiceMock
'
;
import
{
Match
,
FileMatch
,
SearchResult
,
SearchModel
}
from
'
vs/workbench/contrib/search/common/searchModel
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
IFileMatch
,
TextSearchMatch
,
OneLineRange
,
ITextSearchMatch
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFileMatch
,
TextSearchMatch
,
OneLineRange
,
ITextSearchMatch
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
NullTelemetryService
}
from
'
vs/platform/telemetry/common/telemetryUtils
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
...
...
src/vs/workbench/electron-browser/shell.ts
浏览文件 @
7c1fe9a7
...
...
@@ -45,7 +45,7 @@ import { InstantiationService } from 'vs/platform/instantiation/node/instantiati
import
{
ILifecycleService
,
LifecyclePhase
,
WillShutdownEvent
}
from
'
vs/platform/lifecycle/common/lifecycle
'
;
import
{
IMarkerService
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
ISearchService
,
ISearchHistoryService
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ISearchService
,
ISearchHistoryService
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
import
{
CommandService
}
from
'
vs/workbench/services/commands/common/commandService
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
...
...
src/vs/workbench/services/history/electron-browser/history.ts
浏览文件 @
7c1fe9a7
...
...
@@ -21,7 +21,7 @@ import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/co
import
{
IEditorGroupsService
,
IEditorGroup
}
from
'
vs/workbench/services/editor/common/editorGroupsService
'
;
import
{
IWindowsService
}
from
'
vs/platform/windows/common/windows
'
;
import
{
getCodeEditor
,
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
getExcludes
,
ISearchConfiguration
}
from
'
vs/
platform
/search/common/search
'
;
import
{
getExcludes
,
ISearchConfiguration
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
IExpression
}
from
'
vs/base/common/glob
'
;
import
{
ICursorPositionChangedEvent
}
from
'
vs/editor/common/controller/cursorEvents
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
...
...
src/vs/
platform
/search/common/replace.ts
→
src/vs/
workbench/services
/search/common/replace.ts
浏览文件 @
7c1fe9a7
...
...
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
IPatternInfo
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IPatternInfo
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
CharCode
}
from
'
vs/base/common/charCode
'
;
export
class
ReplacePattern
{
...
...
src/vs/
platform
/search/common/search.ts
→
src/vs/
workbench/services
/search/common/search.ts
浏览文件 @
7c1fe9a7
文件已移动
src/vs/workbench/services/search/common/searchHelpers.ts
浏览文件 @
7c1fe9a7
...
...
@@ -5,7 +5,7 @@
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
FindMatch
,
ITextModel
}
from
'
vs/editor/common/model
'
;
import
{
ITextSearchPreviewOptions
,
TextSearchMatch
,
ITextSearchResult
,
ITextSearchMatch
,
ITextQuery
,
ITextSearchContext
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ITextSearchPreviewOptions
,
TextSearchMatch
,
ITextSearchResult
,
ITextSearchMatch
,
ITextQuery
,
ITextSearchContext
}
from
'
vs/
workbench/services
/search/common/search
'
;
function
editorMatchToTextSearchResult
(
matches
:
FindMatch
[],
model
:
ITextModel
,
previewOptions
?:
ITextSearchPreviewOptions
):
TextSearchMatch
{
const
firstLine
=
matches
[
0
].
range
.
startLineNumber
;
...
...
src/vs/workbench/services/search/node/fileSearch.ts
浏览文件 @
7c1fe9a7
...
...
@@ -21,7 +21,7 @@ import * as types from 'vs/base/common/types';
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
*
as
extfs
from
'
vs/base/node/extfs
'
;
import
*
as
flow
from
'
vs/base/node/flow
'
;
import
{
IFileQuery
,
IFolderQuery
,
IProgress
,
ISearchEngineStats
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFileQuery
,
IFolderQuery
,
IProgress
,
ISearchEngineStats
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
IRawFileMatch
,
ISearchEngine
,
ISearchEngineSuccess
}
from
'
vs/workbench/services/search/node/search
'
;
import
{
spawnRipgrepCmd
}
from
'
./ripgrepFileSearch
'
;
...
...
src/vs/workbench/services/search/node/fileSearchManager.ts
浏览文件 @
7c1fe9a7
...
...
@@ -10,7 +10,7 @@ import * as glob from 'vs/base/common/glob';
import
*
as
resources
from
'
vs/base/common/resources
'
;
import
{
StopWatch
}
from
'
vs/base/common/stopwatch
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
IFileMatch
,
IFileSearchProviderStats
,
IFolderQuery
,
ISearchCompleteStats
,
IFileQuery
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFileMatch
,
IFileSearchProviderStats
,
IFolderQuery
,
ISearchCompleteStats
,
IFileQuery
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
QueryGlobTester
,
resolvePatternsForProvider
}
from
'
vs/workbench/services/search/node/search
'
;
import
*
as
vscode
from
'
vscode
'
;
...
...
src/vs/workbench/services/search/node/rawSearchService.ts
浏览文件 @
7c1fe9a7
...
...
@@ -17,7 +17,7 @@ import * as strings from 'vs/base/common/strings';
import
{
URI
,
UriComponents
}
from
'
vs/base/common/uri
'
;
import
{
compareItemsByScore
,
IItemAccessor
,
prepareQuery
,
ScorerCache
}
from
'
vs/base/parts/quickopen/common/quickOpenScorer
'
;
import
{
MAX_FILE_SIZE
}
from
'
vs/platform/files/node/files
'
;
import
{
ICachedSearchStats
,
IFileQuery
,
IFileSearchStats
,
IFolderQuery
,
IProgress
,
IRawFileQuery
,
IRawQuery
,
IRawTextQuery
,
ITextQuery
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ICachedSearchStats
,
IFileQuery
,
IFileSearchStats
,
IFolderQuery
,
IProgress
,
IRawFileQuery
,
IRawQuery
,
IRawTextQuery
,
ITextQuery
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
Engine
as
FileSearchEngine
}
from
'
vs/workbench/services/search/node/fileSearch
'
;
import
{
TextSearchEngineAdapter
}
from
'
vs/workbench/services/search/node/textSearchAdapter
'
;
import
{
IFileSearchProgressItem
,
IRawFileMatch
,
IRawSearchService
,
ISearchEngine
,
ISearchEngineSuccess
,
ISerializedFileMatch
,
ISerializedSearchComplete
,
ISerializedSearchProgressItem
,
ISerializedSearchSuccess
}
from
'
./search
'
;
...
...
src/vs/workbench/services/search/node/ripgrepFileSearch.ts
浏览文件 @
7c1fe9a7
...
...
@@ -11,7 +11,7 @@ import * as objects from 'vs/base/common/objects';
import
*
as
paths
from
'
vs/base/common/paths
'
;
import
{
isMacintosh
as
isMac
}
from
'
vs/base/common/platform
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
IFileQuery
,
IFolderQuery
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFileQuery
,
IFolderQuery
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
anchorGlob
}
from
'
vs/workbench/services/search/node/ripgrepSearchUtils
'
;
import
{
rgPath
}
from
'
vscode-ripgrep
'
;
...
...
src/vs/workbench/services/search/node/ripgrepSearchUtils.ts
浏览文件 @
7c1fe9a7
...
...
@@ -5,7 +5,7 @@
import
{
startsWith
}
from
'
vs/base/common/strings
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
SearchRange
,
TextSearchMatch
}
from
'
vs/
platform
/search/common/search
'
;
import
{
SearchRange
,
TextSearchMatch
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
*
as
vscode
from
'
vscode
'
;
import
{
mapArrayOrNot
}
from
'
vs/base/common/arrays
'
;
...
...
src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
浏览文件 @
7c1fe9a7
...
...
@@ -9,7 +9,7 @@ import * as path from 'path';
import
{
NodeStringDecoder
,
StringDecoder
}
from
'
string_decoder
'
;
import
{
createRegExp
,
startsWith
,
startsWithUTF8BOM
,
stripUTF8BOM
,
escapeRegExpCharacters
,
endsWith
}
from
'
vs/base/common/strings
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
IExtendedExtensionSearchOptions
,
SearchError
,
SearchErrorCode
,
serializeSearchError
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IExtendedExtensionSearchOptions
,
SearchError
,
SearchErrorCode
,
serializeSearchError
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
*
as
vscode
from
'
vscode
'
;
import
{
rgPath
}
from
'
vscode-ripgrep
'
;
import
{
anchorGlob
,
createTextSearchResult
,
IOutputChannel
,
Maybe
,
Range
}
from
'
./ripgrepSearchUtils
'
;
...
...
src/vs/workbench/services/search/node/search.ts
浏览文件 @
7c1fe9a7
...
...
@@ -5,7 +5,7 @@
import
{
Event
}
from
'
vs/base/common/event
'
;
import
*
as
glob
from
'
vs/base/common/glob
'
;
import
{
IFileSearchStats
,
IFolderQuery
,
IProgress
,
IRawFileQuery
,
IRawTextQuery
,
ISearchEngineStats
,
ISearchQuery
,
ITextSearchMatch
,
ITextSearchStats
,
ITextSearchResult
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFileSearchStats
,
IFolderQuery
,
IProgress
,
IRawFileQuery
,
IRawTextQuery
,
ISearchEngineStats
,
ISearchQuery
,
ITextSearchMatch
,
ITextSearchStats
,
ITextSearchResult
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
ITelemetryData
}
from
'
vs/platform/telemetry/common/telemetry
'
;
export
interface
ITelemetryEvent
{
...
...
src/vs/workbench/services/search/node/searchHistoryService.ts
浏览文件 @
7c1fe9a7
...
...
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
ISearchHistoryValues
,
ISearchHistoryService
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ISearchHistoryValues
,
ISearchHistoryService
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
IStorageService
,
StorageScope
}
from
'
vs/platform/storage/common/storage
'
;
import
{
isEmptyObject
}
from
'
vs/base/common/types
'
;
...
...
src/vs/workbench/services/search/node/searchIpc.ts
浏览文件 @
7c1fe9a7
...
...
@@ -5,7 +5,7 @@
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
IChannel
,
IServerChannel
}
from
'
vs/base/parts/ipc/node/ipc
'
;
import
{
IRawFileQuery
,
IRawTextQuery
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IRawFileQuery
,
IRawTextQuery
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
IRawSearchService
,
ISerializedSearchComplete
,
ISerializedSearchProgressItem
}
from
'
./search
'
;
export
class
SearchChannel
implements
IServerChannel
{
...
...
src/vs/workbench/services/search/node/searchService.ts
浏览文件 @
7c1fe9a7
...
...
@@ -20,7 +20,7 @@ import { IModelService } from 'vs/editor/common/services/modelService';
import
{
IDebugParams
,
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
deserializeSearchError
,
FileMatch
,
ICachedSearchStats
,
IFileMatch
,
IFileQuery
,
IFileSearchStats
,
IFolderQuery
,
IProgress
,
ISearchComplete
,
ISearchEngineStats
,
ISearchProgressItem
,
ISearchQuery
,
ISearchResultProvider
,
ISearchService
,
ITextQuery
,
pathIncludedInQuery
,
QueryType
,
SearchError
,
SearchErrorCode
,
SearchProviderType
,
ISearchConfiguration
}
from
'
vs/
platform
/search/common/search
'
;
import
{
deserializeSearchError
,
FileMatch
,
ICachedSearchStats
,
IFileMatch
,
IFileQuery
,
IFileSearchStats
,
IFolderQuery
,
IProgress
,
ISearchComplete
,
ISearchEngineStats
,
ISearchProgressItem
,
ISearchQuery
,
ISearchResultProvider
,
ISearchService
,
ITextQuery
,
pathIncludedInQuery
,
QueryType
,
SearchError
,
SearchErrorCode
,
SearchProviderType
,
ISearchConfiguration
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
IEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IExtensionService
}
from
'
vs/workbench/services/extensions/common/extensions
'
;
...
...
src/vs/workbench/services/search/node/textSearchAdapter.ts
浏览文件 @
7c1fe9a7
...
...
@@ -5,7 +5,7 @@
import
{
CancellationToken
}
from
'
vs/base/common/cancellation
'
;
import
*
as
extfs
from
'
vs/base/node/extfs
'
;
import
{
IFileMatch
,
IProgress
,
ITextQuery
,
ITextSearchStats
,
ITextSearchMatch
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFileMatch
,
IProgress
,
ITextQuery
,
ITextSearchStats
,
ITextSearchMatch
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
RipgrepTextSearchEngine
}
from
'
vs/workbench/services/search/node/ripgrepTextSearchEngine
'
;
import
{
TextSearchManager
}
from
'
vs/workbench/services/search/node/textSearchManager
'
;
import
{
ISerializedFileMatch
,
ISerializedSearchSuccess
}
from
'
./search
'
;
...
...
src/vs/workbench/services/search/node/textSearchManager.ts
浏览文件 @
7c1fe9a7
...
...
@@ -12,7 +12,7 @@ import * as resources from 'vs/base/common/resources';
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
toCanonicalName
}
from
'
vs/base/node/encoding
'
;
import
*
as
extfs
from
'
vs/base/node/extfs
'
;
import
{
IExtendedExtensionSearchOptions
,
IFileMatch
,
IFolderQuery
,
IPatternInfo
,
ISearchCompleteStats
,
ITextQuery
,
ITextSearchContext
,
ITextSearchMatch
,
ITextSearchResult
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IExtendedExtensionSearchOptions
,
IFileMatch
,
IFolderQuery
,
IPatternInfo
,
ISearchCompleteStats
,
ITextQuery
,
ITextSearchContext
,
ITextSearchMatch
,
ITextSearchResult
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
QueryGlobTester
,
resolvePatternsForProvider
}
from
'
vs/workbench/services/search/node/search
'
;
import
*
as
vscode
from
'
vscode
'
;
...
...
src/vs/
platform
/search/test/common/replace.test.ts
→
src/vs/
workbench/services
/search/test/common/replace.test.ts
浏览文件 @
7c1fe9a7
...
...
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
*
as
assert
from
'
assert
'
;
import
{
ReplacePattern
}
from
'
vs/
platform
/search/common/replace
'
;
import
{
ReplacePattern
}
from
'
vs/
workbench/services
/search/common/replace
'
;
suite
(
'
Replace Pattern test
'
,
()
=>
{
...
...
src/vs/
platform
/search/test/common/search.test.ts
→
src/vs/
workbench/services
/search/test/common/search.test.ts
浏览文件 @
7c1fe9a7
...
...
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
*
as
assert
from
'
assert
'
;
import
{
ITextSearchPreviewOptions
,
OneLineRange
,
TextSearchMatch
,
SearchRange
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ITextSearchPreviewOptions
,
OneLineRange
,
TextSearchMatch
,
SearchRange
}
from
'
vs/
workbench/services
/search/common/search
'
;
suite
(
'
TextSearchResult
'
,
()
=>
{
...
...
src/vs/workbench/services/search/test/common/searchHelpers.test.ts
浏览文件 @
7c1fe9a7
...
...
@@ -7,7 +7,7 @@ import * as assert from 'assert';
import
{
ITextModel
,
FindMatch
}
from
'
vs/editor/common/model
'
;
import
{
editorMatchesToTextSearchResults
,
addContextToEditorMatches
}
from
'
vs/workbench/services/search/common/searchHelpers
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
ITextQuery
,
QueryType
,
ITextSearchContext
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ITextQuery
,
QueryType
,
ITextSearchContext
}
from
'
vs/
workbench/services
/search/common/search
'
;
suite
(
'
SearchHelpers
'
,
()
=>
{
suite
(
'
editorMatchesToTextSearchResults
'
,
()
=>
{
...
...
src/vs/workbench/services/search/test/node/rawSearchService.test.ts
浏览文件 @
7c1fe9a7
...
...
@@ -9,7 +9,7 @@ import { getPathFromAmdModule } from 'vs/base/common/amd';
import
{
CancelablePromise
,
createCancelablePromise
}
from
'
vs/base/common/async
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
IFileQuery
,
IFileSearchStats
,
IFolderQuery
,
IProgress
,
ISearchEngineStats
,
QueryType
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFileQuery
,
IFileSearchStats
,
IFolderQuery
,
IProgress
,
ISearchEngineStats
,
QueryType
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
SearchService
as
RawSearchService
}
from
'
vs/workbench/services/search/node/rawSearchService
'
;
import
{
IRawFileMatch
,
ISearchEngine
,
ISearchEngineSuccess
,
ISerializedFileMatch
,
ISerializedSearchComplete
,
ISerializedSearchProgressItem
,
ISerializedSearchSuccess
}
from
'
vs/workbench/services/search/node/search
'
;
import
{
DiskSearch
}
from
'
vs/workbench/services/search/node/searchService
'
;
...
...
src/vs/workbench/services/search/test/node/search.test.ts
浏览文件 @
7c1fe9a7
...
...
@@ -10,7 +10,7 @@ import { join, normalize } from 'vs/base/common/paths';
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
{
joinPath
}
from
'
vs/base/common/resources
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
IFolderQuery
,
QueryType
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFolderQuery
,
QueryType
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
Engine
as
FileSearchEngine
,
FileWalker
}
from
'
vs/workbench/services/search/node/fileSearch
'
;
import
{
IRawFileMatch
}
from
'
vs/workbench/services/search/node/search
'
;
...
...
src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
浏览文件 @
7c1fe9a7
...
...
@@ -9,7 +9,7 @@ import { getPathFromAmdModule } from 'vs/base/common/amd';
import
{
CancellationTokenSource
}
from
'
vs/base/common/cancellation
'
;
import
*
as
glob
from
'
vs/base/common/glob
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
deserializeSearchError
,
IFolderQuery
,
ISearchRange
,
ITextQuery
,
ITextSearchContext
,
ITextSearchMatch
,
QueryType
,
SearchErrorCode
}
from
'
vs/
platform
/search/common/search
'
;
import
{
deserializeSearchError
,
IFolderQuery
,
ISearchRange
,
ITextQuery
,
ITextSearchContext
,
ITextSearchMatch
,
QueryType
,
SearchErrorCode
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
ISerializedFileMatch
}
from
'
vs/workbench/services/search/node/search
'
;
import
{
TextSearchEngineAdapter
}
from
'
vs/workbench/services/search/node/textSearchAdapter
'
;
...
...
src/vs/workbench/services/search/test/node/textSearchManager.test.ts
浏览文件 @
7c1fe9a7
...
...
@@ -6,7 +6,7 @@
import
*
as
assert
from
'
assert
'
;
import
{
CancellationTokenSource
}
from
'
vs/base/common/cancellation
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
ITextQuery
,
QueryType
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ITextQuery
,
QueryType
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
TextSearchManager
}
from
'
vs/workbench/services/search/node/textSearchManager
'
;
import
*
as
vscode
from
'
vscode
'
;
...
...
src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
浏览文件 @
7c1fe9a7
...
...
@@ -10,7 +10,7 @@ import { dispose } from 'vs/base/common/lifecycle';
import
{
joinPath
}
from
'
vs/base/common/resources
'
;
import
{
URI
,
UriComponents
}
from
'
vs/base/common/uri
'
;
import
*
as
extfs
from
'
vs/base/node/extfs
'
;
import
{
IFileMatch
,
IFileQuery
,
IPatternInfo
,
IRawFileMatch2
,
ISearchCompleteStats
,
ISearchQuery
,
ITextQuery
,
QueryType
,
resultIsMatch
}
from
'
vs/
platform
/search/common/search
'
;
import
{
IFileMatch
,
IFileQuery
,
IPatternInfo
,
IRawFileMatch2
,
ISearchCompleteStats
,
ISearchQuery
,
ITextQuery
,
QueryType
,
resultIsMatch
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
MainContext
,
MainThreadSearchShape
}
from
'
vs/workbench/api/node/extHost.protocol
'
;
import
{
ExtHostSearch
}
from
'
vs/workbench/api/node/extHostSearch
'
;
import
{
Range
}
from
'
vs/workbench/api/node/extHostTypes
'
;
...
...
src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts
浏览文件 @
7c1fe9a7
...
...
@@ -18,7 +18,7 @@ import { createSyncDescriptor } from 'vs/platform/instantiation/common/descripto
import
{
InstantiationService
}
from
'
vs/platform/instantiation/common/instantiationService
'
;
import
{
ServiceCollection
}
from
'
vs/platform/instantiation/common/serviceCollection
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
ISearchService
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ISearchService
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
ITelemetryInfo
,
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
testWorkspace
}
from
'
vs/platform/workspace/test/common/testWorkspace
'
;
...
...
src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts
浏览文件 @
7c1fe9a7
...
...
@@ -9,7 +9,7 @@ import * as fs from 'fs';
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
createSyncDescriptor
}
from
'
vs/platform/instantiation/common/descriptors
'
;
import
{
IEditorGroupsService
}
from
'
vs/workbench/services/editor/common/editorGroupsService
'
;
import
{
ISearchService
}
from
'
vs/
platform
/search/common/search
'
;
import
{
ISearchService
}
from
'
vs/
workbench/services
/search/common/search
'
;
import
{
ITelemetryService
,
ITelemetryInfo
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
IUntitledEditorService
,
UntitledEditorService
}
from
'
vs/workbench/services/untitled/common/untitledEditorService
'
;
import
{
IEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录