ckaczor/azuredatastudio
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

Browse Source 
* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998

* fix pipelines

* fix strict-null-checks

* add missing files
This commit is contained in:
Anthony Dresser
2019-10-21 22:12:22 -07:00
committed by GitHub
parent 7c9be74970
commit 1e22f47304
913 changed files with 18898 additions and 16536 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/platform/configuration/common/configurationModels.ts
+5 -10
View File
@@ -519,14 +519,14 @@ export class Configuration {
return folderConsolidatedConfiguration;
}
private getFolderConfigurationModelForResource(resource: URI | null | undefined, workspace: Workspace | undefined): ConfigurationModel | null {
private getFolderConfigurationModelForResource(resource: URI | null | undefined, workspace: Workspace | undefined): ConfigurationModel | undefined {
if (workspace && resource) {
const root = workspace.getFolder(resource);
if (root) {
return types.withUndefinedAsNull(this._folderConfigurations.get(root.uri));
return this._folderConfigurations.get(root.uri);
}
}
return null;
return undefined;
}
toData(): IConfigurationData {
@@ -606,6 +606,7 @@ export class ConfigurationChangeEvent extends AbstractConfigurationChangeEvent i
private _changedConfiguration: ConfigurationModel = new ConfigurationModel(),
private _changedConfigurationByResource: ResourceMap<ConfigurationModel> = new ResourceMap<ConfigurationModel>()) {
super();
this._source = ConfigurationTarget.DEFAULT;
}
get changedConfiguration(): IConfigurationModel {
@@ -664,13 +665,7 @@ export class ConfigurationChangeEvent extends AbstractConfigurationChangeEvent i
configurationModelsToSearch.push(...this._changedConfigurationByResource.values());
}
for (const configuration of configurationModelsToSearch) {
if (this.doesConfigurationContains(configuration, config)) {
return true;
}
}
return false;
return configurationModelsToSearch.some(configuration => this.doesConfigurationContains(configuration, config));
}
private changeWithKeys(keys: string[], resource?: URI): void {