Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 02:58:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[html] "Expand selection" misses { } in <script> tag. Fixes #85306

Browse Source
This commit is contained in:
Martin Aeschlimann
2019-11-26 17:11:35 +01:00
parent 6d43f2cb26
commit 873fc72278
8 changed files with 138 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/html-language-features/server/src/test/formatting.test.ts
View File

@@ -19,7 +19,7 @@ suite('HTML Embedded Formatting', () => {
settings: options,
folders: [{ name: 'foo', uri: 'test://foo' }]
};
var languageModes = getLanguageModes({ css: true, javascript: true }, workspace, ClientCapabilities.LATEST);
let languageModes = getLanguageModes({ css: true, javascript: true }, workspace, ClientCapabilities.LATEST);
let rangeStartOffset = value.indexOf('|');
let rangeEndOffset;

82
extensions/html-language-features/server/src/test/selectionRanges.test.ts Normal file
View File

@@ -0,0 +1,82 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import 'mocha';
import * as assert from 'assert';
import { SelectionRange } from 'vscode-languageserver-types';
import { TextDocument } from 'vscode-languageserver-textdocument';
import { getLanguageModes } from '../modes/languageModes';
import { ClientCapabilities } from 'vscode-html-languageservice';
import { getSelectionRanges } from '../modes/selectionRanges';
function assertRanges(content: string, expected: (number | string)[][]): void {
let message = `${content} gives selection range:\n`;
const offset = content.indexOf('|');
content = content.substr(0, offset) + content.substr(offset + 1);
let workspace = {
settings: {},
folders: [{ name: 'foo', uri: 'test://foo' }]
};
let languageModes = getLanguageModes({ css: true, javascript: true }, workspace, ClientCapabilities.LATEST);
const document = TextDocument.create('test://foo.html', 'html', 1, content);
const actualRanges = getSelectionRanges(languageModes, document, [document.positionAt(offset)]);
assert.equal(actualRanges.length, 1);
const offsetPairs: [number, string][] = [];
let curr: SelectionRange | undefined = actualRanges[0];
while (curr) {
offsetPairs.push([document.offsetAt(curr.range.start), document.getText(curr.range)]);
curr = curr.parent;
}
message += `${JSON.stringify(offsetPairs)}\n but should give:\n${JSON.stringify(expected)}\n`;
assert.deepEqual(offsetPairs, expected, message);
}
suite('HTML SelectionRange', () => {
test('Embedded JavaScript', () => {
assertRanges('<html><head><script> function foo() { return ((1|+2)*6) }</script></head></html>', [
[48, '1'],
[48, '1+2'],
[47, '(1+2)'],
[47, '(1+2)*6'],
[46, '((1+2)*6)'],
[39, 'return ((1+2)*6)'],
[22, 'function foo() { return ((1+2)*6) }'],
[20, ' function foo() { return ((1+2)*6) }'],
[12, '<script> function foo() { return ((1+2)*6) }</script>'],
[6, '<head><script> function foo() { return ((1+2)*6) }</script></head>'],
[0, '<html><head><script> function foo() { return ((1+2)*6) }</script></head></html>'],
]);
});
test('Embedded CSS', () => {
assertRanges('<html><head><style>foo { display: |none; } </style></head></html>', [
[34, 'none'],
[25, 'display: none'],
[24, ' display: none; '],
[19, 'foo { display: none; }'],
[19, 'foo { display: none; } '],
[12, '<style>foo { display: none; } </style>'],
[6, '<head><style>foo { display: none; } </style></head>'],
[0, '<html><head><style>foo { display: none; } </style></head></html>'],
]);
});
test('Embedded style', () => {
assertRanges('<div style="color: |red"></div>', [
[19, 'red'],
[12, 'color: red'],
[11, '"color: red"'],
[5, 'style="color: red"'],
[1, 'div style="color: red"'],
[0, '<div style="color: red"></div>']
]);
});
});