Skip to content

fix(CodeWindow): don't treat // inside a string as a comment #7

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
chinesepowered wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(CodeWindow): don't treat // inside a string as a comment #7

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
22 changes: 20 additions & 2 deletions src/components/CodeWindow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,27 @@ function tintNumbers(s: string, key: number): ReactNode {
);
}

// Find the start of a `//` line comment, skipping `//` that appears inside a
// string literal (e.g. a URL like 'https://…') so the string isn't cut short.
function commentStart(line: string): number {
let quote = '';
for (let i = 0; i < line.length; i++) {
const c = line[i];
if (quote) {
if (c === '\\') i++;
else if (c === quote) quote = '';
} else if (c === '"' || c === "'" || c === '`') {
quote = c;
} else if (c === '/' && line[i + 1] === '/') {
return i;
}
}
return -1;
}

function hl(line: string): ReactNode {
// split off a trailing line comment
const ci = line.indexOf('//');
// split off a trailing line comment (ignoring `//` inside strings)
const ci = commentStart(line);
const code = ci >= 0 ? line.slice(0, ci) : line;
const comment = ci >= 0 ? line.slice(ci) : '';
// strings first (odd indices), then keywords, then numeric literals
Expand Down