Skip to content

V
vscode

掘金者说 / vscode
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
V
vscode

体验新版 GitCode，发现更多精彩内容 >>

提交 8fce100a 编写于 作者: S Sandeep Somavarapu
浏览文件
操作

Fix #25508

上级 0f090fc4
隐藏空白更改
内联 并排
Showing with 3 addition and 6 deletion
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.
先完成此消息的编辑！
想要评论请 注册 或