Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
06230bed
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,发现更多精彩内容 >>
提交
06230bed
编写于
6月 19, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
web - cleanup main
上级
a05e05ca
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
12 deletion
+10
-12
src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts
...igurationResolver/browser/configurationResolverService.ts
+5
-2
src/vs/workbench/services/search/common/searchService.ts
src/vs/workbench/services/search/common/searchService.ts
+2
-0
src/vs/workbench/workbench.main.ts
src/vs/workbench/workbench.main.ts
+1
-3
src/vs/workbench/workbench.web.main.ts
src/vs/workbench/workbench.web.main.ts
+2
-7
未找到文件。
src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts
浏览文件 @
06230bed
...
...
@@ -19,8 +19,9 @@ import { AbstractVariableResolverService } from 'vs/workbench/services/configura
import
{
isCodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
DiffEditorInput
}
from
'
vs/workbench/common/editor/diffEditorInput
'
;
import
{
IQuickInputService
,
IInputOptions
,
IQuickPickItem
,
IPickOptions
}
from
'
vs/platform/quickinput/common/quickInput
'
;
import
{
ConfiguredInput
}
from
'
vs/workbench/services/configurationResolver/common/configurationResolver
'
;
import
{
ConfiguredInput
,
IConfigurationResolverService
}
from
'
vs/workbench/services/configurationResolver/common/configurationResolver
'
;
import
{
IProcessEnvironment
}
from
'
vs/base/common/platform
'
;
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
export
abstract
class
BaseConfigurationResolverService
extends
AbstractVariableResolverService
{
...
...
@@ -304,4 +305,6 @@ export class ConfigurationResolverService extends BaseConfigurationResolverServi
)
{
super
(
environmentService
.
configuration
.
userEnv
,
editorService
,
environmentService
,
configurationService
,
commandService
,
workspaceContextService
,
quickInputService
);
}
}
\ No newline at end of file
}
registerSingleton
(
IConfigurationResolverService
,
ConfigurationResolverService
,
true
);
\ No newline at end of file
src/vs/workbench/services/search/common/searchService.ts
浏览文件 @
06230bed
...
...
@@ -20,6 +20,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
import
{
deserializeSearchError
,
FileMatch
,
ICachedSearchStats
,
IFileMatch
,
IFileQuery
,
IFileSearchStats
,
IFolderQuery
,
IProgressMessage
,
ISearchComplete
,
ISearchEngineStats
,
ISearchProgressItem
,
ISearchQuery
,
ISearchResultProvider
,
ISearchService
,
ITextQuery
,
pathIncludedInQuery
,
QueryType
,
SearchError
,
SearchErrorCode
,
SearchProviderType
,
isFileMatch
,
isProgressMessage
}
from
'
vs/workbench/services/search/common/search
'
;
import
{
addContextToEditorMatches
,
editorMatchesToTextSearchResults
}
from
'
vs/workbench/services/search/common/searchHelpers
'
;
import
{
IUntitledEditorService
}
from
'
vs/workbench/services/untitled/common/untitledEditorService
'
;
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
export
class
SearchService
extends
Disposable
implements
ISearchService
{
_serviceBrand
:
any
;
...
...
@@ -421,3 +422,4 @@ export class RemoteSearchService extends SearchService {
}
}
registerSingleton
(
ISearchService
,
RemoteSearchService
,
true
);
src/vs/workbench/workbench.main.ts
浏览文件 @
06230bed
...
...
@@ -90,8 +90,6 @@ import { IURLService } from 'vs/platform/url/common/url';
import
{
RelayURLService
}
from
'
vs/platform/url/electron-browser/urlService
'
;
import
{
ITunnelService
}
from
'
vs/platform/remote/common/tunnel
'
;
import
{
TunnelService
}
from
'
vs/workbench/services/remote/node/tunnelService
'
;
import
{
ConfigurationResolverService
}
from
'
vs/workbench/services/configurationResolver/electron-browser/configurationResolverService
'
;
import
{
IConfigurationResolverService
}
from
'
vs/workbench/services/configurationResolver/common/configurationResolver
'
;
import
{
ICredentialsService
}
from
'
vs/platform/credentials/common/credentials
'
;
import
{
KeytarCredentialsService
}
from
'
vs/platform/credentials/node/credentialsService
'
;
...
...
@@ -136,6 +134,7 @@ import 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
import
'
vs/workbench/services/notification/common/notificationService
'
;
import
'
vs/workbench/services/window/electron-browser/windowService
'
;
import
'
vs/workbench/services/telemetry/electron-browser/telemetryService
'
;
import
'
vs/workbench/services/configurationResolver/electron-browser/configurationResolverService
'
;
registerSingleton
(
IMenuService
,
MenuService
,
true
);
registerSingleton
(
IListService
,
ListService
,
true
);
...
...
@@ -163,7 +162,6 @@ registerSingleton(IWorkspacesService, WorkspacesService);
registerSingleton
(
IMenubarService
,
MenubarService
);
registerSingleton
(
IURLService
,
RelayURLService
);
registerSingleton
(
ITunnelService
,
TunnelService
,
true
);
registerSingleton
(
IConfigurationResolverService
,
ConfigurationResolverService
,
true
);
registerSingleton
(
ICredentialsService
,
KeytarCredentialsService
,
true
);
//#endregion
...
...
src/vs/workbench/workbench.web.main.ts
浏览文件 @
06230bed
...
...
@@ -89,10 +89,6 @@ import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
// import { RelayURLService } from 'vs/platform/url/electron-browser/urlService';
// import { ITunnelService } from 'vs/platform/remote/common/tunnel';
// import { TunnelService } from 'vs/workbench/services/remote/node/tunnelService';
import
{
ConfigurationResolverService
}
from
'
vs/workbench/services/configurationResolver/browser/configurationResolverService
'
;
import
{
IConfigurationResolverService
}
from
'
vs/workbench/services/configurationResolver/common/configurationResolver
'
;
import
{
ISearchService
}
from
'
vs/workbench/services/search/common/search
'
;
import
{
RemoteSearchService
}
from
'
vs/workbench/services/search/common/searchService
'
;
import
'
vs/platform/dialogs/browser/dialogService
'
;
import
'
vs/workbench/services/bulkEdit/browser/bulkEditService
'
;
// import 'vs/workbench/services/integrity/node/integrityService';
...
...
@@ -101,7 +97,7 @@ import 'vs/workbench/services/textMate/browser/textMateService';
// import 'vs/workbench/services/workspace/electron-browser/workspaceEditingService';
// import 'vs/workbench/services/extensions/electron-browser/inactiveExtensionUrlHandler';
import
'
vs/workbench/services/decorations/browser/decorationsService
'
;
// import 'vs/workbench/services/search/node
/searchService';
import
'
vs/workbench/services/search/common
/searchService
'
;
import
'
vs/workbench/services/progress/browser/progressService
'
;
import
'
vs/workbench/services/editor/browser/codeEditorService
'
;
// import 'vs/workbench/services/extensions/electron-browser/extensionHostDebugService';
...
...
@@ -134,6 +130,7 @@ import 'vs/workbench/services/label/common/labelService';
import
'
vs/workbench/services/notification/common/notificationService
'
;
// import 'vs/workbench/services/window/electron-browser/windowService';
// import 'vs/workbench/services/telemetry/electron-browser/telemetryService';
import
'
vs/workbench/services/configurationResolver/browser/configurationResolverService
'
;
import
'
vs/workbench/browser/web.simpleservices
'
;
...
...
@@ -162,9 +159,7 @@ registerSingleton(ILifecycleService, BrowserLifecycleService);
// registerSingleton(IWorkspacesService, WorkspacesService);
// registerSingleton(IMenubarService, MenubarService);
// registerSingleton(IURLService, RelayURLService);
registerSingleton
(
ISearchService
,
RemoteSearchService
,
true
);
registerSingleton
(
IContextMenuService
,
ContextMenuService
);
registerSingleton
(
IConfigurationResolverService
,
ConfigurationResolverService
,
true
);
//#endregion
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录