fix bracket selection issues

jrieken · jrieken · commit e1f986f1278b · 2018-12-07T14:34:01.000+01:00
diff --git a/src/vs/editor/contrib/smartSelect/bracketSelections.ts b/src/vs/editor/contrib/smartSelect/bracketSelections.ts
@@ -40,7 +40,7 @@ export class BracketSelectionRangeProvider implements SelectionRangeProvider {
 				// process closing
 				let val = counts.has(key) ? counts.get(key) : 0;
 				val -= 1;
-				counts.set(key, val);
+				counts.set(key, Math.max(0, val));
 				if (val < 0) {
 					let arr = ranges.get(key);
 					if (!arr) {
@@ -73,7 +73,7 @@ export class BracketSelectionRangeProvider implements SelectionRangeProvider {
 				// opening
 				let val = counts.has(key) ? counts.get(key) : 0;
 				val -= 1;
-				counts.set(key, val);
+				counts.set(key, Math.max(0, val));
 				if (val < 0) {
 					let arr = ranges.get(key);
 					if (arr && arr.length > 0) {
diff --git a/src/vs/editor/contrib/smartSelect/test/tokenSelectionSupport.test.ts b/src/vs/editor/contrib/smartSelect/test/tokenSelectionSupport.test.ts
@@ -229,6 +229,9 @@ suite('SmartSelect', () => {
 		// edge
 		assertRanges('[I[[]()]]', new Range(1, 2, 1, 9), new Range(1, 1, 1, 10));
 		assertRanges('[[[]()]I]', new Range(1, 2, 1, 9), new Range(1, 1, 1, 10));
+
+		assertRanges('aaa(aaa)bbb(bIb)ccc(ccc)', new Range(1, 13, 1, 16), new Range(1, 12, 1, 17));
+		assertRanges('(aaa(aaa)bbb(bIb)ccc(ccc))', new Range(1, 14, 1, 17), new Range(1, 13, 1, 18), new Range(1, 2, 1, 26), new Range(1, 1, 1, 27));
 	});
 
 });
