maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Hitting return after </button> element crashes VS Code (Insiders). Fixes #135806

Browse source
This commit is contained in:
Martin Aeschlimann 2021-10-26 11:55:47 +02:00
parent dc1a669906
commit 5e4bc951cd
No known key found for this signature in database
GPG key ID: 2609A01E695523E3
2 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
extensions/html-language-features/server/src/test/words.test.ts
View file

@ -4,23 +4,32 @@
*--------------------------------------------------------------------------------------------*/
import * as assert from 'assert';
import * as words from '../utils/strings';
import * as fs from 'fs';
import * as path from 'path';
suite('HTML Words', () => {
suite('HTML Language Configuration', () => {
const config = JSON.parse((fs.readFileSync(path.join(__dirname, '../../../../html/language-configuration.json')).toString()));
let wordRegex = /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g;
function createRegex(str: string | { pattern: string, flags: string }): RegExp {
if (typeof str === 'string') {
return new RegExp(str, 'g');
}
return new RegExp(str.pattern, str.flags);
}
const wordRegex = createRegex(config.wordPattern);
function assertWord(value: string, expected: string): void {
let offset = value.indexOf('|');
value = value.substr(0, offset) + value.substr(offset + 1);
const offset = value.indexOf('|');
value = value.substr(0, offset) + value.substring(offset + 1);
let actualRange = words.getWordAtText(value, offset, wordRegex);
const actualRange = words.getWordAtText(value, offset, wordRegex);
assert(actualRange.start <= offset);
assert(actualRange.start + actualRange.length >= offset);
assert.strictEqual(value.substr(actualRange.start, actualRange.length), expected);
}
test('Basic', function (): any {
test('Words Basic', function (): any {
assertWord('|var x1 = new F<A>(a, b);', 'var');
assertWord('v|ar x1 = new F<A>(a, b);', 'var');
assertWord('var| x1 = new F<A>(a, b);', 'var');
@ -35,10 +44,28 @@ suite('HTML Words', () => {
assertWord('var x1 = | new F<A>(a, b)|;|', '');
});
test('Multiline', function (): any {
test('Words Multiline', function (): any {
assertWord('console.log("hello");\n|var x1 = new F<A>(a, b);', 'var');
assertWord('console.log("hello");\n|\nvar x1 = new F<A>(a, b);', '');
assertWord('console.log("hello");\n\r |var x1 = new F<A>(a, b);', 'var');
});
const onEnterBeforeRules: RegExp[] = config.onEnterRules.map((r: any) => createRegex(r.beforeText));
function assertBeforeRule(text: string, expectedMatch: boolean): void {
for (const reg of onEnterBeforeRules) {
const start = new Date().getTime();
assert.strictEqual(reg.test(text), expectedMatch);
const totalTime = new Date().getTime() - start;
assert.ok(totalTime < 200, `Evaluation of ${reg.source} on ${text} took ${totalTime}ms]`);
}
}
test('OnEnter Before', function (): any {
assertBeforeRule('<button attr1=val1 attr2=val2', false);
assertBeforeRule('<button attr1=val1 attr2=val2>', true);
assertBeforeRule('<button attr1=\'val1\' attr2="val2">', true);
assertBeforeRule('<button attr1=val1 attr2=val2></button>', false);
});
});

4
extensions/html/language-configuration.json
View file

@ -35,14 +35,14 @@
"wordPattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\@\\$\\^\\&\\*\\(\\)\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>\\/\\s]+)",
"onEnterRules": [
{
"beforeText": { "pattern": "<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))([_:\\w][_:\\w-.\\d]*)(([^'\"/>]+|\"[^\"]*\"|'[^']*')*(?!\\/)>)[^<]*$", "flags": "i" },
"beforeText": { "pattern": "<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))([_:\\w][_:\\w-.\\d]*)(?:(?:[^'\"/>]|\"[^\"]*\"|'[^']*')*?(?!\\/)>)[^<]*$", "flags": "i" },
"afterText": { "pattern": "^<\\/([_:\\w][_:\\w-.\\d]*)\\s*>", "flags": "i" },
"action": {
"indent": "indentOutdent"
}
},
{
"beforeText": { "pattern": "<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))([_:\\w][_:\\w-.\\d]*)(([^'\"/>]+|\"[^\"]*\"|'[^']*')*(?!\\/)>)[^<]*$", "flags": "i" },
"beforeText": { "pattern": "<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))([_:\\w][_:\\w-.\\d]*)(?:(?:[^'\"/>]|\"[^\"]*\"|'[^']*')*?(?!\\/)>)[^<]*$", "flags": "i" },
"action": {
"indent": "indent"
}