diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts index 0c63a065226..55586aab789 100644 --- a/src/vs/platform/configuration/common/configurationRegistry.ts +++ b/src/vs/platform/configuration/common/configurationRegistry.ts @@ -76,7 +76,6 @@ export enum ConfigurationScope { export interface IConfigurationPropertySchema extends IJSONSchema { overridable?: boolean; scope?: ConfigurationScope; - notMultiRootAdopted?: boolean; included?: boolean; tags?: string[]; } diff --git a/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts b/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts index 6197ea71e29..647bb0cd36c 100644 --- a/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts +++ b/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts @@ -162,7 +162,6 @@ function validateProperties(configuration: IConfigurationNode, extension: IExten } else { propertyConfiguration.scope = ConfigurationScope.WINDOW; } - propertyConfiguration.notMultiRootAdopted = !(extension.description.isBuiltin || (Array.isArray(extension.description.keywords) && extension.description.keywords.indexOf('multi-root ready') !== -1)); } } let subNodes = configuration.allOf; diff --git a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts index fabe0d2c25f..8b59bfe6783 100644 --- a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts +++ b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts @@ -247,7 +247,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService { } private migrateWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): TPromise { - return this.doCopyWorkspaceSettings(toWorkspace, setting => !setting.notMultiRootAdopted && setting.scope === ConfigurationScope.WINDOW); + return this.doCopyWorkspaceSettings(toWorkspace, setting => setting.scope === ConfigurationScope.WINDOW); } copyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): TPromise {