Modify "*WordPart*" family of commands to respect kebab-case (resolves microsoft#158667) (microsoft#158672)

* Modify "*WordPart*" family of commands to respect kebab-case

* Write new tests for microsoft#158667 instead of modifying existing ones

* Fix tests

Co-authored-by: nikita-r <[email protected]>
Co-authored-by: Alex Dima <[email protected]>

Author: 3 people

src/vs/editor/common/cursor/cursorWordOperations.ts

@@ -246,6 +246,11 @@ export class WordOperations {
 				return new Position(lineNumber, column);
 			}
 
+			if (left === CharCode.Dash && right !== CharCode.Dash) {
+				// kebab-case-variables
+				return new Position(lineNumber, column);
+			}
+
 			if ((strings.isLowerAsciiLetter(left) || strings.isAsciiDigit(left)) && strings.isUpperAsciiLetter(right)) {
 				// camelCaseVariables
 				return new Position(lineNumber, column);
@@ -348,6 +353,11 @@ export class WordOperations {
 				return new Position(lineNumber, column);
 			}
 
+			if (left !== CharCode.Dash && right === CharCode.Dash) {
+				// kebab-case-variables
+				return new Position(lineNumber, column);
+			}
+
 			if ((strings.isLowerAsciiLetter(left) || strings.isAsciiDigit(left)) && strings.isUpperAsciiLetter(right)) {
 				// camelCaseVariables
 				return new Position(lineNumber, column);

src/vs/editor/contrib/wordOperations/test/browser/wordTestUtils.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Position } from 'vs/editor/common/core/position';
-import { ITestCodeEditor, withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { ITestCodeEditor, TestCodeEditorInstantiationOptions, withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 
 export function deserializePipePositions(text: string): [string, Position[]] {
 	let resultText = '';
@@ -58,9 +58,9 @@ export function serializePipePositions(text: string, positions: Position[]): str
 	return resultText;
 }
 
-export function testRepeatedActionAndExtractPositions(text: string, initialPosition: Position, action: (editor: ITestCodeEditor) => void, record: (editor: ITestCodeEditor) => Position, stopCondition: (editor: ITestCodeEditor) => boolean): Position[] {
+export function testRepeatedActionAndExtractPositions(text: string, initialPosition: Position, action: (editor: ITestCodeEditor) => void, record: (editor: ITestCodeEditor) => Position, stopCondition: (editor: ITestCodeEditor) => boolean, options: TestCodeEditorInstantiationOptions = {}): Position[] {
 	const actualStops: Position[] = [];
-	withTestCodeEditor(text, {}, (editor) => {
+	withTestCodeEditor(text, options, (editor) => {
 		editor.setPosition(initialPosition);
 		while (true) {
 			action(editor);

src/vs/editor/contrib/wordPartOperations/test/browser/wordPartOperations.test.ts

@@ -212,4 +212,72 @@ suite('WordPartOperations', () => {
 		const actual = serializePipePositions(text, actualStops);
 		assert.deepStrictEqual(actual, EXPECTED);
 	});
+
+	test('issue #158667: cursorWordPartLeft stops at "-" even when "-" is not in word separators', () => {
+		const EXPECTED = [
+			'|this-|is-|a-|kebab-|case-|var| |THIS-|IS-|CAPS-|KEBAB| |this-|IS|Mixed|Use',
+		].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1000, 1000),
+			ed => cursorWordPartLeft(ed),
+			ed => ed.getPosition()!,
+			ed => ed.getPosition()!.equals(new Position(1, 1)),
+			{ wordSeparators: "!\"#&'()*+,./:;<=>?@[\\]^`{|}·" } // default characters sans '$-%~' plus '·'
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepStrictEqual(actual, EXPECTED);
+	});
+
+	test('issue #158667: cursorWordPartRight stops at "-" even when "-" is not in word separators', () => {
+		const EXPECTED = [
+			'this|-is|-a|-kebab|-case|-var| |THIS|-IS|-CAPS|-KEBAB| |this|-IS|Mixed|Use|',
+		].join('\n');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1),
+			ed => cursorWordPartRight(ed),
+			ed => ed.getPosition()!,
+			ed => ed.getPosition()!.equals(new Position(1, 60)),
+			{ wordSeparators: "!\"#&'()*+,./:;<=>?@[\\]^`{|}·" } // default characters sans '$-%~' plus '·'
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepStrictEqual(actual, EXPECTED);
+	});
+
+	test('issue #158667: deleteWordPartLeft stops at "-" even when "-" is not in word separators', () => {
+		const EXPECTED = [
+			'|this-|is-|a-|kebab-|case-|var| |THIS-|IS-|CAPS-|KEBAB| |this-|IS|Mixed|Use',
+		].join(' ');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1000, 1000),
+			ed => deleteWordPartLeft(ed),
+			ed => ed.getPosition()!,
+			ed => ed.getValue().length === 0,
+			{ wordSeparators: "!\"#&'()*+,./:;<=>?@[\\]^`{|}·" } // default characters sans '$-%~' plus '·'
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepStrictEqual(actual, EXPECTED);
+	});
+
+	test('issue #158667: deleteWordPartRight stops at "-" even when "-" is not in word separators', () => {
+		const EXPECTED = [
+			'this|-is|-a|-kebab|-case|-var| |THIS|-IS|-CAPS|-KEBAB| |this|-IS|Mixed|Use|',
+		].join(' ');
+		const [text,] = deserializePipePositions(EXPECTED);
+		const actualStops = testRepeatedActionAndExtractPositions(
+			text,
+			new Position(1, 1),
+			ed => deleteWordPartRight(ed),
+			ed => new Position(1, text.length - ed.getValue().length + 1),
+			ed => ed.getValue().length === 0,
+			{ wordSeparators: "!\"#&'()*+,./:;<=>?@[\\]^`{|}·" } // default characters sans '$-%~' plus '·'
+		);
+		const actual = serializePipePositions(text, actualStops);
+		assert.deepStrictEqual(actual, EXPECTED);
+	});
 });