fix MapMap#remove result, fixes microsoft#13548

jrieken · jrieken · commit 9d4f1a71d9bb · 2016-10-17T12:03:46.000+02:00
diff --git a/src/vs/platform/markers/common/markerService.ts b/src/vs/platform/markers/common/markerService.ts
@@ -33,13 +33,14 @@ namespace MapMap {
 	}
 
 	export function remove(map: MapMap<any>, key1: string, key2: string): boolean {
-		if (map[key1]) {
-			const result = delete map[key1][key2];
+		if (map[key1] && map[key1][key2]) {
+			delete map[key1][key2];
 			if (isEmptyObject(map[key1])) {
 				delete map[key1];
 			}
-			return result;
+			return true;
 		}
+		return false;
 	}
 }
 
diff --git a/src/vs/platform/markers/test/common/markerService.test.ts b/src/vs/platform/markers/test/common/markerService.test.ts
@@ -168,4 +168,12 @@ suite('Marker Service', () => {
 		service.changeOne('far', URI.parse('some:uri/path'), [data]);
 		assert.equal(service.read({ owner: 'far' }).length, 1);
 	});
+
+	test('MapMap#remove returns bad values, https://github.com/Microsoft/vscode/issues/13548', () => {
+		let service = new markerService.MarkerService();
+
+		service.changeOne('o', URI.parse('some:uri/1'), [randomMarkerData()]);
+		service.changeOne('o', URI.parse('some:uri/2'), []);
+
+	});
 });

Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,14 @@ namespace MapMap {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`export function remove(map: MapMap<any>, key1: string, key2: string): boolean {`
`36`		`- if (map[key1]) {`
`37`		`- const result = delete map[key1][key2];`
	`36`	`+ if (map[key1] && map[key1][key2]) {`
	`37`	`+ delete map[key1][key2];`
`38`	`38`	`if (isEmptyObject(map[key1])) {`
`39`	`39`	`delete map[key1];`
`40`	`40`	`}`
`41`		`- return result;`
	`41`	`+ return true;`
`42`	`42`	`}`
	`43`	`+ return false;`
`43`	`44`	`}`
`44`	`45`	`}`
`45`	`46`