Fixes microsoft#45908: Use idiomatic programming

alexdima · alexdima · commit a4da791b92bd · 2018-03-29T00:04:19.000+02:00
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -879,16 +879,12 @@ export class FilteredMatchesRenderer extends Disposable implements HiddenAreasPr
 	public render(result: IFilterResult, allSettingsGroups: ISettingsGroup[]): void {
 		const model = this.editor.getModel();
 		this.hiddenAreas = [];
-		this.editor.changeDecorations(changeAccessor => {
-			this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []);
-		});
 		if (result) {
 			this.hiddenAreas = this.computeHiddenRanges(result.filteredGroups, result.allGroups, model);
-			this.editor.changeDecorations(changeAccessor => {
-				this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, result.matches.map(match => this.createDecoration(match, model)));
-			});
+			this.decorationIds = this.editor.deltaDecorations(this.decorationIds, result.matches.map(match => this.createDecoration(match, model)));
 		} else {
 			this.hiddenAreas = this.computeHiddenRanges(null, allSettingsGroups, model);
+			this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		}
 	}
 
@@ -920,11 +916,7 @@ export class FilteredMatchesRenderer extends Disposable implements HiddenAreasPr
 	}
 
 	public dispose() {
-		if (this.decorationIds) {
-			this.decorationIds = this.editor.changeDecorations(changeAccessor => {
-				return changeAccessor.deltaDecorations(this.decorationIds, []);
-			});
-		}
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		super.dispose();
 	}
 }
@@ -940,14 +932,7 @@ export class HighlightMatchesRenderer extends Disposable {
 
 	public render(matches: IRange[]): void {
 		const model = this.editor.getModel();
-		this.editor.changeDecorations(changeAccessor => {
-			this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []) || [];
-		});
-		if (matches.length) {
-			this.editor.changeDecorations(changeAccessor => {
-				this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, matches.map(match => this.createDecoration(match, model))) || [];
-			});
-		}
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, matches.map(match => this.createDecoration(match, model)));
 	}
 
 	private static readonly _FIND_MATCH = ModelDecorationOptions.register({
@@ -963,11 +948,7 @@ export class HighlightMatchesRenderer extends Disposable {
 	}
 
 	public dispose() {
-		if (this.decorationIds) {
-			this.decorationIds = this.editor.changeDecorations(changeAccessor => {
-				return changeAccessor.deltaDecorations(this.decorationIds, []);
-			}) || [];
-		}
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		super.dispose();
 	}
 }
@@ -1383,7 +1364,7 @@ class UnsupportedSettingsRenderer extends Disposable {
 		} else {
 			this.markerService.remove('preferencesEditor', [this.settingsEditorModel.uri]);
 		}
-		this.editor.changeDecorations(changeAccessor => this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel()))));
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel())));
 	}
 
 	private createDecoration(range: IRange, model: ITextModel): IModelDeltaDecoration {
@@ -1404,11 +1385,7 @@ class UnsupportedSettingsRenderer extends Disposable {
 
 	public dispose(): void {
 		this.markerService.remove('preferencesEditor', [this.settingsEditorModel.uri]);
-		if (this.decorationIds) {
-			this.decorationIds = this.editor.changeDecorations(changeAccessor => {
-				return changeAccessor.deltaDecorations(this.decorationIds, []);
-			});
-		}
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		super.dispose();
 	}
 
@@ -1444,8 +1421,6 @@ class WorkspaceConfigurationRenderer extends Disposable {
 		this.associatedSettingsEditorModel = associatedSettingsEditorModel;
 		// Dim other configurations in workspace configuration file only in the context of Settings Editor
 		if (this.associatedSettingsEditorModel && this.workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE && this.workspaceSettingsEditorModel instanceof WorkspaceConfigurationEditorModel) {
-			this.editor.changeDecorations(changeAccessor => this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []));
-
 			const ranges: IRange[] = [];
 			for (const settingsGroup of this.workspaceSettingsEditorModel.configurationGroups) {
 				for (const section of settingsGroup.sections) {
@@ -1461,7 +1436,7 @@ class WorkspaceConfigurationRenderer extends Disposable {
 					}
 				}
 			}
-			this.editor.changeDecorations(changeAccessor => this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel()))));
+			this.decorationIds = this.editor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel())));
 		}
 	}
 
