mirror of
https://github.com/microsoft/vscode.git
synced 2026-09-03 16:15:28 +01:00
#57105 Remove notMultiRootAdopted attribute
This commit is contained in:
@@ -76,7 +76,6 @@ export enum ConfigurationScope {
|
||||
export interface IConfigurationPropertySchema extends IJSONSchema {
|
||||
overridable?: boolean;
|
||||
scope?: ConfigurationScope;
|
||||
notMultiRootAdopted?: boolean;
|
||||
included?: boolean;
|
||||
tags?: string[];
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -247,7 +247,7 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
|
||||
}
|
||||
|
||||
private migrateWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): TPromise<void> {
|
||||
return this.doCopyWorkspaceSettings(toWorkspace, setting => !setting.notMultiRootAdopted && setting.scope === ConfigurationScope.WINDOW);
|
||||
return this.doCopyWorkspaceSettings(toWorkspace, setting => setting.scope === ConfigurationScope.WINDOW);
|
||||
}
|
||||
|
||||
copyWorkspaceSettings(toWorkspace: IWorkspaceIdentifier): TPromise<void> {
|
||||
|
||||
Reference in New Issue
Block a user