Skip to content
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

perf: more precise check for < or > in mustacheTag #2213

Merged
merged 1 commit into from
Nov 24, 2023
Merged

perf: more precise check for < or > in mustacheTag #2213

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
99 changes: 71 additions & 28 deletions packages/language-server/src/lib/documents/parseHtml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,53 +37,96 @@ function preprocess(text: string) {
let scanner = createScanner(text);
let token = scanner.scan();
let currentStartTagStart: number | null = null;
let moustacheCheckStart = 0;
let moustacheCheckEnd = 0;
let lastToken = token;

while (token !== TokenType.EOS) {
const offset = scanner.getTokenOffset();
let blanked = false;

switch (token) {
case TokenType.StartTagOpen:
if (shouldBlankStartOrEndTagLike(offset)) {
blankStartOrEndTagLike(offset);
blanked = true;
} else {
currentStartTagStart = offset;
}
break;

case TokenType.StartTagClose:
if (shouldBlankStartOrEndTagLike(offset)) {
blankStartOrEndTagLike(offset);
blanked = true;
} else {
currentStartTagStart = null;
}
break;

if (token === TokenType.StartTagOpen) {
if (shouldBlankStartOrEndTagLike(offset)) {
blankStartOrEndTagLike(offset);
} else {
currentStartTagStart = offset;
}
}

if (token === TokenType.StartTagClose) {
if (shouldBlankStartOrEndTagLike(offset)) {
blankStartOrEndTagLike(offset);
} else {
case TokenType.StartTagSelfClose:
currentStartTagStart = null;
}
}
break;

// <Foo checked={a < 1}>
// https://github.com/microsoft/vscode-html-languageservice/blob/71806ef57be07e1068ee40900ef8b0899c80e68a/src/parser/htmlScanner.ts#L327
case TokenType.Unknown:
if (
scanner.getScannerState() === ScannerState.WithinTag &&
scanner.getTokenText() === '<' &&
shouldBlankStartOrEndTagLike(offset)
) {
blankStartOrEndTagLike(offset);
blanked = true;
}
break;

if (token === TokenType.StartTagSelfClose) {
currentStartTagStart = null;
case TokenType.Content: {
moustacheCheckEnd = scanner.getTokenEnd();
if (token !== lastToken) {
moustacheCheckStart = offset;
}
break;
}
}

// <Foo checked={a < 1}>
// https://github.com/microsoft/vscode-html-languageservice/blob/71806ef57be07e1068ee40900ef8b0899c80e68a/src/parser/htmlScanner.ts#L327
if (
token === TokenType.Unknown &&
scanner.getScannerState() === ScannerState.WithinTag &&
scanner.getTokenText() === '<' &&
shouldBlankStartOrEndTagLike(offset)
) {
blankStartOrEndTagLike(offset);
// blanked, so the token type is invalid
if (!blanked) {
lastToken = token;
}

token = scanner.scan();
}

return text;

function shouldBlankStartOrEndTagLike(offset: number) {
return isInsideMoustacheTag(text, currentStartTagStart, offset);
if (currentStartTagStart != null) {
return isInsideMoustacheTag(text, currentStartTagStart, offset);
}

const index = text
.substring(moustacheCheckStart, moustacheCheckEnd)
.lastIndexOf('{', offset);

const lastMustacheTagStart = index === -1 ? null : moustacheCheckStart + index;
if (lastMustacheTagStart == null) {
return false;
}

return isInsideMoustacheTag(
text.substring(lastMustacheTagStart),
null,
offset - lastMustacheTagStart
);
}

function blankStartOrEndTagLike(offset: number) {
text = text.substring(0, offset) + ' ' + text.substring(offset + 1);
scanner = createScanner(text, offset, ScannerState.WithinTag);
scanner = createScanner(
text,
offset,
currentStartTagStart != null ? ScannerState.WithinTag : ScannerState.WithinContent
);
}
}

Expand Down