Make layout split vertical. Add xterm.js for output. Add examples selection. #22
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,9 @@ | |
| "@codemirror/view": "^6.9.3", | ||
| "@ndim/codemirror-lang-zig": "^0.2.0", | ||
| "@ndim/lezer-zig": "^0.2.0", | ||
| "@xterm/addon-fit": "^0.12.0-beta.292", | ||
| "@xterm/addon-image": "^0.10.0-beta.292", | ||
| "@xterm/xterm": "^6.1.0-beta.292", | ||
| "codemirror": "^6.0.1", | ||
| "vscode-languageserver-protocol": "^3.17.3" | ||
| }, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,20 +5,34 @@ import { formatDocument } from "@codemirror/lsp-client"; | |
| import { indentWithTab } from "@codemirror/commands"; | ||
| import { indentUnit, syntaxHighlighting } from "@codemirror/language"; | ||
| import { zigLanguage } from "@ndim/codemirror-lang-zig"; | ||
| import { Terminal } from "@xterm/xterm"; | ||
| import { FitAddon } from "@xterm/addon-fit"; | ||
| import { ImageAddon } from "@xterm/addon-image"; | ||
| import "@xterm/xterm/css/xterm.css"; | ||
| import { editorTheme, highlightStyle } from "./theme.ts"; | ||
| import { lspClient } from "./lsp.ts"; | ||
| // @ts-ignore | ||
| import ZigWorker from './workers/zig.ts?worker'; | ||
| // @ts-ignore | ||
| import RunnerWorker from './workers/runner.ts?worker'; | ||
| // @ts-ignore | ||
| import helloWorldSource from './examples/hello-world.zig?raw'; | ||
| // @ts-ignore | ||
| import ansiTextSource from './examples/ansi-text.zig?raw'; | ||
| // @ts-ignore | ||
| import fizzBuzzSource from './examples/fizz-buzz.zig?raw'; | ||
| // @ts-ignore | ||
| import fibonacciSource from './examples/fibonacci.zig?raw'; | ||
| // @ts-ignore | ||
| import mandelbrotSource from './examples/mandelbrot.zig?raw'; | ||
| // @ts-ignore | ||
| import kittyImageSource from './examples/kitty-image.zig?raw'; | ||
|
|
||
| const editor = new EditorView({ | ||
| extensions: [], | ||
| parent: document.getElementById("editor")!, | ||
| state: EditorState.create({ | ||
| doc: helloWorldSource, | ||
| extensions: [ | ||
| basicSetup, | ||
| editorTheme, | ||
|
|
@@ -37,58 +51,85 @@ const editor = new EditorView({ | |
| }), | ||
| }); | ||
|
|
||
| const output = document.getElementById("output")!; | ||
| const executionStatus = document.getElementById("execution-status")!; | ||
| const outputStyle = getComputedStyle(document.documentElement); | ||
| const terminal = new Terminal({ | ||
| disableStdin: true, | ||
| convertEol: true, | ||
| cursorBlink: false, | ||
| fontSize: 16, | ||
| fontFamily: "monospace", | ||
| scrollback: 1000, | ||
| theme: { | ||
| background: outputStyle.getPropertyValue("--output-background").trim(), | ||
| foreground: outputStyle.getPropertyValue("--output-text").trim(), | ||
| }, | ||
| }); | ||
| const fitAddon = new FitAddon(); | ||
| terminal.loadAddon(fitAddon); | ||
| terminal.loadAddon(new ImageAddon()); | ||
| terminal.open(output); | ||
| terminal.write("\x1b[?25l"); // hide cursor | ||
| fitAddon.fit(); | ||
| new ResizeObserver(() => fitAddon.fit()).observe(output); | ||
|
|
||
| function revealOutputWindow() { | ||
| const editorWidthPercent = parseFloat(splitPane.style.getPropertyValue("--editor-width-percent")); | ||
| if (editorWidthPercent == 100) { | ||
| splitPane.style.setProperty("--editor-width-percent", `${resizeBarPreviousSize}%`); | ||
| } | ||
| } | ||
|
|
||
| let zigWorker = new ZigWorker(); | ||
| let compilationStartedAt = 0; | ||
| let isCompiling = false; | ||
| let executionId = 0; | ||
|
|
||
| zigWorker.onmessage = (ev: MessageEvent) => { | ||
| if (ev.data.stderr) { | ||
| terminal.write(ev.data.stderr); | ||
| revealOutputWindow(); | ||
| return; | ||
| } else if (ev.data.compiled) { | ||
| const compilationTime = Math.round(performance.now() - compilationStartedAt); | ||
| const currentExecutionId = executionId; | ||
| const runStartedAt = performance.now(); | ||
| isCompiling = false; | ||
| executionStatus.textContent = `Compiled in ${compilationTime} ms | Running...`; | ||
|
|
||
| let runnerWorker = new RunnerWorker(); | ||
|
|
||
| runnerWorker.postMessage({ run: ev.data.compiled }); | ||
|
|
||
| runnerWorker.onmessage = (rev: MessageEvent) => { | ||
| if (rev.data.stderr) { | ||
| terminal.write(rev.data.stderr); | ||
| revealOutputWindow(); | ||
| return; | ||
| } else if (rev.data.done) { | ||
| if (currentExecutionId == executionId) { | ||
| const runTime = Math.round(performance.now() - runStartedAt); | ||
| executionStatus.textContent = `Compiled in ${compilationTime} ms | Ran in ${runTime} ms | Exit code ${rev.data.exitCode}`; | ||
| } | ||
| runnerWorker.terminate(); | ||
| } | ||
| } | ||
| } else if (ev.data.failed) { | ||
| const compilationTime = Math.round(performance.now() - compilationStartedAt); | ||
| isCompiling = false; | ||
| executionStatus.textContent = `Compilation failed in ${compilationTime} ms`; | ||
| } | ||
| } | ||
|
|
||
| const splitPane = document.getElementById("split-pane")! as HTMLDivElement; | ||
| const resizeBar = document.getElementById("resize-bar")! as HTMLDivElement; | ||
| let resizeBarPreviousSize = 60; | ||
|
|
||
| function onResizeBarMove(event: MouseEvent) { | ||
| const bounds = splitPane.getBoundingClientRect(); | ||
| const percent = Math.min(Math.max(10, (event.clientX - bounds.left) / bounds.width * 100), 100); | ||
| splitPane.style.setProperty("--editor-width-percent", `${percent}%`); | ||
| } | ||
| function onResizeBarMouseUp(event: MouseEvent) { | ||
| window.removeEventListener("mousemove", onResizeBarMove); | ||
|
|
@@ -98,9 +139,9 @@ function onResizeBarMouseUp(event: MouseEvent) { | |
| document.body.style.removeProperty("cursor"); | ||
|
|
||
| // fully close the output window when it's almost closed | ||
| const editorWidthPercent = parseFloat(splitPane.style.getPropertyValue("--editor-width-percent")); | ||
| if (editorWidthPercent >= 90) { | ||
| splitPane.style.setProperty("--editor-width-percent", "100%"); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -109,32 +150,50 @@ resizeBar.addEventListener("mousedown", event => { | |
| window.addEventListener("mousemove", onResizeBarMove); | ||
| window.addEventListener("mouseup", onResizeBarMouseUp); | ||
| document.body.style.userSelect = "none"; | ||
| document.body.style.cursor = "col-resize"; | ||
| } | ||
| }); | ||
| resizeBar.addEventListener("dblclick", event => { | ||
| const editorWidthPercent = parseFloat(splitPane.style.getPropertyValue("--editor-width-percent")); | ||
| if (editorWidthPercent == 100) { | ||
| splitPane.style.setProperty("--editor-width-percent", `${resizeBarPreviousSize}%`); | ||
| } else { | ||
| resizeBarPreviousSize = editorWidthPercent; | ||
| splitPane.style.setProperty("--editor-width-percent", `100%`); | ||
| } | ||
| }); | ||
|
|
||
| const outputsRun = document.getElementById("run")! as HTMLButtonElement; | ||
| const exampleSelect = document.getElementById("example-select")! as HTMLSelectElement; | ||
|
|
||
| const examples: Record<string, string> = { | ||
| "hello-world": helloWorldSource, | ||
| "ansi-text": ansiTextSource, | ||
| "fizz-buzz": fizzBuzzSource, | ||
| "fibonacci": fibonacciSource, | ||
| "mandelbrot": mandelbrotSource, | ||
| "kitty-image": kittyImageSource, | ||
| }; | ||
|
|
||
| exampleSelect.addEventListener("change", () => { | ||
| editor.dispatch({ | ||
| changes: { | ||
| from: 0, | ||
| to: editor.state.doc.length, | ||
| insert: examples[exampleSelect.value], | ||
| }, | ||
| }); | ||
| }); | ||
|
|
||
| outputsRun.addEventListener("click", async () => { | ||
| if (isCompiling) return; | ||
|
|
||
| isCompiling = true; | ||
| executionId += 1; | ||
| compilationStartedAt = performance.now(); | ||
| executionStatus.textContent = "Compiling..."; | ||
| terminal.reset(); | ||
| terminal.write("\x1b[?25l"); // hide cursor | ||
| revealOutputWindow(); | ||
|
|
||
| zigWorker.postMessage({ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| const std = @import("std"); | ||
|
|
||
| pub fn main(init: std.process.Init) !void { | ||
| var buffer: [4096]u8 = undefined; | ||
| var file_writer = std.Io.File.stdout().writerStreaming(init.io, &buffer); | ||
| const stdout = &file_writer.interface; | ||
|
|
||
| try stdout.writeAll("\x1b[31mred\n"); | ||
| try stdout.writeAll("\x1b[32mgreen\n"); | ||
| try stdout.writeAll("\x1b[33myellow\n"); | ||
| try stdout.writeAll("\x1b[34mblue\n"); | ||
| try stdout.writeAll("\x1b[35mmagenta\n"); | ||
| try stdout.writeAll("\x1b[36mcyan\n"); | ||
| try stdout.writeAll("\x1b[37mwhite\n"); | ||
| try stdout.writeAll("\x1b[0mreset\n"); | ||
| try stdout.flush(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| const std = @import("std"); | ||
|
|
||
| pub fn main(init: std.process.Init) !void { | ||
| var buffer: [4096]u8 = undefined; | ||
| var file_writer = std.Io.File.stdout().writerStreaming(init.io, &buffer); | ||
| const stdout = &file_writer.interface; | ||
|
|
||
| var a: u32 = 0; | ||
| var b: u32 = 1; | ||
|
|
||
| for (0..12) |_| { | ||
| try stdout.print("{d}\n", .{a}); | ||
| const c = a + b; | ||
| a = b; | ||
| b = c; | ||
| } | ||
|
|
||
| try stdout.flush(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| const std = @import("std"); | ||
|
|
||
| pub fn main(init: std.process.Init) !void { | ||
| var buffer: [4096]u8 = undefined; | ||
| var file_writer = std.Io.File.stdout().writerStreaming(init.io, &buffer); | ||
| const stdout = &file_writer.interface; | ||
|
|
||
| for (1..21) |number| { | ||
| if (number % 15 == 0) { | ||
| try stdout.writeAll("FizzBuzz\n"); | ||
| } else if (number % 3 == 0) { | ||
| try stdout.writeAll("Fizz\n"); | ||
| } else if (number % 5 == 0) { | ||
| try stdout.writeAll("Buzz\n"); | ||
| } else { | ||
| try stdout.print("{d}\n", .{number}); | ||
| } | ||
| } | ||
|
|
||
| try stdout.flush(); | ||
| } |
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will show a "Select Example" placeholder instead of "Hello World". This is better at explaining the purpose of that dropdown. When persistence between browser sessions is implemented, showing "Hello World" is going to be especially confusing.
The autocomplete property prevents the selection from being remembered between sessions.