Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alexandru Dima (alexdima) merged 4 commits into from
Oct 24, 2022
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50a6ceb
Modify "*WordPart*" family of commands to respect kebab-case
nryut-iki Aug 20, 2022
1dda429
Merge branch 'main' into nikita-r/158667-fixWordPart
nikita-r Oct 13, 2022
72bbd83
Write new tests for #158667 instead of modifying existing ones
alexdima Oct 24, 2022
84a882d
Fix tests
alexdima Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/vs/editor/common/cursor/cursorWordOperations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/vs/editor/contrib/wordOperations/test/browser/wordTestUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';
Expand Down Expand Up @@ -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);
Expand Down
28 changes: 21 additions & 7 deletions src/vs/editor/contrib/wordPartOperations/test/browser/wordPartOperations.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ suite('WordPartOperations', () => {
const EXPECTED = [
'|start| |line|',
'|this|Is|A|Camel|Case|Var| |this_|is_|a_|snake_|case_|var| |THIS_|IS_|CAPS_|SNAKE| |this_|IS|Mixed|Use|',
'| |this-|is-|a-|kebab-|case-|var| |THIS-|IS-|CAPS-|KEBAB| |this-|IS|Mixed|Use|',
'|end| |line'
].join('\n');
const [text,] = deserializePipePositions(EXPECTED);
Expand All @@ -54,7 +55,8 @@ suite('WordPartOperations', () => {
new Position(1000, 1000),
ed => cursorWordPartLeft(ed),
ed => ed.getPosition()!,
ed => ed.getPosition()!.equals(new Position(1, 1))
ed => ed.getPosition()!.equals(new Position(1, 1)),
{ wordSeparators: "!\"#&'()*+,./:;<=>?@[\\]^`{|}·" } // default characters sans '$-%~' plus '·'
);
const actual = serializePipePositions(text, actualStops);
assert.deepStrictEqual(actual, EXPECTED);
Expand Down Expand Up @@ -92,6 +94,7 @@ suite('WordPartOperations', () => {
const EXPECTED = [
'start| |line|',
'|this|Is|A|Camel|Case|Var| |this|_is|_a|_snake|_case|_var| |THIS|_IS|_CAPS|_SNAKE| |this|_IS|Mixed|Use|',
'| |this|-is|-a|-kebab|-case|-var| |THIS|-IS|-CAPS|-KEBAB| |this|-IS|Mixed|Use|',
'|end| |line|'
].join('\n');
const [text,] = deserializePipePositions(EXPECTED);
Expand All @@ -100,7 +103,8 @@ suite('WordPartOperations', () => {
new Position(1, 1),
ed => cursorWordPartRight(ed),
ed => ed.getPosition()!,
ed => ed.getPosition()!.equals(new Position(3, 9))
ed => ed.getPosition()!.equals(new Position(4, 9)),
{ wordSeparators: "!\"#&'()*+,./:;<=>?@[\\]^`{|}·" } // default characters sans '$-%~' plus '·'
);
const actual = serializePipePositions(text, actualStops);
assert.deepStrictEqual(actual, EXPECTED);
Expand Down Expand Up @@ -186,28 +190,38 @@ suite('WordPartOperations', () => {
});

test('deleteWordPartLeft - basic', () => {
const EXPECTED = '| |/*| |Just| |some| |text| |a|+=| |3| |+|5|-|3| |*/| |this|Is|A|Camel|Case|Var| |this_|is_|a_|snake_|case_|var| |THIS_|IS_|CAPS_|SNAKE| |this_|IS|Mixed|Use';
const EXPECTED = [
'| |/*| |Just| |some| |text| |a|+=| |3| |+|5-|3| |*/| |this|Is|A|Camel|Case|Var|',
'|this_|is_|a_|snake_|case_|var| |THIS_|IS_|CAPS_|SNAKE| |this_|IS|Mixed|Use|',
'|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, 1000),
new Position(1000, 1000),
ed => deleteWordPartLeft(ed),
ed => ed.getPosition()!,
ed => ed.getValue().length === 0
ed => ed.getValue().length === 0,
{ wordSeparators: "!\"#&'()*+,./:;<=>?@[\\]^`{|}·" } // default characters sans '$-%~' plus '·'
);
const actual = serializePipePositions(text, actualStops);
assert.deepStrictEqual(actual, EXPECTED);
});

test('deleteWordPartRight - basic', () => {
const EXPECTED = ' |/*| |Just| |some| |text| |a|+=| |3| |+|5|-|3| |*/| |this|Is|A|Camel|Case|Var| |this|_is|_a|_snake|_case|_var| |THIS|_IS|_CAPS|_SNAKE| |this|_IS|Mixed|Use|';
const EXPECTED = [
' |/*| |Just| |some| |text| |a|+=| |3| |+|5|-3| |*/| |this|Is|A|Camel|Case|Var|',
'|this|_is|_a|_snake|_case|_var| |THIS|_IS|_CAPS|_SNAKE| |this|_IS|Mixed|Use|',
'|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
ed => ed.getValue().length === 0,
{ wordSeparators: "!\"#&'()*+,./:;<=>?@[\\]^`{|}·" } // default characters sans '$-%~' plus '·'
);
const actual = serializePipePositions(text, actualStops);
assert.deepStrictEqual(actual, EXPECTED);
Expand Down