Merge pull request microsoft#58989 from sbatten/fix/40658

prioritize tokens over brackets in find
jvasileff · Sep 21, 2018 · 2558a72 · 2558a72
2 parents c8381a5 + 505c761
commit 2558a72
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/src/vs/editor/contrib/smartSelect/test/tokenSelectionSupport.test.ts b/src/vs/editor/contrib/smartSelect/test/tokenSelectionSupport.test.ts
@@ -122,4 +122,44 @@ suite('TokenSelectionSupport', () => {
 				new Range(3, 1, 3, 2)
 			]);
 	});
+
+	test('getRangesToPosition #40658. Cursor at first position inside brackets should select line inside.', () => {
+
+		assertGetRangesToPosition([
+			' [ ]',
+			' { } ',
+			'( ) '
+		], 2, 3, [
+				new Range(1, 1, 3, 5),
+				new Range(2, 1, 2, 6),
+				new Range(2, 2, 2, 5),
+				new Range(2, 3, 2, 4)
+			]);
+	});
+
+	test('getRangesToPosition #40658. Cursor in empty brackets should reveal brackets first.', () => {
+
+		assertGetRangesToPosition([
+			' [] ',
+			' { } ',
+			'  ( ) '
+		], 1, 3, [
+				new Range(1, 1, 3, 7),
+				new Range(1, 1, 1, 5),
+				new Range(1, 2, 1, 4)
+			]);
+	});
+
+	test('getRangesToPosition #40658. Tokens before bracket will be revealed first.', () => {
+
+		assertGetRangesToPosition([
+			'  [] ',
+			' { } ',
+			'selectthis( ) '
+		], 3, 11, [
+				new Range(1, 1, 3, 15),
+				new Range(3, 1, 3, 15),
+				new Range(3, 1, 3, 11)
+			]);
+	});
 });
diff --git a/src/vs/editor/contrib/smartSelect/tokenTree.ts b/src/vs/editor/contrib/smartSelect/tokenTree.ts
@@ -428,7 +428,7 @@ export function find(node: Node, position: Position): Node {
 		}
 
 	} else if (node instanceof Block) {
-		result = find(node.open, position) || find(node.elements, position) || find(node.close, position);
+		result = find(node.elements, position) || find(node.open, position) || find(node.close, position);
 	}
 
 	return result || node;