Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
8fce100a
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,发现更多精彩内容 >>
提交
8fce100a
编写于
4月 27, 2017
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #25508
上级
0f090fc4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
3 addition
and
6 deletion
+3
-6
src/vs/workbench/services/configuration/node/configurationEditingService.ts
...ervices/configuration/node/configurationEditingService.ts
+3
-1
src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts
...nfiguration/test/node/configurationEditingService.test.ts
+0
-5
未找到文件。
src/vs/workbench/services/configuration/node/configurationEditingService.ts
浏览文件 @
8fce100a
...
@@ -72,7 +72,9 @@ export class ConfigurationEditingService implements IConfigurationEditingService
...
@@ -72,7 +72,9 @@ export class ConfigurationEditingService implements IConfigurationEditingService
private
writeToBuffer
(
model
:
editorCommon
.
IModel
,
operation
:
IConfigurationEditOperation
,
save
:
boolean
):
TPromise
<
any
>
{
private
writeToBuffer
(
model
:
editorCommon
.
IModel
,
operation
:
IConfigurationEditOperation
,
save
:
boolean
):
TPromise
<
any
>
{
const
edit
=
this
.
getEdits
(
model
,
operation
)[
0
];
const
edit
=
this
.
getEdits
(
model
,
operation
)[
0
];
if
(
this
.
applyEditsToBuffer
(
edit
,
model
)
&&
save
)
{
if
(
this
.
applyEditsToBuffer
(
edit
,
model
)
&&
save
)
{
return
this
.
textFileService
.
save
(
operation
.
resource
);
return
this
.
textFileService
.
save
(
operation
.
resource
)
// Reload the configuration so that we make sure all parties are updated
.
then
(()
=>
this
.
configurationService
.
reloadConfiguration
());
}
}
return
TPromise
.
as
(
null
);
return
TPromise
.
as
(
null
);
}
}
...
...
src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts
浏览文件 @
8fce100a
...
@@ -191,7 +191,6 @@ suite('ConfigurationEditingService', () => {
...
@@ -191,7 +191,6 @@ suite('ConfigurationEditingService', () => {
test
(
'
write one setting - empty file
'
,
()
=>
{
test
(
'
write one setting - empty file
'
,
()
=>
{
return
testObject
.
writeConfiguration
(
ConfigurationTarget
.
USER
,
{
key
:
'
configurationEditing.service.testSetting
'
,
value
:
'
value
'
})
return
testObject
.
writeConfiguration
(
ConfigurationTarget
.
USER
,
{
key
:
'
configurationEditing.service.testSetting
'
,
value
:
'
value
'
})
.
then
(()
=>
instantiationService
.
get
(
IConfigurationService
).
reloadConfiguration
())
.
then
(()
=>
{
.
then
(()
=>
{
const
contents
=
fs
.
readFileSync
(
globalSettingsFile
).
toString
(
'
utf8
'
);
const
contents
=
fs
.
readFileSync
(
globalSettingsFile
).
toString
(
'
utf8
'
);
const
parsed
=
json
.
parse
(
contents
);
const
parsed
=
json
.
parse
(
contents
);
...
@@ -203,7 +202,6 @@ suite('ConfigurationEditingService', () => {
...
@@ -203,7 +202,6 @@ suite('ConfigurationEditingService', () => {
test
(
'
write one setting - existing file
'
,
()
=>
{
test
(
'
write one setting - existing file
'
,
()
=>
{
fs
.
writeFileSync
(
globalSettingsFile
,
'
{ "my.super.setting": "my.super.value" }
'
);
fs
.
writeFileSync
(
globalSettingsFile
,
'
{ "my.super.setting": "my.super.value" }
'
);
return
testObject
.
writeConfiguration
(
ConfigurationTarget
.
USER
,
{
key
:
'
configurationEditing.service.testSetting
'
,
value
:
'
value
'
})
return
testObject
.
writeConfiguration
(
ConfigurationTarget
.
USER
,
{
key
:
'
configurationEditing.service.testSetting
'
,
value
:
'
value
'
})
.
then
(()
=>
instantiationService
.
get
(
IConfigurationService
).
reloadConfiguration
())
.
then
(()
=>
{
.
then
(()
=>
{
const
contents
=
fs
.
readFileSync
(
globalSettingsFile
).
toString
(
'
utf8
'
);
const
contents
=
fs
.
readFileSync
(
globalSettingsFile
).
toString
(
'
utf8
'
);
const
parsed
=
json
.
parse
(
contents
);
const
parsed
=
json
.
parse
(
contents
);
...
@@ -218,7 +216,6 @@ suite('ConfigurationEditingService', () => {
...
@@ -218,7 +216,6 @@ suite('ConfigurationEditingService', () => {
test
(
'
write workspace standalone setting - empty file
'
,
()
=>
{
test
(
'
write workspace standalone setting - empty file
'
,
()
=>
{
return
testObject
.
writeConfiguration
(
ConfigurationTarget
.
WORKSPACE
,
{
key
:
'
tasks.service.testSetting
'
,
value
:
'
value
'
})
return
testObject
.
writeConfiguration
(
ConfigurationTarget
.
WORKSPACE
,
{
key
:
'
tasks.service.testSetting
'
,
value
:
'
value
'
})
.
then
(()
=>
instantiationService
.
get
(
IConfigurationService
).
reloadConfiguration
())
.
then
(()
=>
{
.
then
(()
=>
{
const
target
=
path
.
join
(
workspaceDir
,
WORKSPACE_STANDALONE_CONFIGURATIONS
[
'
tasks
'
]);
const
target
=
path
.
join
(
workspaceDir
,
WORKSPACE_STANDALONE_CONFIGURATIONS
[
'
tasks
'
]);
const
contents
=
fs
.
readFileSync
(
target
).
toString
(
'
utf8
'
);
const
contents
=
fs
.
readFileSync
(
target
).
toString
(
'
utf8
'
);
...
@@ -233,7 +230,6 @@ suite('ConfigurationEditingService', () => {
...
@@ -233,7 +230,6 @@ suite('ConfigurationEditingService', () => {
const
target
=
path
.
join
(
workspaceDir
,
WORKSPACE_STANDALONE_CONFIGURATIONS
[
'
launch
'
]);
const
target
=
path
.
join
(
workspaceDir
,
WORKSPACE_STANDALONE_CONFIGURATIONS
[
'
launch
'
]);
fs
.
writeFileSync
(
target
,
'
{ "my.super.setting": "my.super.value" }
'
);
fs
.
writeFileSync
(
target
,
'
{ "my.super.setting": "my.super.value" }
'
);
return
testObject
.
writeConfiguration
(
ConfigurationTarget
.
WORKSPACE
,
{
key
:
'
launch.service.testSetting
'
,
value
:
'
value
'
})
return
testObject
.
writeConfiguration
(
ConfigurationTarget
.
WORKSPACE
,
{
key
:
'
launch.service.testSetting
'
,
value
:
'
value
'
})
.
then
(()
=>
instantiationService
.
get
(
IConfigurationService
).
reloadConfiguration
())
.
then
(()
=>
{
.
then
(()
=>
{
const
contents
=
fs
.
readFileSync
(
target
).
toString
(
'
utf8
'
);
const
contents
=
fs
.
readFileSync
(
target
).
toString
(
'
utf8
'
);
const
parsed
=
json
.
parse
(
contents
);
const
parsed
=
json
.
parse
(
contents
);
...
@@ -248,7 +244,6 @@ suite('ConfigurationEditingService', () => {
...
@@ -248,7 +244,6 @@ suite('ConfigurationEditingService', () => {
test
(
'
write workspace standalone setting - empty file - full JSON
'
,
()
=>
{
test
(
'
write workspace standalone setting - empty file - full JSON
'
,
()
=>
{
return
testObject
.
writeConfiguration
(
ConfigurationTarget
.
WORKSPACE
,
{
key
:
'
tasks
'
,
value
:
{
'
version
'
:
'
1.0.0
'
,
tasks
:
[{
'
taskName
'
:
'
myTask
'
}]
}
})
return
testObject
.
writeConfiguration
(
ConfigurationTarget
.
WORKSPACE
,
{
key
:
'
tasks
'
,
value
:
{
'
version
'
:
'
1.0.0
'
,
tasks
:
[{
'
taskName
'
:
'
myTask
'
}]
}
})
.
then
(()
=>
instantiationService
.
get
(
IConfigurationService
).
reloadConfiguration
())
.
then
(()
=>
{
.
then
(()
=>
{
const
target
=
path
.
join
(
workspaceDir
,
WORKSPACE_STANDALONE_CONFIGURATIONS
[
'
tasks
'
]);
const
target
=
path
.
join
(
workspaceDir
,
WORKSPACE_STANDALONE_CONFIGURATIONS
[
'
tasks
'
]);
const
contents
=
fs
.
readFileSync
(
target
).
toString
(
'
utf8
'
);
const
contents
=
fs
.
readFileSync
(
target
).
toString
(
'
utf8
'
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录