Skip to content

fix(typescript): prevent type assertions with array brackets or ? from being treated as HTML tags #4381

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

Open
KJyang-0114 wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −1
Open

fix(typescript): prevent type assertions with array brackets or ? from being treated as HTML tags #4381

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
15 changes: 14 additions & 1 deletion src/languages/javascript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,13 @@ export default function(hljs) {
nextChar === "<" ||
// the , gives away that this is not HTML
// `<T, A extends keyof T, V>`
nextChar === ","
nextChar === "," ||
// TypeScript type assertion with array notation
// `<string[]>`, `<number[]>`, `<T[]>`, etc.
nextChar === "[" ||
// TypeScript optional type assertion
// `<string?>`, etc.
nextChar === "?"
) {
response.ignoreMatch();
return;
Expand Down Expand Up @@ -86,6 +92,13 @@ export default function(hljs) {
return;
}
}

// TypeScript type assertions with whitespace before brackets or question mark
// `<string []>`, `<T []>`, `<string ?>`, `<T ?>`
if ((m = afterMatch.match(/^\s*\[\]/)) || (m = afterMatch.match(/^\s+\?/))) {
response.ignoreMatch();
return;
}
}
};
const KEYWORDS = {
Expand Down