better fix for microsoft#67495

jrieken · jrieken · commit 47bf2388965a · 2019-01-30T16:19:23.000+01:00
diff --git a/src/vs/editor/contrib/smartSelect/smartSelect.ts b/src/vs/editor/contrib/smartSelect/smartSelect.ts
@@ -204,16 +204,16 @@ registerEditorContribution(SmartSelectController);
 registerEditorAction(GrowSelectionAction);
 registerEditorAction(ShrinkSelectionAction);
 
+// word selection
+modes.SelectionRangeRegistry.register('*', new WordSelectionRangeProvider());
+
 export function provideSelectionRanges(model: ITextModel, position: Position, token: CancellationToken): Promise<Range[] | undefined | null> {
 
 	const provider = modes.SelectionRangeRegistry.orderedGroups(model);
 
-	if (provider.length === 0) {
+	if (provider.length === 1) {
 		// add word selection and bracket selection when no provider exists
-		provider.unshift([new WordSelectionRangeProvider(), new BracketSelectionRangeProvider()]);
-	} else {
-		// only word selections when other providers exist
-		provider.unshift([new WordSelectionRangeProvider()]);
+		provider.unshift([new BracketSelectionRangeProvider()]);
 	}
 
 	interface RankedRange {
diff --git a/src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts b/src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts
@@ -282,4 +282,8 @@ suite('SmartSelect', () => {
 			new Range(1, 1, 1, 8),
 		);
 	});
+
+	test('Default selection should select current word/hump first in camelCase #67493', function () {
+
+	});
 });
