Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-15 07:28:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: selection of string literals when string contains escape characters (#295302)

Browse Source
This commit is contained in:
RedCMD
2026-02-15 05:45:23 +13:00
committed by GitHub
parent 2ffe827f66
commit bd6b93b712
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vs/editor/browser/view/viewController.ts
View File

@@ -175,16 +175,22 @@ export class ViewController {
}
}
// Check if current token is a string.
// Expand to the contiguous run of string tokens (StandardTokenType.String) around the click position.
const lineTokens = tokens.getLineTokens(lineNumber);
const index = lineTokens.findTokenIndexAtOffset(column - 1);
if (lineTokens.getStandardTokenType(index) !== StandardTokenType.String) {
return undefined;
let startIndex = lineTokens.findTokenIndexAtOffset(column - 1);
let endIndex = startIndex;
while (startIndex > 0 &&
lineTokens.getStandardTokenType(startIndex - 1) === StandardTokenType.String) {
startIndex--;
}
while (endIndex + 1 < lineTokens.getCount() &&
lineTokens.getStandardTokenType(endIndex + 1) === StandardTokenType.String) {
endIndex++;
}
// Verify the click is after starting or before closing quote.
const tokenStart = lineTokens.getStartOffset(index);
const tokenEnd = lineTokens.getEndOffset(index);
const tokenStart = lineTokens.getStartOffset(startIndex);
const tokenEnd = lineTokens.getEndOffset(endIndex);
if (column !== tokenStart + 2 && column !== tokenEnd) {
return undefined;
}

17
src/vs/editor/test/browser/view/viewController.test.ts
View File

@@ -309,6 +309,23 @@ suite('ViewController - String content selection', () => {
assert.strictEqual(doubleClickAt(controller, new Position(1, 10)), 'hello');
});
test('Select string content containing escape characters', () => {
// 0123456789...
const text = 'var x = "hello\\"world";';
// Token layout: [0..8) Other [8..22) String("hello\"world") [22..23) Other
const controller = createViewControllerWithTokens(text, [
{ startIndex: 0, type: StandardTokenType.Other },
{ startIndex: 8, type: StandardTokenType.String },
{ startIndex: 9, type: StandardTokenType.String },
{ startIndex: 14, type: StandardTokenType.String },
{ startIndex: 16, type: StandardTokenType.String },
{ startIndex: 21, type: StandardTokenType.String },
{ startIndex: 22, type: StandardTokenType.Other },
]);
// Column right after opening quote: offset 9 → column 10
assert.strictEqual(doubleClickAt(controller, new Position(1, 10)), 'hello\\"world');
});
// -- Click in middle of string should NOT select the whole string --
test('Click in middle of string does not select whole string', () => {