simplify update-function (maybe get rid of it...) #54938

microsoft · Aug 15, 2018 · 2a31304 · 2a31304
1 parent 0ed7b0e
commit 2a31304
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/src/vs/workbench/services/decorations/browser/decorations.ts b/src/vs/workbench/services/decorations/browser/decorations.ts
@@ -26,7 +26,7 @@ export interface IDecoration {
 	readonly tooltip: string;
 	readonly labelClassName: string;
 	readonly badgeClassName: string;
-	update(source?: string, data?: IDecorationData): IDecoration;
+	update(data: IDecorationData): IDecoration;
 }
 
 export interface IDecorationsProvider {

diff --git a/src/vs/workbench/services/decorations/browser/decorationsService.ts b/src/vs/workbench/services/decorations/browser/decorationsService.ts
@@ -141,25 +141,12 @@ class DecorationStyles {
 			labelClassName,
 			badgeClassName,
 			tooltip,
-			update: (source, insert) => {
+			update: (replace) => {
 				let newData = data.slice();
-				if (!source) {
-					// add -> just append
-					newData.push(insert);
-
-				} else {
-					// remove/replace -> require a walk
-					for (let i = 0; i < newData.length; i++) {
-						if (newData[i].source === source) {
-							if (!insert) {
-								// remove
-								newData.splice(i, 1);
-								i--;
-							} else {
-								// replace
-								newData[i] = insert;
-							}
-						}
+				for (let i = 0; i < newData.length; i++) {
+					if (newData[i].source === replace.source) {
+						// replace
+						newData[i] = replace;
 					}
 				}
 				return this.asDecoration(newData, onlyChildren);
@@ -434,7 +421,7 @@ export class FileDecorationsService implements IDecorationsService {
 			// result, maybe overwrite
 			let result = this._decorationStyles.asDecoration(data, containsChildren);
 			if (overwrite) {
-				return result.update(overwrite.source, overwrite);
+				return result.update(overwrite);
 			} else {
 				return result;
 			}