mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Merge from vscode 591842cc4b71958c81947b254924a215fe3edcbd (#4886)
This commit is contained in:
@@ -125,7 +125,6 @@ export interface IConfigurationData {
|
||||
user: IConfigurationModel;
|
||||
workspace: IConfigurationModel;
|
||||
folders: { [folder: string]: IConfigurationModel };
|
||||
isComplete: boolean;
|
||||
}
|
||||
|
||||
export function compare(from: IConfigurationModel, to: IConfigurationModel): { added: string[], removed: string[], updated: string[] } {
|
||||
|
||||
@@ -513,8 +513,7 @@ export class Configuration {
|
||||
const { contents, overrides, keys } = this._folderConfigurations.get(folder)!;
|
||||
result[folder.toString()] = { contents, overrides, keys };
|
||||
return result;
|
||||
}, Object.create({})),
|
||||
isComplete: true
|
||||
}, Object.create({}))
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user