Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d0c114cd
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,发现更多精彩内容 >>
提交
d0c114cd
编写于
12月 06, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #64319
上级
464a2e9b
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
3 addition
and
9 deletion
+3
-9
src/vs/platform/configuration/node/configurationService.ts
src/vs/platform/configuration/node/configurationService.ts
+2
-8
src/vs/workbench/services/configuration/node/configurationService.ts
...bench/services/configuration/node/configurationService.ts
+1
-1
未找到文件。
src/vs/platform/configuration/node/configurationService.ts
浏览文件 @
d0c114cd
...
@@ -10,7 +10,6 @@ import { IConfigurationService, IConfigurationChangeEvent, IConfigurationOverrid
...
@@ -10,7 +10,6 @@ import { IConfigurationService, IConfigurationChangeEvent, IConfigurationOverrid
import
{
DefaultConfigurationModel
,
Configuration
,
ConfigurationChangeEvent
,
ConfigurationModel
}
from
'
vs/platform/configuration/common/configurationModels
'
;
import
{
DefaultConfigurationModel
,
Configuration
,
ConfigurationChangeEvent
,
ConfigurationModel
}
from
'
vs/platform/configuration/common/configurationModels
'
;
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
equals
}
from
'
vs/base/common/objects
'
;
import
{
IWorkspaceFolder
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IWorkspaceFolder
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
UserConfiguration
}
from
'
vs/platform/configuration/node/configuration
'
;
import
{
UserConfiguration
}
from
'
vs/platform/configuration/node/configuration
'
;
...
@@ -92,18 +91,13 @@ export class ConfigurationService extends Disposable implements IConfigurationSe
...
@@ -92,18 +91,13 @@ export class ConfigurationService extends Disposable implements IConfigurationSe
}
}
private
onDidChangeUserConfiguration
(
userConfigurationModel
:
ConfigurationModel
):
void
{
private
onDidChangeUserConfiguration
(
userConfigurationModel
:
ConfigurationModel
):
void
{
let
changedKeys
:
string
[]
=
[];
const
{
added
,
updated
,
removed
}
=
compare
(
this
.
_configuration
.
user
,
userConfigurationModel
);
const
{
added
,
updated
,
removed
}
=
compare
(
this
.
_configuration
.
user
,
userConfigurationModel
);
changedKeys
=
[...
added
,
...
updated
,
...
removed
];
c
onst
c
hangedKeys
=
[...
added
,
...
updated
,
...
removed
];
if
(
changedKeys
.
length
)
{
if
(
changedKeys
.
length
)
{
const
oldConfiguartion
=
this
.
_configuration
;
this
.
_configuration
.
updateUserConfiguration
(
userConfigurationModel
);
this
.
_configuration
.
updateUserConfiguration
(
userConfigurationModel
);
changedKeys
=
changedKeys
.
filter
(
key
=>
!
equals
(
oldConfiguartion
.
getValue
(
key
,
{},
null
),
this
.
_configuration
.
getValue
(
key
,
{},
null
)));
if
(
changedKeys
.
length
)
{
this
.
trigger
(
changedKeys
,
ConfigurationTarget
.
USER
);
this
.
trigger
(
changedKeys
,
ConfigurationTarget
.
USER
);
}
}
}
}
}
private
onDidRegisterConfiguration
(
keys
:
string
[]):
void
{
private
onDidRegisterConfiguration
(
keys
:
string
[]):
void
{
this
.
_configuration
.
updateDefaultConfiguration
(
new
DefaultConfigurationModel
());
this
.
_configuration
.
updateDefaultConfiguration
(
new
DefaultConfigurationModel
());
...
...
src/vs/workbench/services/configuration/node/configurationService.ts
浏览文件 @
d0c114cd
...
@@ -524,7 +524,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
...
@@ -524,7 +524,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
}
}
private
onUserConfigurationChanged
(
userConfiguration
:
ConfigurationModel
):
void
{
private
onUserConfigurationChanged
(
userConfiguration
:
ConfigurationModel
):
void
{
le
t
keys
=
this
.
_configuration
.
compareAndUpdateUserConfiguration
(
userConfiguration
);
cons
t
keys
=
this
.
_configuration
.
compareAndUpdateUserConfiguration
(
userConfiguration
);
this
.
triggerConfigurationChange
(
keys
,
ConfigurationTarget
.
USER
);
this
.
triggerConfigurationChange
(
keys
,
ConfigurationTarget
.
USER
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录