check parent range when creating selection range, microsoft#67872

jrieken · jrieken · commit 8579e43df165 · 2019-03-12T10:20:07.000+01:00
diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
@@ -1103,6 +1103,10 @@ export class SelectionRange {
 	constructor(range: Range, parent?: SelectionRange) {
 		this.range = range;
 		this.parent = parent;
+
+		if (parent && !parent.range.contains(this.range)) {
+			throw new Error('Invalid argument: parent must contain this range');
+		}
 	}
 }
 
diff --git a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
@@ -1119,19 +1119,15 @@ suite('ExtHostLanguageFeatures', function () {
 	});
 
 	test('Selection Ranges, bad data', async () => {
-		disposables.push(extHost.registerSelectionRangeProvider(defaultExtension, defaultSelector, new class implements vscode.SelectionRangeProvider {
-			provideSelectionRanges() {
-				return [
-					new types.SelectionRange(new types.Range(0, 10, 0, 18),
-						new types.SelectionRange(new types.Range(0, 11, 0, 18))),
-				];
-			}
-		}));
 
-		await rpcProtocol.sync();
+		try {
+			let _a = new types.SelectionRange(new types.Range(0, 10, 0, 18),
+				new types.SelectionRange(new types.Range(0, 11, 0, 18))
+			);
+			assert.ok(false, String(_a));
+		} catch (err) {
+			assert.ok(true);
+		}
 
-		provideSelectionRanges(model, [new Position(1, 17)], CancellationToken.None).then(ranges => {
-			assert.equal(ranges.length, 0);
-		});
 	});
 });

Original file line number	Diff line number	Diff line change
`@@ -1103,6 +1103,10 @@ export class SelectionRange {`
`1103`	`1103`	`constructor(range: Range, parent?: SelectionRange) {`
`1104`	`1104`	`this.range = range;`
`1105`	`1105`	`this.parent = parent;`
	`1106`	`+`
	`1107`	`+ if (parent && !parent.range.contains(this.range)) {`
	`1108`	`+ throw new Error('Invalid argument: parent must contain this range');`
	`1109`	`+ }`
`1106`	`1110`	`}`
`1107`	`1111`	`}`
`1108`	`1112`