parent
7feeae1db9
commit
4ab1e77fa7
|
@ -19,7 +19,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
|
|||
import { IConfigurationRegistry, Extensions, allSettings, windowSettings, resourceSettings, applicationSettings, machineSettings, machineOverridableSettings, ConfigurationScope, IConfigurationPropertySchema, keyFromOverrideIdentifiers } from 'vs/platform/configuration/common/configurationRegistry';
|
||||
import { IWorkspaceIdentifier, isWorkspaceIdentifier, IStoredWorkspaceFolder, isStoredWorkspaceFolder, IWorkspaceFolderCreationData, IWorkspaceInitializationPayload, IEmptyWorkspaceIdentifier, useSlashForPath, getStoredWorkspaceFolder, isSingleFolderWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, toWorkspaceFolders } from 'vs/platform/workspaces/common/workspaces';
|
||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { ConfigurationEditingService, EditableConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditingService';
|
||||
import { ConfigurationEditingOptions, ConfigurationEditingService, EditableConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditingService';
|
||||
import { WorkspaceConfiguration, FolderConfiguration, RemoteUserConfiguration, UserConfiguration } from 'vs/workbench/services/configuration/browser/configuration';
|
||||
import { JSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditingService';
|
||||
import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
|
||||
|
@ -885,7 +885,12 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
|
|||
throw new Error('Invalid configuration target');
|
||||
}
|
||||
|
||||
await this.configurationEditingService.writeConfiguration(editableConfigurationTarget, { key, value }, { scopes: overrides, donotNotifyError });
|
||||
const writeOptions: ConfigurationEditingOptions = {
|
||||
scopes: overrides,
|
||||
donotNotifyError,
|
||||
ignoreDirtyFile: true
|
||||
};
|
||||
await this.configurationEditingService.writeConfiguration(editableConfigurationTarget, { key, value }, writeOptions);
|
||||
switch (editableConfigurationTarget) {
|
||||
case EditableConfigurationTarget.USER_LOCAL:
|
||||
return this.reloadLocalUserConfiguration().then(() => undefined);
|
||||
|
|
|
@ -130,7 +130,7 @@ interface IConfigurationEditOperation extends IConfigurationValue {
|
|||
workspaceStandAloneConfigurationKey?: string;
|
||||
}
|
||||
|
||||
interface ConfigurationEditingOptions extends IConfigurationEditingOptions {
|
||||
export interface ConfigurationEditingOptions extends IConfigurationEditingOptions {
|
||||
ignoreDirtyFile?: boolean;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue