Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0736c91f
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,发现更多精彩内容 >>
提交
0736c91f
编写于
3月 15, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
💄
上级
1166dfb0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
9 deletion
+8
-9
src/vs/platform/request/node/request.ts
src/vs/platform/request/node/request.ts
+1
-1
src/vs/workbench/browser/nodeless.simpleservices.ts
src/vs/workbench/browser/nodeless.simpleservices.ts
+3
-3
src/vs/workbench/services/textMate/electron-browser/textMateService.ts
...nch/services/textMate/electron-browser/textMateService.ts
+1
-2
src/vs/workbench/services/workspace/node/workspaceEditingService.ts
...kbench/services/workspace/node/workspaceEditingService.ts
+3
-3
未找到文件。
src/vs/platform/request/node/request.ts
浏览文件 @
0736c91f
...
@@ -10,7 +10,7 @@ import { IConfigurationRegistry, Extensions } from 'vs/platform/configuration/co
...
@@ -10,7 +10,7 @@ import { IConfigurationRegistry, Extensions } from 'vs/platform/configuration/co
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
CancellationToken
}
from
'
vs/base/common/cancellation
'
;
import
{
CancellationToken
}
from
'
vs/base/common/cancellation
'
;
export
const
IRequestService
=
createDecorator
<
IRequestService
>
(
'
requestService
2
'
);
export
const
IRequestService
=
createDecorator
<
IRequestService
>
(
'
requestService
'
);
export
interface
IRequestService
{
export
interface
IRequestService
{
_serviceBrand
:
any
;
_serviceBrand
:
any
;
...
...
src/vs/workbench/browser/nodeless.simpleservices.ts
浏览文件 @
0736c91f
...
@@ -29,7 +29,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
...
@@ -29,7 +29,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
import
{
ITelemetryService
,
ITelemetryData
,
ITelemetryInfo
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
ITelemetryService
,
ITelemetryData
,
ITelemetryInfo
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
AbstractLifecycleService
}
from
'
vs/platform/lifecycle/common/lifecycleService
'
;
import
{
AbstractLifecycleService
}
from
'
vs/platform/lifecycle/common/lifecycleService
'
;
import
{
ILogService
,
NullLogService
,
LogLevel
}
from
'
vs/platform/log/common/log
'
;
import
{
ILogService
,
LogLevel
,
ConsoleLogService
}
from
'
vs/platform/log/common/log
'
;
import
{
ShutdownReason
,
ILifecycleService
}
from
'
vs/platform/lifecycle/common/lifecycle
'
;
import
{
ShutdownReason
,
ILifecycleService
}
from
'
vs/platform/lifecycle/common/lifecycle
'
;
import
{
IMenubarService
,
IMenubarData
}
from
'
vs/platform/menubar/common/menubar
'
;
import
{
IMenubarService
,
IMenubarData
}
from
'
vs/platform/menubar/common/menubar
'
;
import
{
IProductService
}
from
'
vs/platform/product/common/product
'
;
import
{
IProductService
}
from
'
vs/platform/product/common/product
'
;
...
@@ -509,7 +509,7 @@ registerSingleton(ILifecycleService, SimpleLifecycleService);
...
@@ -509,7 +509,7 @@ registerSingleton(ILifecycleService, SimpleLifecycleService);
//#region Log
//#region Log
export
class
SimpleLogService
extends
Null
LogService
{
}
export
class
SimpleLogService
extends
Console
LogService
{
}
//#endregion
//#endregion
...
@@ -992,7 +992,7 @@ registerSingleton(IFileService, SimpleRemoteFileService);
...
@@ -992,7 +992,7 @@ registerSingleton(IFileService, SimpleRemoteFileService);
//#region Request
//#region Request
export
const
IRequestService
=
createDecorator
<
IRequestService
>
(
'
requestService
2
'
);
export
const
IRequestService
=
createDecorator
<
IRequestService
>
(
'
requestService
'
);
export
interface
IRequestService
{
export
interface
IRequestService
{
_serviceBrand
:
any
;
_serviceBrand
:
any
;
...
...
src/vs/workbench/services/textMate/electron-browser/textMateService.ts
浏览文件 @
0736c91f
...
@@ -25,7 +25,6 @@ import { ITextMateService } from 'vs/workbench/services/textMate/common/textMate
...
@@ -25,7 +25,6 @@ import { ITextMateService } from 'vs/workbench/services/textMate/common/textMate
import
{
ITokenColorizationRule
,
IWorkbenchThemeService
}
from
'
vs/workbench/services/themes/common/workbenchThemeService
'
;
import
{
ITokenColorizationRule
,
IWorkbenchThemeService
}
from
'
vs/workbench/services/themes/common/workbenchThemeService
'
;
import
{
IEmbeddedLanguagesMap
as
IEmbeddedLanguagesMap2
,
IGrammar
,
ITokenTypeMap
,
Registry
,
StackElement
,
StandardTokenType
}
from
'
vscode-textmate
'
;
import
{
IEmbeddedLanguagesMap
as
IEmbeddedLanguagesMap2
,
IGrammar
,
ITokenTypeMap
,
Registry
,
StackElement
,
StandardTokenType
}
from
'
vscode-textmate
'
;
import
{
Disposable
,
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
Disposable
,
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
ConfigurationService
}
from
'
vs/platform/configuration/node/configurationService
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
...
@@ -162,7 +161,7 @@ export class TextMateService extends Disposable implements ITextMateService {
...
@@ -162,7 +161,7 @@ export class TextMateService extends Disposable implements ITextMateService {
@
IFileService
private
readonly
_fileService
:
IFileService
,
@
IFileService
private
readonly
_fileService
:
IFileService
,
@
INotificationService
private
readonly
_notificationService
:
INotificationService
,
@
INotificationService
private
readonly
_notificationService
:
INotificationService
,
@
ILogService
private
readonly
_logService
:
ILogService
,
@
ILogService
private
readonly
_logService
:
ILogService
,
@
IConfigurationService
private
readonly
_configurationService
:
ConfigurationService
@
IConfigurationService
private
readonly
_configurationService
:
I
ConfigurationService
)
{
)
{
super
();
super
();
this
.
_styleElement
=
dom
.
createStyleSheet
();
this
.
_styleElement
=
dom
.
createStyleSheet
();
...
...
src/vs/workbench/services/workspace/node/workspaceEditingService.ts
浏览文件 @
0736c91f
...
@@ -40,7 +40,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
...
@@ -40,7 +40,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
@
IJSONEditingService
private
readonly
jsonEditingService
:
IJSONEditingService
,
@
IJSONEditingService
private
readonly
jsonEditingService
:
IJSONEditingService
,
@
IWorkspaceContextService
private
readonly
contextService
:
WorkspaceService
,
@
IWorkspaceContextService
private
readonly
contextService
:
WorkspaceService
,
@
IWindowService
private
readonly
windowService
:
IWindowService
,
@
IWindowService
private
readonly
windowService
:
IWindowService
,
@
IConfigurationService
private
readonly
workspaceC
onfigurationService
:
IConfigurationService
,
@
IConfigurationService
private
readonly
c
onfigurationService
:
IConfigurationService
,
@
IStorageService
private
readonly
storageService
:
IStorageService
,
@
IStorageService
private
readonly
storageService
:
IStorageService
,
@
IExtensionService
private
readonly
extensionService
:
IExtensionService
,
@
IExtensionService
private
readonly
extensionService
:
IExtensionService
,
@
IBackupFileService
private
readonly
backupFileService
:
IBackupFileService
,
@
IBackupFileService
private
readonly
backupFileService
:
IBackupFileService
,
...
@@ -411,13 +411,13 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
...
@@ -411,13 +411,13 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
private
doCopyWorkspaceSettings
(
toWorkspace
:
IWorkspaceIdentifier
,
filter
?:
(
config
:
IConfigurationPropertySchema
)
=>
boolean
):
Promise
<
void
>
{
private
doCopyWorkspaceSettings
(
toWorkspace
:
IWorkspaceIdentifier
,
filter
?:
(
config
:
IConfigurationPropertySchema
)
=>
boolean
):
Promise
<
void
>
{
const
configurationProperties
=
Registry
.
as
<
IConfigurationRegistry
>
(
ConfigurationExtensions
.
Configuration
).
getConfigurationProperties
();
const
configurationProperties
=
Registry
.
as
<
IConfigurationRegistry
>
(
ConfigurationExtensions
.
Configuration
).
getConfigurationProperties
();
const
targetWorkspaceConfiguration
=
{};
const
targetWorkspaceConfiguration
=
{};
for
(
const
key
of
this
.
workspaceC
onfigurationService
.
keys
().
workspace
)
{
for
(
const
key
of
this
.
c
onfigurationService
.
keys
().
workspace
)
{
if
(
configurationProperties
[
key
])
{
if
(
configurationProperties
[
key
])
{
if
(
filter
&&
!
filter
(
configurationProperties
[
key
]))
{
if
(
filter
&&
!
filter
(
configurationProperties
[
key
]))
{
continue
;
continue
;
}
}
targetWorkspaceConfiguration
[
key
]
=
this
.
workspaceC
onfigurationService
.
inspect
(
key
).
workspace
;
targetWorkspaceConfiguration
[
key
]
=
this
.
c
onfigurationService
.
inspect
(
key
).
workspace
;
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录