Skip to content

fix: prevent infinite loop from invalid diagnostic spans in code editor #192

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

fix: prevent infinite loop from invalid diagnostic spans in code editor #192

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
16 changes: 10 additions & 6 deletions packages/jdm-editor/src/components/code-editor/extensions/linter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,18 +158,22 @@ export const validateZenExpression = ({
const expressionDiagnostics = source ? lintExpression(expressionType, source) : [];
const typeDiagnostics: Diagnostic[] = types
.filter((t) => !!t.error)
.map((t) =>
createDiagnostic({
from: t.span[0],
to: t.span[1],
.map((t) => {
// Ensure span values are valid to prevent CodeMirror infinite loops
const from = Math.min(t.span[0], t.span[1]);
const to = Math.max(t.span[0], t.span[1]);

return createDiagnostic({
from,
to,
severity: match(t.error as string)
.with(P.string.startsWith('Hint:'), () => 'hint' as const)
.with(P.string.startsWith('Info:'), () => 'info' as const)
.otherwise(() => 'warning' as const),
message: t.error as string,
source: 'Type check',
}),
);
});
});

const diagnostics = [...expressionDiagnostics, ...typeDiagnostics];

Expand Down