Mark/esolang
1
0
Fork 0
Code Issues Packages Activity

Fix range formatter in output viewer

Browse Source
This commit is contained in:
Nilay Majorwar 2022-02-18 17:37:06 +05:30
parent e810855933
commit 4fc94fd9ab
1 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ui/output-viewer.tsx
View File

@ -4,17 +4,31 @@ import {
WorkerParseError, WorkerParseError,
WorkerRuntimeError, WorkerRuntimeError,
} from "../languages/worker-errors"; } from "../languages/worker-errors";
import { DocumentRange } from "../languages/types";
/** Format a ParseError for displaying as output */ /** Format a DocumentRange for displaying as output */
const formatParseError = (error: WorkerParseError): string => { const formatRange = (range: DocumentRange): string => {
const line = error.range.line + 1; if (range.endLine == null || range.endLine == range.startLine) {
const start = error.range.charRange?.start; // `line 2, col 2-4` OR `line 2, col 3`
const end = error.range.charRange?.end; const line = range.startLine + 1;
let cols: string | null = null; const { startCol, endCol } = range;
if (start != null && end != null) cols = `col ${start + 1}-${end + 1}`; let cols: string | null = null;
else if (start != null) cols = `col ${start + 1}`; if (startCol != null && endCol != null)
else if (end != null) cols = `col ${end + 1}`; cols = `col ${startCol + 1}-${endCol + 1}`;
return `ParseError: line ${line}, ${cols}\n${error.message}`; else if (startCol != null) cols = `col ${startCol + 1}`;
else if (endCol != null) cols = `col ${endCol + 1}`;
return `line ${line}, ${cols}`;
} else {
// `lines 2:3 - 3:12` OR `lines 2-3:12` OR `lines 2-3`
const { startLine, endLine, startCol, endCol } = range;
const start =
(startLine + 1).toString() +
(startCol == null ? "" : ":" + (startCol + 1).toString());
const end =
(endLine + 1).toString() +
(endCol == null ? "" : ":" + (endCol + 1).toString());
return `lines ${start} - ${end}`;
}
}; };
export interface OutputViewerRef { export interface OutputViewerRef {
@ -28,7 +42,10 @@ export interface OutputViewerRef {
const OutputViewerComponent = (_: {}, ref: React.Ref<OutputViewerRef>) => { const OutputViewerComponent = (_: {}, ref: React.Ref<OutputViewerRef>) => {
const [value, setValue] = React.useState<string | null>(null); const [value, setValue] = React.useState<string | null>(null);
const [error, setError] = React.useState<string | null>(null); const [error, setError] = React.useState<{
header: string;
message: string;
} | null>(null);
React.useImperativeHandle(ref, () => ({ React.useImperativeHandle(ref, () => ({
reset: () => { reset: () => {
@ -39,8 +56,12 @@ const OutputViewerComponent = (_: {}, ref: React.Ref<OutputViewerRef>) => {
setError: (error: WorkerRuntimeError | WorkerParseError | null) => { setError: (error: WorkerRuntimeError | WorkerParseError | null) => {
if (!error) setError(null); if (!error) setError(null);
else if (error.name === "RuntimeError") else if (error.name === "RuntimeError")
setError("RuntimeError: " + error.message); setError({ header: "RuntimeError: ", message: error.message });
else if (error.name === "ParseError") setError(formatParseError(error)); else if (error.name === "ParseError")
setError({
header: "ParseError: " + formatRange(error.range),
message: error.message,
});
}, },
})); }));
@ -52,9 +73,12 @@ const OutputViewerComponent = (_: {}, ref: React.Ref<OutputViewerRef>) => {
{value} {value}
</pre> </pre>
{value && <div style={{ height: 10 }} />} {value && <div style={{ height: 10 }} />}
<Text style={{ fontFamily: "monospace", color: Colors.RED3 }}> {error != null && (
{error} <Text style={{ fontFamily: "monospace", color: Colors.RED3 }}>
</Text> <p>{error.header}</p>
<p>{error.message}</p>
</Text>
)}
</div> </div>
); );
}; };