@@ -1478,11 +1453,7 @@ class WorkspaceConfigurationRenderer extends Disposable {
 	}
 
 	public dispose(): void {
-		if (this.decorationIds) {
-			this.decorationIds = this.editor.changeDecorations(changeAccessor => {
-				return changeAccessor.deltaDecorations(this.decorationIds, []);
-			});
-		}
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		super.dispose();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -879,16 +879,12 @@ export class FilteredMatchesRenderer extends Disposable implements HiddenAreasPr`
`879`	`879`	`public render(result: IFilterResult, allSettingsGroups: ISettingsGroup[]): void {`
`880`	`880`	`const model = this.editor.getModel();`
`881`	`881`	`this.hiddenAreas = [];`
`882`		`- this.editor.changeDecorations(changeAccessor => {`
`883`		`- this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []);`
`884`		`- });`
`885`	`882`	`if (result) {`
`886`	`883`	`this.hiddenAreas = this.computeHiddenRanges(result.filteredGroups, result.allGroups, model);`
`887`		`- this.editor.changeDecorations(changeAccessor => {`
`888`		`- this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, result.matches.map(match => this.createDecoration(match, model)));`
`889`		`- });`
	`884`	`+ this.decorationIds = this.editor.deltaDecorations(this.decorationIds, result.matches.map(match => this.createDecoration(match, model)));`
`890`	`885`	`} else {`
`891`	`886`	`this.hiddenAreas = this.computeHiddenRanges(null, allSettingsGroups, model);`
	`887`	`+ this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);`
`892`	`888`	`}`
`893`	`889`	`}`
`894`	`890`
`@@ -920,11 +916,7 @@ export class FilteredMatchesRenderer extends Disposable implements HiddenAreasPr`
`920`	`916`	`}`
`921`	`917`
`922`	`918`	`public dispose() {`
`923`		`- if (this.decorationIds) {`
`924`		`- this.decorationIds = this.editor.changeDecorations(changeAccessor => {`
`925`		`- return changeAccessor.deltaDecorations(this.decorationIds, []);`
`926`		`- });`
`927`		`- }`
	`919`	`+ this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);`
`928`	`920`	`super.dispose();`
`929`	`921`	`}`
`930`	`922`	`}`
`@@ -940,14 +932,7 @@ export class HighlightMatchesRenderer extends Disposable {`
`940`	`932`
`941`	`933`	`public render(matches: IRange[]): void {`
`942`	`934`	`const model = this.editor.getModel();`
`943`		`- this.editor.changeDecorations(changeAccessor => {`
`944`		`- this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []) \|\| [];`
`945`		`- });`
`946`		`- if (matches.length) {`
`947`		`- this.editor.changeDecorations(changeAccessor => {`
`948`		`- this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, matches.map(match => this.createDecoration(match, model))) \|\| [];`
`949`		`- });`
`950`		`- }`
	`935`	`+ this.decorationIds = this.editor.deltaDecorations(this.decorationIds, matches.map(match => this.createDecoration(match, model)));`
`951`	`936`	`}`
`952`	`937`
`953`	`938`	`private static readonly _FIND_MATCH = ModelDecorationOptions.register({`
`@@ -963,11 +948,7 @@ export class HighlightMatchesRenderer extends Disposable {`
`963`	`948`	`}`
`964`	`949`
`965`	`950`	`public dispose() {`
`966`		`- if (this.decorationIds) {`
`967`		`- this.decorationIds = this.editor.changeDecorations(changeAccessor => {`
`968`		`- return changeAccessor.deltaDecorations(this.decorationIds, []);`
`969`		`- }) \|\| [];`
`970`		`- }`
	`951`	`+ this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);`
`971`	`952`	`super.dispose();`
`972`	`953`	`}`
`973`	`954`	`}`
`@@ -1383,7 +1364,7 @@ class UnsupportedSettingsRenderer extends Disposable {`
`1383`	`1364`	`} else {`
`1384`	`1365`	`this.markerService.remove('preferencesEditor', [this.settingsEditorModel.uri]);`
`1385`	`1366`	`}`
`1386`		`- this.editor.changeDecorations(changeAccessor => this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel()))));`
	`1367`	`+ this.decorationIds = this.editor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel())));`
`1387`	`1368`	`}`
`1388`	`1369`
`1389`	`1370`	`private createDecoration(range: IRange, model: ITextModel): IModelDeltaDecoration {`
`@@ -1404,11 +1385,7 @@ class UnsupportedSettingsRenderer extends Disposable {`
`1404`	`1385`
`1405`	`1386`	`public dispose(): void {`
`1406`	`1387`	`this.markerService.remove('preferencesEditor', [this.settingsEditorModel.uri]);`
`1407`		`- if (this.decorationIds) {`
`1408`		`- this.decorationIds = this.editor.changeDecorations(changeAccessor => {`
`1409`		`- return changeAccessor.deltaDecorations(this.decorationIds, []);`
`1410`		`- });`
`1411`		`- }`
	`1388`	`+ this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);`
`1412`	`1389`	`super.dispose();`
`1413`	`1390`	`}`
`1414`	`1391`
`@@ -1444,8 +1421,6 @@ class WorkspaceConfigurationRenderer extends Disposable {`
`1444`	`1421`	`this.associatedSettingsEditorModel = associatedSettingsEditorModel;`
`1445`	`1422`	`// Dim other configurations in workspace configuration file only in the context of Settings Editor`
`1446`	`1423`	`if (this.associatedSettingsEditorModel && this.workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE && this.workspaceSettingsEditorModel instanceof WorkspaceConfigurationEditorModel) {`
`1447`		`- this.editor.changeDecorations(changeAccessor => this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []));`
`1448`		`-`
`1449`	`1424`	`const ranges: IRange[] = [];`
`1450`	`1425`	`for (const settingsGroup of this.workspaceSettingsEditorModel.configurationGroups) {`
`1451`	`1426`	`for (const section of settingsGroup.sections) {`
`@@ -1461,7 +1436,7 @@ class WorkspaceConfigurationRenderer extends Disposable {`
`1461`	`1436`	`}`
`1462`	`1437`	`}`
`1463`	`1438`	`}`
`1464`		`- this.editor.changeDecorations(changeAccessor => this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel()))));`
	`1439`	`+ this.decorationIds = this.editor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel())));`
`1465`	`1440`	`}`
`1466`	`1441`	`}`
`1467`	`1442`
`@@ -1478,11 +1453,7 @@ class WorkspaceConfigurationRenderer extends Disposable {`
`1478`	`1453`	`}`
`1479`	`1454`
`1480`	`1455`	`public dispose(): void {`
`1481`		`- if (this.decorationIds) {`
`1482`		`- this.decorationIds = this.editor.changeDecorations(changeAccessor => {`
`1483`		`- return changeAccessor.deltaDecorations(this.decorationIds, []);`
`1484`		`- });`
`1485`		`- }`
	`1456`	`+ this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);`
`1486`	`1457`	`super.dispose();`
`1487`	`1458`	`}`
`1488`	`1459`	`}`