');
- var addCategoryLink = (cat:string) => {
- var catlink = $('
'+cat+'');
+ var addCategoryLink = (cat: string) => {
+ var catlink = $('
' + cat + '');
if (cat == debugCategory)
catlink.addClass('selected');
catlink.click((e) => {
@@ -945,9 +947,9 @@ function showDebugInfo(state?) {
}
}
-function setDebugButtonState(btnid:string, btnstate:string) {
+function setDebugButtonState(btnid: string, btnstate: string) {
$("#debug_bar, #run_bar").find("button").removeClass("btn_active").removeClass("btn_stopped");
- $("#dbg_"+btnid).addClass("btn_"+btnstate);
+ $("#dbg_" + btnid).addClass("btn_" + btnstate);
}
function isPlatformReady() {
@@ -966,7 +968,7 @@ function openRelevantListing(state: EmuState) {
// if we clicked on a specific tool, don't switch windows
if (lastViewClicked && lastViewClicked.startsWith('#')) return;
// don't switch windows for specific debug commands
- if (['toline','restart','tovsync','stepover'].includes(lastDebugCommand)) return;
+ if (['toline', 'restart', 'tovsync', 'stepover'].includes(lastDebugCommand)) return;
// has to support disassembly, at least
if (!platform.disassemble) return;
// search through listings
@@ -987,7 +989,7 @@ function openRelevantListing(state: EmuState) {
let srcline1 = file && file.findLineForOffset(pc, PC_LINE_LOOKAHEAD);
if (srcline1) {
// try to find the next line and bound the PC
- let srcline2 = file.lines[srcline1.line+1];
+ let srcline2 = file.lines[srcline1.line + 1];
if (!srcline2 || pc < srcline2.offset) {
let score = pc - srcline1.offset;
if (score < bestscore) {
@@ -1012,18 +1014,18 @@ function uiDebugCallback(state: EmuState) {
debugTickPaused = true;
}
-function setupDebugCallback(btnid? : DebugCommandType) {
+function setupDebugCallback(btnid?: DebugCommandType) {
if (platform.setupDebug) {
- platform.setupDebug((state:EmuState, msg:string) => {
+ platform.setupDebug((state: EmuState, msg: string) => {
uiDebugCallback(state);
- setDebugButtonState(btnid||"pause", "stopped");
- msg && showErrorAlert([{msg:"STOPPED: " + msg, line:0}], true);
+ setDebugButtonState(btnid || "pause", "stopped");
+ msg && showErrorAlert([{ msg: "STOPPED: " + msg, line: 0 }], true);
});
lastDebugCommand = btnid;
}
}
-export function setupBreakpoint(btnid? : DebugCommandType) {
+export function setupBreakpoint(btnid?: DebugCommandType) {
if (!checkRunReady()) return;
_disableRecording();
setupDebugCallback(btnid);
@@ -1056,8 +1058,24 @@ function _resume() {
function resume() {
if (!checkRunReady()) return;
+
+ // If the active editor has breakpoints, resume with them
+ var wnd = projectWindows.getActive();
+ if (wnd instanceof SourceEditor) {
+ var bpPCs = wnd.getBreakpointPCs();
+ if (bpPCs.length > 0) {
+ if (!platform.isRunning()) {
+ projectWindows.refresh(false);
+ }
+ runToPC(bpPCs);
+ userPaused = false;
+ lastViewClicked = null;
+ return;
+ }
+ }
+
clearBreakpoint();
- if (! platform.isRunning() ) {
+ if (!platform.isRunning()) {
projectWindows.refresh(false);
}
_resume();
@@ -1083,20 +1101,25 @@ function singleFrameStep() {
platform.runToVsync();
}
-function getEditorPC() : number {
+function getEditorPC(): number {
var wnd = projectWindows.getActive();
return wnd && wnd.getCursorPC && wnd.getCursorPC();
}
-export function runToPC(pc: number) {
- if (!checkRunReady() || !(pc >= 0)) return;
+export function runToPC(pc: number[]) {
+ if (!checkRunReady()) return;
+ if (pc.length === 0 || pc.some(p => !(p >= 0))) return;
+ lastDebugState = null;
+ hideDebugInfo();
+ projectWindows.refresh(false);
setupBreakpoint("toline");
- console.log("Run to", pc.toString(16));
+ console.log("runToPC", pc.map(p => p.toString(16)).join(" "));
if (platform.runToPC) {
platform.runToPC(pc);
} else {
+ const pcSet = new Set(pc);
platform.runEval((c) => {
- return c.PC == pc;
+ return pcSet.has(c.PC);
});
}
}
@@ -1108,7 +1131,7 @@ function restartAtCursor() {
}
function runToCursor() {
- runToPC(getEditorPC());
+ runToPC([getEditorPC()]);
}
function runUntilReturn() {
@@ -1166,13 +1189,13 @@ function _breakExpression() {
$("#debugExprExamples").text(getDebugExprExamples());
modal.modal('show');
btn.off('click').on('click', () => {
- var exprs = $("#debugExprInput").val()+"";
+ var exprs = $("#debugExprInput").val() + "";
modal.modal('hide');
breakExpression(exprs);
});
}
-function getDebugExprExamples() : string {
+function getDebugExprExamples(): string {
var state = platform.saveState && platform.saveState();
var cpu = state.c;
console.log(cpu, state);
@@ -1186,7 +1209,7 @@ function getDebugExprExamples() : string {
return s;
}
-function breakExpression(exprs : string) {
+function breakExpression(exprs: string) {
var fn = new Function('c', 'return (' + exprs + ');').bind(platform);
setupBreakpoint();
platform.runEval(fn as DebugEvalCondition);
@@ -1204,28 +1227,28 @@ function updateDebugWindows() {
setTimeout(updateDebugWindows, 100);
}
-export function setFrameRateUI(fps:number) {
+export function setFrameRateUI(fps: number) {
platform.setFrameRate(fps);
if (fps > 0.01)
$("#fps_label").text(fps.toFixed(2));
else
- $("#fps_label").text("1/"+Math.round(1/fps));
+ $("#fps_label").text("1/" + Math.round(1 / fps));
}
function _slowerFrameRate() {
var fps = platform.getFrameRate();
- fps = fps/2;
+ fps = fps / 2;
if (fps > 0.00001) setFrameRateUI(fps);
}
function _fasterFrameRate() {
var fps = platform.getFrameRate();
- fps = Math.min(60, fps*2);
+ fps = Math.min(60, fps * 2);
setFrameRateUI(fps);
}
function _slowestFrameRate() {
- setFrameRateUI(60/65536);
+ setFrameRateUI(60 / 65536);
}
function _fastestFrameRate() {
@@ -1279,9 +1302,9 @@ function addFileToProject(type, ext, linefn) {
var wnd = projectWindows.getActive();
if (wnd && wnd.insertText) {
bootbox.prompt({
- title:"Add "+DOMPurify.sanitize(type)+" File to Project",
- value:"filename"+DOMPurify.sanitize(ext),
- callback:(filename:string) => {
+ title: "Add " + DOMPurify.sanitize(type) + " File to Project",
+ value: "filename" + DOMPurify.sanitize(ext),
+ callback: (filename: string) => {
if (filename && filename.trim().length > 0) {
if (!checkEnteredFilename(filename)) return;
var path = filename;
@@ -1308,19 +1331,19 @@ function _addIncludeFile() {
var tool = platform.getToolForFilename(fn);
// TODO: more tools? make this a function of the platform / tool provider
if (fn.endsWith(".c") || tool == 'sdcc' || tool == 'cc65' || tool == 'cmoc' || tool == 'smlrc')
- addFileToProject("Header", ".h", (s) => { return '#include "'+s+'"' });
+ addFileToProject("Header", ".h", (s) => { return '#include "' + s + '"' });
else if (tool == 'dasm' || tool == 'zmac')
- addFileToProject("Include", ".inc", (s) => { return '\tinclude "'+s+'"' });
+ addFileToProject("Include", ".inc", (s) => { return '\tinclude "' + s + '"' });
else if (tool == 'ca65' || tool == 'sdasz80' || tool == 'vasm' || tool == 'armips')
- addFileToProject("Include", ".inc", (s) => { return '\t.include "'+s+'"' });
+ addFileToProject("Include", ".inc", (s) => { return '\t.include "' + s + '"' });
else if (tool == 'verilator')
- addFileToProject("Verilog", ".v", (s) => { return '`include "'+s+'"' });
+ addFileToProject("Verilog", ".v", (s) => { return '`include "' + s + '"' });
else if (tool == 'wiz')
- addFileToProject("Include", ".wiz", (s) => { return 'import "'+s+'";' });
+ addFileToProject("Include", ".wiz", (s) => { return 'import "' + s + '";' });
else if (tool == 'ecs')
- addFileToProject("Include", ".ecs", (s) => { return 'import "'+s+'"' });
+ addFileToProject("Include", ".ecs", (s) => { return 'import "' + s + '"' });
else if (tool == 'acme')
- addFileToProject("Include", ".acme", (s) => { return '!src "'+s+'"' });
+ addFileToProject("Include", ".acme", (s) => { return '!src "' + s + '"' });
else
alertError("Can't add include file to this project type (" + tool + ")");
}
@@ -1329,9 +1352,9 @@ function _addLinkFile() {
var fn = getCurrentMainFilename();
var tool = platform.getToolForFilename(fn);
if (fn.endsWith(".c") || tool == 'sdcc' || tool == 'cc65' || tool == 'cmoc' || tool == 'smlrc')
- addFileToProject("Linked C (or .s)", ".c", (s) => { return '//#link "'+s+'"' });
+ addFileToProject("Linked C (or .s)", ".c", (s) => { return '//#link "' + s + '"' });
else if (fn.endsWith("asm") || fn.endsWith(".s") || tool == 'ca65' || tool == 'lwasm')
- addFileToProject("Linked ASM", ".inc", (s) => { return ';#link "'+s+'"' });
+ addFileToProject("Linked ASM", ".inc", (s) => { return ';#link "' + s + '"' });
else
alertError("Can't add linked file to this project type (" + tool + ")");
}
@@ -1339,40 +1362,40 @@ function _addLinkFile() {
function setupDebugControls() {
// create toolbar buttons
uitoolbar = new Toolbar($("#toolbar")[0], null);
- uitoolbar.grp.prop('id','run_bar');
- uitoolbar.add('ctrl+alt+r', 'Reset', 'glyphicon-refresh', resetAndRun).prop('id','dbg_reset');
- uitoolbar.add('ctrl+alt+,', 'Pause', 'glyphicon-pause', pause).prop('id','dbg_pause');
- uitoolbar.add('ctrl+alt+.', 'Resume', 'glyphicon-play', resume).prop('id','dbg_go');
+ uitoolbar.grp.prop('id', 'run_bar');
+ uitoolbar.add('ctrl+alt+r', 'Reset', 'glyphicon-refresh', resetAndRun).prop('id', 'dbg_reset');
+ uitoolbar.add('ctrl+alt+,', 'Pause', 'glyphicon-pause', pause).prop('id', 'dbg_pause');
+ uitoolbar.add('ctrl+alt+.', 'Resume', 'glyphicon-play', resume).prop('id', 'dbg_go');
if (platform.restartAtPC) {
- uitoolbar.add('ctrl+alt+/', 'Restart at Cursor', 'glyphicon-play-circle', restartAtCursor).prop('id','dbg_restartatline');
+ uitoolbar.add('ctrl+alt+/', 'Restart at Cursor', 'glyphicon-play-circle', restartAtCursor).prop('id', 'dbg_restartatline');
}
uitoolbar.newGroup();
- uitoolbar.grp.prop('id','debug_bar');
+ uitoolbar.grp.prop('id', 'debug_bar');
if (platform.runEval) {
- uitoolbar.add('ctrl+alt+e', 'Reset and Debug', 'glyphicon-fast-backward', resetAndDebug).prop('id','dbg_restart');
+ uitoolbar.add('ctrl+alt+e', 'Reset and Debug', 'glyphicon-fast-backward', resetAndDebug).prop('id', 'dbg_restart');
}
if (platform.stepBack) {
- uitoolbar.add('ctrl+alt+b', 'Step Backwards', 'glyphicon-step-backward', runStepBackwards).prop('id','dbg_stepback');
+ uitoolbar.add('ctrl+alt+b', 'Step Backwards', 'glyphicon-step-backward', runStepBackwards).prop('id', 'dbg_stepback');
}
if (platform.step) {
- uitoolbar.add('ctrl+alt+s', 'Single Step', 'glyphicon-step-forward', singleStep).prop('id','dbg_step');
+ uitoolbar.add('ctrl+alt+s', 'Single Step', 'glyphicon-step-forward', singleStep).prop('id', 'dbg_step');
}
if (platform.stepOver) {
- uitoolbar.add('ctrl+alt+t', 'Step Over', 'glyphicon-hand-right', stepOver).prop('id','dbg_stepover');
+ uitoolbar.add('ctrl+alt+t', 'Step Over', 'glyphicon-hand-right', stepOver).prop('id', 'dbg_stepover');
}
if (platform.runUntilReturn) {
- uitoolbar.add('ctrl+alt+o', 'Step Out of Subroutine', 'glyphicon-hand-up', runUntilReturn).prop('id','dbg_stepout');
+ uitoolbar.add('ctrl+alt+o', 'Step Out of Subroutine', 'glyphicon-hand-up', runUntilReturn).prop('id', 'dbg_stepout');
}
if (platform.runToVsync) {
- uitoolbar.add('ctrl+alt+n', 'Next Frame/Interrupt', 'glyphicon-forward', singleFrameStep).prop('id','dbg_tovsync');
+ uitoolbar.add('ctrl+alt+n', 'Next Frame/Interrupt', 'glyphicon-forward', singleFrameStep).prop('id', 'dbg_tovsync');
}
if ((platform.runEval || platform.runToPC) && !platform_id.startsWith('verilog')) {
- uitoolbar.add('ctrl+alt+l', 'Run To Line', 'glyphicon-save', runToCursor).prop('id','dbg_toline');
+ uitoolbar.add('ctrl+alt+l', 'Run To Line', 'glyphicon-save', runToCursor).prop('id', 'dbg_toline');
}
uitoolbar.newGroup();
- uitoolbar.grp.prop('id','xtra_bar');
+ uitoolbar.grp.prop('id', 'xtra_bar');
// add menu clicks
- $(".dropdown-menu").collapse({toggle: false});
+ $(".dropdown-menu").collapse({ toggle: false });
$("#item_new_file").click(_createNewFile);
$("#item_upload_file").click(_uploadNewFile);
$("#item_open_directory").click(_openLocalDirectory);
@@ -1425,7 +1448,7 @@ function setupDebugControls() {
}
// help menu items
if (platform.showHelp) {
- let {li,a} = newDropdownListItem('help__'+platform_id, platform_name+' Help');
+ let { li, a } = newDropdownListItem('help__' + platform_id, platform_name + ' Help');
$("#help_menu").append(li);
$(a).click(() => window.open(platform.showHelp(), '_8bws_help'));
}
@@ -1433,69 +1456,69 @@ function setupDebugControls() {
let tool = platform.getToolForFilename(getCurrentMainFilename());
let toolhelpurl = TOOL_TO_HELPURL[tool];
if (toolhelpurl) {
- let {li,a} = newDropdownListItem('help__'+tool, tool+' Help');
+ let { li, a } = newDropdownListItem('help__' + tool, tool + ' Help');
$("#help_menu").append(li);
$(a).click(() => window.open(toolhelpurl, '_8bws_help'));
}
}
function setupReplaySlider() {
- var replayslider = $("#replayslider");
- var clockslider = $("#clockslider");
- var replayframeno = $("#replay_frame");
- var clockno = $("#replay_clock");
- if (!platform.advanceFrameClock) $("#clockdiv").hide(); // TODO: put this test in recorder?
- var updateFrameNo = () => {
- replayframeno.text(stateRecorder.lastSeekFrame+"");
- clockno.text(stateRecorder.lastSeekStep+"");
- };
- var sliderChanged = (e) => {
- _pause();
- var frame : number = parseInt(replayslider.val().toString());
- var step : number = parseInt(clockslider.val().toString());
- if (stateRecorder.loadFrame(frame, step) >= 0) {
- clockslider.attr('min', 0);
- clockslider.attr('max', stateRecorder.lastStepCount);
- updateFrameNo();
- uiDebugCallback(platform.saveState());
- }
- };
- var setFrameTo = (frame:number) => {
- _pause();
- if (stateRecorder.loadFrame(frame) >= 0) {
- replayslider.val(frame);
- updateFrameNo();
- uiDebugCallback(platform.saveState());
- }
- };
- var setClockTo = (clock:number) => {
- _pause();
- var frame : number = parseInt(replayslider.val().toString());
- if (stateRecorder.loadFrame(frame, clock) >= 0) {
- clockslider.val(clock);
- updateFrameNo();
- uiDebugCallback(platform.saveState());
- }
- };
- stateRecorder.callbackStateChanged = () => {
- replayslider.attr('min', 0);
- replayslider.attr('max', stateRecorder.numFrames());
- replayslider.val(stateRecorder.currentFrame());
- clockslider.val(stateRecorder.currentStep());
+ var replayslider = $("#replayslider");
+ var clockslider = $("#clockslider");
+ var replayframeno = $("#replay_frame");
+ var clockno = $("#replay_clock");
+ if (!platform.advanceFrameClock) $("#clockdiv").hide(); // TODO: put this test in recorder?
+ var updateFrameNo = () => {
+ replayframeno.text(stateRecorder.lastSeekFrame + "");
+ clockno.text(stateRecorder.lastSeekStep + "");
+ };
+ var sliderChanged = (e) => {
+ _pause();
+ var frame: number = parseInt(replayslider.val().toString());
+ var step: number = parseInt(clockslider.val().toString());
+ if (stateRecorder.loadFrame(frame, step) >= 0) {
+ clockslider.attr('min', 0);
+ clockslider.attr('max', stateRecorder.lastStepCount);
+ updateFrameNo();
+ uiDebugCallback(platform.saveState());
+ }
+ };
+ var setFrameTo = (frame: number) => {
+ _pause();
+ if (stateRecorder.loadFrame(frame) >= 0) {
+ replayslider.val(frame);
+ updateFrameNo();
+ uiDebugCallback(platform.saveState());
+ }
+ };
+ var setClockTo = (clock: number) => {
+ _pause();
+ var frame: number = parseInt(replayslider.val().toString());
+ if (stateRecorder.loadFrame(frame, clock) >= 0) {
+ clockslider.val(clock);
updateFrameNo();
- showDebugInfo(platform.saveState());
- };
- replayslider.on('input', sliderChanged);
- clockslider.on('input', sliderChanged);
- //replayslider.on('change', sliderChanged);
- $("#replay_min").click(() => { setFrameTo(1) });
- $("#replay_max").click(() => { setFrameTo(stateRecorder.numFrames()); });
- $("#replay_back").click(() => { setFrameTo(parseInt(replayslider.val().toString()) - 1); });
- $("#replay_fwd").click(() => { setFrameTo(parseInt(replayslider.val().toString()) + 1); });
- $("#clock_back").click(() => { setClockTo(parseInt(clockslider.val().toString()) - 1); });
- $("#clock_fwd").click(() => { setClockTo(parseInt(clockslider.val().toString()) + 1); });
- $("#replay_bar").show();
- uitoolbar.add('ctrl+alt+0', 'Start/Stop Replay Recording', 'glyphicon-record', _toggleRecording).prop('id','dbg_record');
+ uiDebugCallback(platform.saveState());
+ }
+ };
+ stateRecorder.callbackStateChanged = () => {
+ replayslider.attr('min', 0);
+ replayslider.attr('max', stateRecorder.numFrames());
+ replayslider.val(stateRecorder.currentFrame());
+ clockslider.val(stateRecorder.currentStep());
+ updateFrameNo();
+ showDebugInfo(platform.saveState());
+ };
+ replayslider.on('input', sliderChanged);
+ clockslider.on('input', sliderChanged);
+ //replayslider.on('change', sliderChanged);
+ $("#replay_min").click(() => { setFrameTo(1) });
+ $("#replay_max").click(() => { setFrameTo(stateRecorder.numFrames()); });
+ $("#replay_back").click(() => { setFrameTo(parseInt(replayslider.val().toString()) - 1); });
+ $("#replay_fwd").click(() => { setFrameTo(parseInt(replayslider.val().toString()) + 1); });
+ $("#clock_back").click(() => { setClockTo(parseInt(clockslider.val().toString()) - 1); });
+ $("#clock_fwd").click(() => { setClockTo(parseInt(clockslider.val().toString()) + 1); });
+ $("#replay_bar").show();
+ uitoolbar.add('ctrl+alt+0', 'Start/Stop Replay Recording', 'glyphicon-record', _toggleRecording).prop('id', 'dbg_record');
}
@@ -1524,46 +1547,46 @@ async function showWelcomeMessage() {
await loadScript('lib/bootstrap-tourist.js');
var is_vcs = platform_id.startsWith('vcs');
var steps = [
- {
- element: "#platformsMenuButton",
- placement: 'right',
- title: "Platform Selector",
- content: "You're currently on the \"
" + platform_id + "\" platform. You can choose a different one from the menu."
- },
- {
- element: "#preset_select",
- title: "Project Selector",
- content: "You can choose different code examples, create your own files, or import projects from GitHub."
- },
- {
- element: "#workspace",
- title: "Code Editor",
- content: is_vcs ? "Type your 6502 assembly code into the editor, and it'll be assembled in real-time."
- : "Type your source code into the editor, and it'll be compiled in real-time."
- },
- {
- element: "#emulator",
- placement: 'left',
- title: "Emulator",
- content: "We'll load your compiled code into the emulator whenever you make changes."
- },
- {
- element: "#debug_bar",
- placement: 'bottom',
- title: "Debug Tools",
- content: "Use these buttons to set breakpoints, single step through code, pause/resume, and use debugging tools."
- },
- {
- element: "#dropdownMenuButton",
- title: "Main Menu",
- content: "Click the menu to create new files, download your code, or share your work with others."
- },
- {
- element: "#sidebar",
- title: "Sidebar",
- content: "Pull right to expose the sidebar. It lets you switch between source files, view assembly listings, and use other tools like Disassembler, Memory Browser, and Asset Editor."
- }
- ];
+ {
+ element: "#platformsMenuButton",
+ placement: 'right',
+ title: "Platform Selector",
+ content: "You're currently on the \"
" + platform_id + "\" platform. You can choose a different one from the menu."
+ },
+ {
+ element: "#preset_select",
+ title: "Project Selector",
+ content: "You can choose different code examples, create your own files, or import projects from GitHub."
+ },
+ {
+ element: "#workspace",
+ title: "Code Editor",
+ content: is_vcs ? "Type your 6502 assembly code into the editor, and it'll be assembled in real-time."
+ : "Type your source code into the editor, and it'll be compiled in real-time."
+ },
+ {
+ element: "#emulator",
+ placement: 'left',
+ title: "Emulator",
+ content: "We'll load your compiled code into the emulator whenever you make changes."
+ },
+ {
+ element: "#debug_bar",
+ placement: 'bottom',
+ title: "Debug Tools",
+ content: "Use these buttons to set breakpoints, single step through code, pause/resume, and use debugging tools."
+ },
+ {
+ element: "#dropdownMenuButton",
+ title: "Main Menu",
+ content: "Click the menu to create new files, download your code, or share your work with others."
+ },
+ {
+ element: "#sidebar",
+ title: "Sidebar",
+ content: "Pull right to expose the sidebar. It lets you switch between source files, view assembly listings, and use other tools like Disassembler, Memory Browser, and Asset Editor."
+ }
+ ];
if (!isLandscape()) {
steps.unshift({
element: "#controls_top",
@@ -1601,9 +1624,9 @@ async function showWelcomeMessage() {
});
}
var tour = new Tour({
- autoscroll:false,
+ autoscroll: false,
//storage:false,
- steps:steps,
+ steps: steps,
onEnd: () => {
userPrefs.completedTour();
//requestPersistPermission(false, true);
@@ -1616,7 +1639,7 @@ async function showWelcomeMessage() {
///////////////////////////////////////////////////
function globalErrorHandler(msgevent) {
- var msg = (msgevent.message || msgevent.error || msgevent)+"";
+ var msg = (msgevent.message || msgevent.error || msgevent) + "";
// storage quota full? (Chrome) try to expand it
if (msg.indexOf("QuotaExceededError") >= 0) {
requestPersistPermission(false, false);
@@ -1640,13 +1663,13 @@ function installErrorHandler() {
window.addEventListener('error', globalErrorHandler);
window.addEventListener('unhandledrejection', globalErrorHandler);
}
-
+
function uninstallErrorHandler() {
window.removeEventListener('error', globalErrorHandler);
window.removeEventListener('unhandledrejection', globalErrorHandler);
}
-export function gotoNewLocation(replaceHistory? : boolean, newQueryString?: {}) {
+export function gotoNewLocation(replaceHistory?: boolean, newQueryString?: {}) {
if (newQueryString) {
qs = newQueryString;
}
@@ -1718,7 +1741,7 @@ function installGAHooks() {
gaEvent('menu', e.target.id);
}
});
- gaPageView(location.pathname+'?platform='+platform_id+(repo_id?('&repo='+repo_id):('&file='+qs.file)));
+ gaPageView(location.pathname + '?platform=' + platform_id + (repo_id ? ('&repo=' + repo_id) : ('&file=' + qs.file)));
}
}
@@ -1781,7 +1804,7 @@ function updateBooksMenu() {
}
function revealTopBar() {
- setTimeout(() => { $("#controls_dynamic").css('visibility','inherit'); }, 250);
+ setTimeout(() => { $("#controls_dynamic").css('visibility', 'inherit'); }, 250);
}
export function setupSplits() {
@@ -1813,7 +1836,7 @@ export function setupSplits() {
});
}
-function loadImportedURL(url : string) {
+function loadImportedURL(url: string) {
// TODO: zip file?
const ignore = parseBool(qs.ignore) || isEmbed;
setWaitDialog(true);
@@ -1851,14 +1874,14 @@ async function loadFormDataUpload() {
} else {
force = false; // can't use force w/o embed=1
}
- for (var i=0; i<20; i++) {
- let path = qs['file'+i+'_name'];
- let dataenc = qs['file'+i+'_data'];
+ for (var i = 0; i < 20; i++) {
+ let path = qs['file' + i + '_name'];
+ let dataenc = qs['file' + i + '_data'];
if (path == null || dataenc == null) break;
var olddata = await store.getItem(path);
if (!(ignore && olddata)) {
let value = dataenc;
- if (qs['file'+i+'_type'] == 'binary') {
+ if (qs['file' + i + '_type'] == 'binary') {
value = stringToByteArray(atob(value));
}
if (!olddata || force || confirm("Replace existing file '" + path + "'?")) {
@@ -1866,9 +1889,9 @@ async function loadFormDataUpload() {
}
}
if (i == 0) { qs.file = path; } // set main filename
- delete qs['file'+i+'_name'];
- delete qs['file'+i+'_data'];
- delete qs['file'+i+'_type'];
+ delete qs['file' + i + '_name'];
+ delete qs['file' + i + '_data'];
+ delete qs['file' + i + '_type'];
}
delete qs.ignore;
delete qs.force;
@@ -1877,7 +1900,7 @@ async function loadFormDataUpload() {
function setPlatformUI() {
var name = platform.getPlatformName && platform.getPlatformName();
- var menuitem = $('a[href="?platform='+platform_id+'"]');
+ var menuitem = $('a[href="?platform=' + platform_id + '"]');
if (menuitem.length) {
menuitem.addClass("dropdown-item-checked");
name = name || menuitem.text() || name;
@@ -1892,7 +1915,7 @@ export function getPlatformAndRepo() {
repo_id = qs.repo;
// only look at cached repo_id if file= is not present, so back button works
if (!qs.repo && !qs.file)
- repo_id = userPrefs.getLastRepoID(platform_id);
+ repo_id = userPrefs.getLastRepoID(platform_id);
// are we in a repo?
if (hasLocalStorage && repo_id && repo_id !== '/') {
var repo = getRepos()[repo_id];
@@ -1953,7 +1976,7 @@ async function loadAndStartPlatform() {
var module = await importPlatform(getRootBasePlatform(platform_id));
console.log("starting platform", platform_id); // loaded required
.js file
await startPlatform();
- document.title = document.title + " [" + platform_id + "] - " + (repo_id?('['+repo_id+'] - '):'') + current_project.mainPath;
+ document.title = document.title + " [" + platform_id + "] - " + (repo_id ? ('[' + repo_id + '] - ') : '') + current_project.mainPath;
} catch (e) {
console.log(e);
alertError('Platform "' + platform_id + '" failed to load.');
@@ -1966,11 +1989,11 @@ async function loadAndStartPlatform() {
const useHTTPSCookieName = "__use_https";
-function setHTTPSCookie(val : number) {
+function setHTTPSCookie(val: number) {
document.cookie = useHTTPSCookieName + "=" + val + ";domain=8bitworkshop.com;path=/;max-age=315360000";
}
-function shouldRedirectHTTPS() : boolean {
+function shouldRedirectHTTPS(): boolean {
// cookie set? either true or false
var shouldRedir = getCookie(useHTTPSCookieName);
if (typeof shouldRedir === 'string') {
@@ -1983,14 +2006,14 @@ function shouldRedirectHTTPS() : boolean {
}
function _switchToHTTPS() {
- bootbox.confirm('Do you want to force the browser to use HTTPS from now on?
'+
- 'WARNING: This will make all of your local files unavailable, so you should "Download All Changes" first for each platform where you have done work.
'+
- 'You can go back to HTTP by setting the "'+useHTTPSCookieName+'" cookie to 0.
', (ok) => {
- if (ok) {
- setHTTPSCookie(1);
- redirectToHTTPS();
- }
- });
+ bootbox.confirm('Do you want to force the browser to use HTTPS from now on?
' +
+ 'WARNING: This will make all of your local files unavailable, so you should "Download All Changes" first for each platform where you have done work.
' +
+ 'You can go back to HTTP by setting the "' + useHTTPSCookieName + '" cookie to 0.
', (ok) => {
+ if (ok) {
+ setHTTPSCookie(1);
+ redirectToHTTPS();
+ }
+ });
}
function redirectToHTTPS() {
@@ -2013,7 +2036,7 @@ export function setTestInput(path: string, data: FileData) {
platform.writeFile(path, data);
}
-export function getTestOutput(path: string) : FileData {
+export function getTestOutput(path: string): FileData {
return platform.readFile(path);
}
@@ -2029,7 +2052,7 @@ export function emulationHalted(err: EmuHalt) {
}
// get remote file from local fs
-declare var alternateLocalFilesystem : ProjectFilesystem;
+declare var alternateLocalFilesystem: ProjectFilesystem;
export async function reloadWorkspaceFile(path: string) {
var oldval = current_project.filedata[path];
@@ -2041,7 +2064,7 @@ export async function reloadWorkspaceFile(path: string) {
function writeOutputROMFile() {
if (isElectron && current_output instanceof Uint8Array) {
var prefix = getFilenamePrefix(getCurrentMainFilename());
- var suffix = (platform.getROMExtension && platform.getROMExtension(current_output))
+ var suffix = (platform.getROMExtension && platform.getROMExtension(current_output))
|| "-" + getBasePlatform(platform_id) + ".bin";
alternateLocalFilesystem.setFileData(`bin/${prefix}${suffix}`, current_output);
}
@@ -2071,7 +2094,7 @@ function startUIWhenVisible() {
_resume();
}
}
- }, { });
+ }, {});
observer.observe($("#emulator")[0]); //window.document.body);
}
diff --git a/src/ide/views/asseteditor.ts b/src/ide/views/asseteditor.ts
index 1cdf47c9..a8745edc 100644
--- a/src/ide/views/asseteditor.ts
+++ b/src/ide/views/asseteditor.ts
@@ -385,9 +385,9 @@ export class AssetEditorView implements ProjectView, pixed.EditorContext {
setVisible?(showing : boolean) : void {
// TODO: make into toolbar?
if (showing) {
- if (Mousetrap.bind) Mousetrap.bind('ctrl+z', projectWindows.undoStep.bind(projectWindows));
+ if (Mousetrap.bind) Mousetrap.bind('mod+z', projectWindows.undoStep.bind(projectWindows));
} else {
- if (Mousetrap.unbind) Mousetrap.unbind('ctrl+z');
+ if (Mousetrap.unbind) Mousetrap.unbind('mod+z');
}
}
diff --git a/src/ide/views/debug.ts b/src/ide/views/debug.ts
new file mode 100644
index 00000000..4056e838
--- /dev/null
+++ b/src/ide/views/debug.ts
@@ -0,0 +1,56 @@
+import { LRLanguage, StreamLanguage, language, syntaxTree } from "@codemirror/language";
+import { hoverTooltip } from "@codemirror/view";
+import { getStyleTags } from "@lezer/highlight";
+
+// Tooltip to show tags, useful for theme and parser development.
+export const debugHighlightTagsTooltip = hoverTooltip((view, pos, side) => {
+ let tree = syntaxTree(view.state).resolveInner(pos, side);
+ let style = getStyleTags(tree);
+ let tagList = "";
+ if (style) {
+ for (let tag of style.tags) {
+ tagList += tag.set.join(" < ") + "\n";
+ }
+ }
+
+ let lang = view.state.facet(language);
+ let parserType = (lang instanceof LRLanguage) ? "Lezer LRLanguage" :
+ (lang instanceof StreamLanguage) ? "StreamLanguage" : "Unknown";
+ let treeName = (lang instanceof LRLanguage) ? "AST " :
+ (lang instanceof StreamLanguage) ? "Token " : "Name ";
+
+ return {
+ pos: pos,
+ above: true,
+ arrow: true,
+ create(view) {
+ let dom = document.createElement("div");
+ // Zero size element, so tooltip quickly dismisses when mouse moves over it, force
+ // CodeMirror's getBoundingClientRect() in isInTooltip() to always return false.
+ dom.style.overflow = "visible";
+ dom.style.height = "0";
+ dom.style.width = "0";
+ // Tooltip content.
+ let inner = document.createElement("div");
+ inner.className = "cm-debug-tooltip";
+ inner.textContent = `Parser: ${parserType}\n${treeName}: ${tree.name}\nTags : ${tagList}`;
+ inner.style.whiteSpace = "pre-wrap";
+ inner.style.fontFamily = "monospace";
+ inner.style.background = "#333";
+ inner.style.color = "white";
+ inner.style.padding = "2px 8px";
+ inner.style.borderRadius = "4px";
+ inner.style.fontSize = "12px";
+ inner.style.border = "1px solid #555";
+ inner.style.pointerEvents = "none";
+ inner.style.position = "absolute";
+ inner.style.bottom = "0";
+ inner.style.width = "max-content";
+ dom.appendChild(inner);
+ return { dom };
+ }
+ };
+}, {
+ hoverTime: 10,
+ hideOnChange: true,
+});
\ No newline at end of file
diff --git a/src/ide/views/debugviews.ts b/src/ide/views/debugviews.ts
index 089d2691..a344f4c7 100644
--- a/src/ide/views/debugviews.ts
+++ b/src/ide/views/debugviews.ts
@@ -1,18 +1,18 @@
-import { newDiv, ProjectView } from "./baseviews";
-import { Segment } from "../../common/workertypes";
-import { platform, current_project, projectWindows, runToPC, setupBreakpoint, getWorkerParams } from "../ui";
-import { hex, lpad, rpad } from "../../common/util";
-import { VirtualList } from "../../common/vlist";
+import { BaseZ80MachinePlatform, BaseZ80Platform } from "../../common/baseplatform";
import { getMousePos, getVisibleEditorLineHeight, VirtualTextLine, VirtualTextScroller } from "../../common/emu";
import { ProbeFlags, ProbeRecorder } from "../../common/probe";
-import { BaseZ80MachinePlatform, BaseZ80Platform } from "../../common/baseplatform";
+import { hex, lpad, rpad } from "../../common/util";
+import { VirtualList } from "../../common/vlist";
+import { Segment } from "../../common/workertypes";
+import { current_project, getWorkerParams, platform, projectWindows, runToPC, setupBreakpoint } from "../ui";
+import { newDiv, ProjectView } from "./baseviews";
///
-function ignoreSymbol(sym:string) {
- return sym.endsWith('_SIZE__') || sym.endsWith('_LAST__') || sym.endsWith('STACKSIZE__') || sym.endsWith('FILEOFFS__')
- || sym.startsWith('l__') || sym.startsWith('s__') || sym.startsWith('.__.');
+function ignoreSymbol(sym: string) {
+ return sym.endsWith('_SIZE__') || sym.endsWith('_LAST__') || sym.endsWith('STACKSIZE__') || sym.endsWith('FILEOFFS__')
+ || sym.startsWith('l__') || sym.startsWith('s__') || sym.startsWith('.__.');
}
// TODO: make it use debug state
@@ -21,12 +21,12 @@ function ignoreSymbol(sym:string) {
export class MemoryView implements ProjectView {
memorylist;
dumplines;
- maindiv : HTMLElement;
+ maindiv: HTMLElement;
recreateOnResize = true;
hibits = 0; // a hack to make it work with 32-bit addresses
totalRows = 0x1400; // a little more room in case we split lots of lines
- createDiv(parent : HTMLElement) {
+ createDiv(parent: HTMLElement) {
var div = document.createElement('div');
div.setAttribute("class", "memdump");
parent.appendChild(div);
@@ -34,13 +34,13 @@ export class MemoryView implements ProjectView {
return this.maindiv = div;
}
- showMemoryWindow(workspace:HTMLElement, parent:HTMLElement) {
+ showMemoryWindow(workspace: HTMLElement, parent: HTMLElement) {
this.memorylist = new VirtualList({
w: $(workspace).width(),
h: $(workspace).height(),
itemHeight: getVisibleEditorLineHeight(),
totalRows: this.totalRows,
- generatorFn: (row : number) => {
+ generatorFn: (row: number) => {
var s = this.getMemoryLineAt(row);
var linediv = document.createElement("div");
if (this.dumplines) {
@@ -58,7 +58,7 @@ export class MemoryView implements ProjectView {
this.scrollToAddress(compparams.data_start);
}
- scrollToAddress(addr : number) {
+ scrollToAddress(addr: number) {
if (this.dumplines) {
this.hibits = addr & 0xffff0000;
this.memorylist.scrollToItem(this.findMemoryWindowLine(addr & 0xffff));
@@ -72,7 +72,7 @@ export class MemoryView implements ProjectView {
tick() {
if (this.memorylist) {
- $(this.maindiv).find('[data-index]').each( (i,e) => {
+ $(this.maindiv).find('[data-index]').each((i, e) => {
var div = $(e);
var row = parseInt(div.attr('data-index'));
var oldtext = div.text();
@@ -83,7 +83,7 @@ export class MemoryView implements ProjectView {
}
}
- getMemoryLineAt(row : number) : string {
+ getMemoryLineAt(row: number): string {
var offset = row * 16;
var n1 = 0;
var n2 = 16;
@@ -99,24 +99,24 @@ export class MemoryView implements ProjectView {
return '.';
}
}
- var s = hex(offset+n1,4) + ' ';
- for (var i=0; i 8) s += ' ';
- for (var i=n1; i nextofs) ofs2 = nextofs;
//if (ofs < 1000) console.log(ofs, ofs2, nextofs, sym);
- this.dumplines.push({a:ofs, l:ofs2-ofs, s:sym});
+ this.dumplines.push({ a: ofs, l: ofs2 - ofs, s: sym });
ofs = ofs2;
}
}
@@ -153,22 +153,22 @@ export class MemoryView implements ProjectView {
}
// TODO: use segments list?
- getMemorySegment(a:number) : string {
+ getMemorySegment(a: number): string {
const compparams = getWorkerParams();
if (compparams) {
- if (a >= compparams.data_start && a < compparams.data_start+compparams.data_size) {
+ if (a >= compparams.data_start && a < compparams.data_start + compparams.data_size) {
if (platform.getSP && a >= platform.getSP() - 15)
return 'stack';
else
return 'data';
}
- else if (a >= compparams.code_start && a < compparams.code_start+(compparams.code_size||compparams.rom_size))
+ else if (a >= compparams.code_start && a < compparams.code_start + (compparams.code_size || compparams.rom_size))
return 'code';
}
var segments = current_project.segments;
if (segments) {
for (var seg of segments) {
- if (a >= seg.start && a < seg.start+seg.size) {
+ if (a >= seg.start && a < seg.start + seg.size) {
if (seg.type == 'rom') return 'code';
if (seg.type == 'ram') return 'data';
if (seg.type == 'io') return 'io';
@@ -178,8 +178,8 @@ export class MemoryView implements ProjectView {
return 'unknown';
}
- findMemoryWindowLine(a:number) : number {
- for (var i=0; i= a)
return i;
}
@@ -187,10 +187,10 @@ export class MemoryView implements ProjectView {
export class VRAMMemoryView extends MemoryView {
totalRows = 0x800;
- readAddress(n : number) {
+ readAddress(n: number) {
return platform.readVRAMAddress(n);
}
- getMemorySegment(a:number) : string {
+ getMemorySegment(a: number): string {
return 'video';
}
getDumpLines() {
@@ -201,51 +201,51 @@ export class VRAMMemoryView extends MemoryView {
///
export class BinaryFileView implements ProjectView {
- vlist : VirtualTextScroller;
- maindiv : HTMLElement;
- path:string;
- data:Uint8Array;
+ vlist: VirtualTextScroller;
+ maindiv: HTMLElement;
+ path: string;
+ data: Uint8Array;
recreateOnResize = true;
- constructor(path:string, data:Uint8Array) {
+ constructor(path: string, data: Uint8Array) {
this.path = path;
this.data = data;
}
- createDiv(parent : HTMLElement) {
+ createDiv(parent: HTMLElement) {
this.vlist = new VirtualTextScroller(parent);
- this.vlist.create(parent, ((this.data.length+15) >> 4), this.getMemoryLineAt.bind(this));
+ this.vlist.create(parent, ((this.data.length + 15) >> 4), this.getMemoryLineAt.bind(this));
return this.vlist.maindiv;
}
- getMemoryLineAt(row : number) : VirtualTextLine {
+ getMemoryLineAt(row: number): VirtualTextLine {
var offset = row * 16;
var n1 = 0;
var n2 = 16;
- var s = hex(offset+n1,4) + ' ';
- for (var i=0; i 8) s += ' ';
- for (var i=n1; i=0?hex(read,2):' ');
+ for (var i = n1; i < n2; i++) {
+ var read = this.data[offset + i];
+ if (i == 8) s += ' ';
+ s += ' ' + (read >= 0 ? hex(read, 2) : ' ');
}
- return {text:s};
+ return { text: s };
}
refresh() {
this.vlist.refresh();
}
-
+
getPath() { return this.path; }
}
///
export class MemoryMapView implements ProjectView {
- maindiv : JQuery;
+ maindiv: JQuery;
- createDiv(parent : HTMLElement) {
+ createDiv(parent: HTMLElement) {
this.maindiv = newDiv(parent, 'vertical-scroll');
this.maindiv.css('display', 'grid');
this.maindiv.css('grid-template-columns', '5em 40% 40%');
@@ -255,24 +255,24 @@ export class MemoryMapView implements ProjectView {
}
// TODO: overlapping segments (e.g. ROM + LC)
- addSegment(seg : Segment, newrow : boolean) {
+ addSegment(seg: Segment, newrow: boolean) {
if (newrow) {
var offset = $('');
- offset.text('$'+hex(seg.start,4));
+ offset.text('$' + hex(seg.start, 4));
this.maindiv.append(offset);
}
var segdiv = $('');
segdiv.text(seg.name);
- let alttext = `$${hex(seg.start)} - $${hex(seg.last || seg.start+seg.size-1)}`
+ let alttext = `$${hex(seg.start)} - $${hex(seg.last || seg.start + seg.size - 1)}`
alttext += ` (${seg.size} bytes)`;
// set alttext of div
segdiv.attr('title', alttext);
if (!newrow || seg.source == 'linker')
segdiv.css('grid-column-start', 3); // make sure it's on right side
- var pad = Math.max(3.0, Math.log(seg.size+1)) * 0.5;
- segdiv.css('height', pad+'em');
+ var pad = Math.max(3.0, Math.log(seg.size + 1)) * 0.5;
+ segdiv.css('height', pad + 'em');
if (seg.type) {
- segdiv.addClass('segment-'+seg.type);
+ segdiv.addClass('segment-' + seg.type);
}
this.maindiv.append(segdiv);
//var row = $('').append(offset, segdiv);
@@ -312,14 +312,14 @@ export class MemoryMapView implements ProjectView {
const OPAQUE_BLACK = 0xff000000;
export abstract class ProbeViewBaseBase {
- probe : ProbeRecorder;
- tooldiv : HTMLElement;
- cumulativeData : boolean = false;
- cyclesPerLine : number;
- totalScanlines : number;
- sp : number; // stack pointer
+ probe: ProbeRecorder;
+ tooldiv: HTMLElement;
+ cumulativeData: boolean = false;
+ cyclesPerLine: number;
+ totalScanlines: number;
+ sp: number; // stack pointer
- abstract tick() : void;
+ abstract tick(): void;
constructor() {
var width = 160;
@@ -333,12 +333,12 @@ export abstract class ProbeViewBaseBase {
this.totalScanlines = height;
}
- addr2symbol(addr : number) : string {
+ addr2symbol(addr: number): string {
var _addr2sym = (platform.debugSymbols && platform.debugSymbols.addr2symbol) || {};
return _addr2sym[addr];
}
- addr2str(addr : number) : string {
+ addr2str(addr: number): string {
var sym = this.addr2symbol(addr);
if (typeof sym === 'string')
return '$' + hex(addr) + ' (' + sym + ')';
@@ -346,7 +346,7 @@ export abstract class ProbeViewBaseBase {
return '$' + hex(addr);
}
- showTooltip(s:string) {
+ showTooltip(s: string) {
if (s) {
if (!this.tooldiv) {
this.tooldiv = document.createElement("div");
@@ -359,7 +359,7 @@ export abstract class ProbeViewBaseBase {
}
}
- setVisible(showing : boolean) : void {
+ setVisible(showing: boolean): void {
if (showing) {
this.probe = platform.startProbing();
this.probe.singleFrame = !this.cumulativeData;
@@ -371,22 +371,22 @@ export abstract class ProbeViewBaseBase {
}
}
- redraw( eventfn:(op,addr,col,row,clk,value) => void ) {
+ redraw(eventfn: (op, addr, col, row, clk, value) => void) {
var p = this.probe;
if (!p || !p.idx) return; // if no probe, or if empty
- var row=0;
- var col=0;
- var clk=0;
+ var row = 0;
+ var col = 0;
+ var clk = 0;
this.sp = 0;
- for (var i=0; i> 16) & 0xff;
var op = word & OPAQUE_BLACK;
switch (op) {
- case ProbeFlags.SCANLINE: row++; col=0; break;
- case ProbeFlags.FRAME: row=0; col=0; break;
- case ProbeFlags.CLOCKS: col += addr; clk += addr; break;
+ case ProbeFlags.SCANLINE: row++; col = 0; break;
+ case ProbeFlags.FRAME: row = 0; col = 0; break;
+ case ProbeFlags.CLOCKS: col += addr; clk += addr; break;
case ProbeFlags.SP_PUSH:
case ProbeFlags.SP_POP:
this.sp = addr;
@@ -397,59 +397,59 @@ export abstract class ProbeViewBaseBase {
}
}
- opToString(op:number, addr?:number, value?:number) {
+ opToString(op: number, addr?: number, value?: number) {
var s = "";
switch (op) {
- case ProbeFlags.EXECUTE: s = "Exec"; break;
- case ProbeFlags.MEM_READ: s = "Read"; break;
- case ProbeFlags.MEM_WRITE: s = "Write"; break;
- case ProbeFlags.IO_READ: s = "IO Read"; break;
- case ProbeFlags.IO_WRITE: s = "IO Write"; break;
- case ProbeFlags.VRAM_READ: s = "VRAM Read"; break;
- case ProbeFlags.VRAM_WRITE: s = "VRAM Write"; break;
- case ProbeFlags.DMA_READ: s = "DMA Read"; break;
- case ProbeFlags.DMA_WRITE: s = "DMA Write"; break;
- case ProbeFlags.INTERRUPT: s = "Interrupt"; break;
- case ProbeFlags.ILLEGAL: s = "Error"; break;
- case ProbeFlags.WAIT: s = "Wait"; break;
- case ProbeFlags.SP_PUSH: s = "Stack Push"; break;
- case ProbeFlags.SP_POP: s = "Stack Pop"; break;
- default: return "";
+ case ProbeFlags.EXECUTE: s = "Exec"; break;
+ case ProbeFlags.MEM_READ: s = "Read"; break;
+ case ProbeFlags.MEM_WRITE: s = "Write"; break;
+ case ProbeFlags.IO_READ: s = "IO Read"; break;
+ case ProbeFlags.IO_WRITE: s = "IO Write"; break;
+ case ProbeFlags.VRAM_READ: s = "VRAM Read"; break;
+ case ProbeFlags.VRAM_WRITE: s = "VRAM Write"; break;
+ case ProbeFlags.DMA_READ: s = "DMA Read"; break;
+ case ProbeFlags.DMA_WRITE: s = "DMA Write"; break;
+ case ProbeFlags.INTERRUPT: s = "Interrupt"; break;
+ case ProbeFlags.ILLEGAL: s = "Error"; break;
+ case ProbeFlags.WAIT: s = "Wait"; break;
+ case ProbeFlags.SP_PUSH: s = "Stack Push"; break;
+ case ProbeFlags.SP_POP: s = "Stack Pop"; break;
+ default: return "";
}
if (typeof addr == 'number') s += " " + this.addr2str(addr);
- if ((op & ProbeFlags.HAS_VALUE) && typeof value == 'number') s += " = $" + hex(value,2);
+ if ((op & ProbeFlags.HAS_VALUE) && typeof value == 'number') s += " = $" + hex(value, 2);
return s;
}
-
- getOpRGB(op:number, addr:number) : number {
+
+ getOpRGB(op: number, addr: number): number {
switch (op) {
- case ProbeFlags.EXECUTE: return 0x018001;
- case ProbeFlags.MEM_READ: return 0x800101;
- case ProbeFlags.MEM_WRITE: return 0x010180;
- case ProbeFlags.IO_READ: return 0x018080;
- case ProbeFlags.IO_WRITE: return 0xc00180;
+ case ProbeFlags.EXECUTE: return 0x018001;
+ case ProbeFlags.MEM_READ: return 0x800101;
+ case ProbeFlags.MEM_WRITE: return 0x010180;
+ case ProbeFlags.IO_READ: return 0x018080;
+ case ProbeFlags.IO_WRITE: return 0xc00180;
case ProbeFlags.DMA_READ:
- case ProbeFlags.VRAM_READ: return 0x808001;
+ case ProbeFlags.VRAM_READ: return 0x808001;
case ProbeFlags.DMA_WRITE:
- case ProbeFlags.VRAM_WRITE: return 0x4080c0;
- case ProbeFlags.INTERRUPT: return 0x3fbf3f;
- case ProbeFlags.ILLEGAL: return 0x3f3fff;
- case ProbeFlags.WAIT: return 0xff3f3f;
- default: return 0;
+ case ProbeFlags.VRAM_WRITE: return 0x4080c0;
+ case ProbeFlags.INTERRUPT: return 0x3fbf3f;
+ case ProbeFlags.ILLEGAL: return 0x3f3fff;
+ case ProbeFlags.WAIT: return 0xff3f3f;
+ default: return 0;
}
}
}
abstract class ProbeViewBase extends ProbeViewBaseBase {
- maindiv : HTMLElement;
- canvas : HTMLCanvasElement;
- ctx : CanvasRenderingContext2D;
+ maindiv: HTMLElement;
+ canvas: HTMLCanvasElement;
+ ctx: CanvasRenderingContext2D;
recreateOnResize = true;
-
+
abstract drawEvent(op, addr, col, row);
- createCanvas(parent:HTMLElement, width:number, height:number) {
+ createCanvas(parent: HTMLElement, width: number, height: number) {
var div = document.createElement('div');
var canvas = document.createElement('canvas');
canvas.width = width;
@@ -462,7 +462,7 @@ abstract class ProbeViewBase extends ProbeViewBaseBase {
canvas.onmousemove = (e) => {
var pos = getMousePos(canvas, e);
this.showTooltip(this.getTooltipText(pos.x, pos.y));
- $(this.tooldiv).css('left',e.pageX+10).css('top',e.pageY-30);
+ $(this.tooldiv).css('left', e.pageX + 10).css('top', e.pageY - 30);
}
canvas.onmouseout = (e) => {
$(this.tooldiv).hide();
@@ -477,16 +477,16 @@ abstract class ProbeViewBase extends ProbeViewBaseBase {
initCanvas() {
}
-
- getTooltipText(x:number, y:number) : string {
+
+ getTooltipText(x: number, y: number): string {
return null;
}
- getOpAtPos(x:number, y:number, mask:number) : number {
- x = x|0;
- y = y|0;
+ getOpAtPos(x: number, y: number, mask: number): number {
+ x = x | 0;
+ y = y | 0;
let result = 0;
- this.redraw( (op,addr,col,row,clk,value) => {
+ this.redraw((op, addr, col, row, clk, value) => {
if (!result && row == y && col >= x && (op & mask) != 0) {
result = op | addr;
}
@@ -496,7 +496,7 @@ abstract class ProbeViewBase extends ProbeViewBaseBase {
clear() {
}
-
+
tick() {
this.clear();
this.redraw(this.drawEvent.bind(this));
@@ -505,25 +505,25 @@ abstract class ProbeViewBase extends ProbeViewBaseBase {
abstract class ProbeBitmapViewBase extends ProbeViewBase {
- imageData : ImageData;
- datau32 : Uint32Array;
+ imageData: ImageData;
+ datau32: Uint32Array;
recreateOnResize = false;
-
- createDiv(parent : HTMLElement) {
+
+ createDiv(parent: HTMLElement) {
return this.createCanvas(parent, this.cyclesPerLine, this.totalScanlines);
}
initCanvas() {
this.imageData = this.ctx.createImageData(this.canvas.width, this.canvas.height);
this.datau32 = new Uint32Array(this.imageData.data.buffer);
}
- getTooltipText(x:number, y:number) : string {
- x = x|0;
- y = y|0;
+ getTooltipText(x: number, y: number): string {
+ x = x | 0;
+ y = y | 0;
var s = "";
var lastroutine = null;
var symstack = [];
var lastcol = -1;
- this.redraw( (op,addr,col,row,clk,value) => {
+ this.redraw((op, addr, col, row, clk, value) => {
switch (op) {
case ProbeFlags.EXECUTE:
lastroutine = this.addr2symbol(addr) || lastroutine;
@@ -543,7 +543,7 @@ abstract class ProbeBitmapViewBase extends ProbeViewBase {
if (s == "" && lastroutine) { s += "\n" + lastroutine; }
s += "\n" + this.opToString(op, addr, value);
}
- } );
+ });
return 'X: ' + x + ' Y: ' + y + ' ' + s;
}
@@ -565,10 +565,10 @@ abstract class ProbeBitmapViewBase extends ProbeViewBase {
export class AddressHeatMapView extends ProbeBitmapViewBase implements ProjectView {
- createDiv(parent : HTMLElement) {
+ createDiv(parent: HTMLElement) {
return this.createCanvas(parent, 256, 256);
}
-
+
initCanvas() {
super.initCanvas();
this.canvas.onclick = (e) => {
@@ -576,21 +576,21 @@ export class AddressHeatMapView extends ProbeBitmapViewBase implements ProjectVi
var opaddr = Math.floor(pos.x) + Math.floor(pos.y) * 256;
var lastpc = -1;
var runpc = -1;
- this.redraw( (op,addr) => {
+ this.redraw((op, addr) => {
if (runpc < 0 && lastpc >= 0 && addr == opaddr) {
runpc = lastpc;
}
if (op == ProbeFlags.EXECUTE) lastpc = addr;
});
- if (runpc >= 0) runToPC(runpc);
+ if (runpc >= 0) runToPC([runpc]);
}
}
clear() {
- for (var i=0; i<=0xffff; i++) {
+ for (var i = 0; i <= 0xffff; i++) {
var v = platform.readAddress(i);
var rgb = (v >> 2) | (v & 0x1f);
- rgb |= (rgb<<8) | (rgb<<16);
+ rgb |= (rgb << 8) | (rgb << 16);
this.datau32[i] = rgb | OPAQUE_BLACK;
}
}
@@ -605,15 +605,15 @@ export class AddressHeatMapView extends ProbeBitmapViewBase implements ProjectVi
data = data | rgb | OPAQUE_BLACK;
this.datau32[addr & 0xffff] = data;
}
-
- getTooltipText(x:number, y:number) : string {
+
+ getTooltipText(x: number, y: number): string {
var a = (x & 0xff) + (y << 8);
var s = "";
var pc = -1;
var already = {};
var lastroutine = null;
var symstack = [];
- this.redraw( (op,addr,col,row,clk,value) => {
+ this.redraw((op, addr, col, row, clk, value) => {
switch (op) {
case ProbeFlags.EXECUTE:
pc = addr;
@@ -626,13 +626,13 @@ export class AddressHeatMapView extends ProbeBitmapViewBase implements ProjectVi
lastroutine = symstack.pop();
break;
}
- var key = op|pc;
+ var key = op | pc;
if (addr == a && !already[key]) {
if (s == "" && lastroutine) { s += "\n" + lastroutine; }
s += "\nPC " + this.addr2str(pc) + " " + this.opToString(op, null, value);
already[key] = 1;
}
- } );
+ });
return this.addr2str(a) + s;
}
}
@@ -671,7 +671,7 @@ export class RasterPCHeatMapView extends ProbeBitmapViewBase implements ProjectV
drawImage() {
// fill in the gaps
let last = OPAQUE_BLACK;
- for (let i=0; i= 8) sp = 16-sp;
+ if (sp >= 8) sp = 16 - sp;
if (Math.abs(this.lastpc) - addr > 16) { sp += 1; }
if (Math.abs(this.lastpc) - addr > 256) { sp += 1; }
data = this.rgb = (0x080808 * sp) + 0x202020;
@@ -722,27 +722,27 @@ export class RasterStackMapView extends RasterPCHeatMapView implements ProjectVi
}
export class ProbeLogView extends ProbeViewBaseBase {
- vlist : VirtualTextScroller;
- maindiv : HTMLElement;
+ vlist: VirtualTextScroller;
+ maindiv: HTMLElement;
recreateOnResize = true;
dumplines;
- createDiv(parent : HTMLElement) {
+ createDiv(parent: HTMLElement) {
this.vlist = new VirtualTextScroller(parent);
- this.vlist.create(parent, this.cyclesPerLine*this.totalScanlines, this.getMemoryLineAt.bind(this));
+ this.vlist.create(parent, this.cyclesPerLine * this.totalScanlines, this.getMemoryLineAt.bind(this));
return this.vlist.maindiv;
}
- getMemoryLineAt(row : number) : VirtualTextLine {
- var s : string = "";
- var c : string = "seg_data";
+ getMemoryLineAt(row: number): VirtualTextLine {
+ var s: string = "";
+ var c: string = "seg_data";
var line = this.dumplines && this.dumplines[row];
if (line != null) {
- var xtra : string = line.info.join(", ");
- s = "(" + lpad(line.row,4) + ", " + lpad(line.col,4) + ") " + rpad(line.asm||"",20) + xtra;
+ var xtra: string = line.info.join(", ");
+ s = "(" + lpad(line.row, 4) + ", " + lpad(line.col, 4) + ") " + rpad(line.asm || "", 20) + xtra;
if (xtra.indexOf("Write ") >= 0) c = "seg_io";
// if (xtra.indexOf("Stack ") >= 0) c = "seg_code";
}
- return {text:s, clas:c};
+ return { text: s, clas: c };
}
refresh() {
this.tick();
@@ -751,11 +751,11 @@ export class ProbeLogView extends ProbeViewBaseBase {
const isz80 = platform instanceof BaseZ80MachinePlatform || platform instanceof BaseZ80Platform; // TODO?
// cache each line in frame
this.dumplines = {};
- this.redraw((op,addr,col,row,clk,value) => {
+ this.redraw((op, addr, col, row, clk, value) => {
if (isz80) clk >>= 2;
var line = this.dumplines[clk];
if (line == null) {
- line = {op:op, addr:addr, row:row, col:col, asm:null, info:[]};
+ line = { op: op, addr: addr, row: row, col: col, asm: null, info: [] };
this.dumplines[clk] = line;
}
switch (op) {
@@ -776,22 +776,22 @@ export class ProbeLogView extends ProbeViewBaseBase {
}
export class ScanlineIOView extends ProbeViewBaseBase {
- vlist : VirtualTextScroller;
- maindiv : HTMLElement;
+ vlist: VirtualTextScroller;
+ maindiv: HTMLElement;
recreateOnResize = true;
dumplines;
- createDiv(parent : HTMLElement) {
+ createDiv(parent: HTMLElement) {
this.vlist = new VirtualTextScroller(parent);
this.vlist.create(parent, this.totalScanlines, this.getMemoryLineAt.bind(this));
return this.vlist.maindiv;
}
- getMemoryLineAt(row : number) : VirtualTextLine {
- var s = lpad(row+"",3) + ' ';
+ getMemoryLineAt(row: number): VirtualTextLine {
+ var s = lpad(row + "", 3) + ' ';
var c = 'seg_code';
var line = (this.dumplines && this.dumplines[row]) || [];
- var hblankCycle = Math.round(this.cyclesPerLine/3.3);
- for (var i=0; i {
+ this.redraw((op, addr, col, row, clk, value) => {
var line = this.dumplines[row];
if (line == null) {
this.dumplines[row] = line = [];
@@ -843,14 +843,14 @@ export class ScanlineIOView extends ProbeViewBaseBase {
///
export class ProbeSymbolView extends ProbeViewBaseBase {
- vlist : VirtualTextScroller;
- keys : string[];
+ vlist: VirtualTextScroller;
+ keys: string[];
recreateOnResize = true;
dumplines;
cumulativeData = true;
// TODO: auto resize
- createDiv(parent : HTMLElement) {
+ createDiv(parent: HTMLElement) {
// TODO: what if symbol list changes?
if (platform.debugSymbols && platform.debugSymbols.symbolmap) {
this.keys = Array.from(Object.keys(platform.debugSymbols.symbolmap).filter(sym => !ignoreSymbol(sym)));
@@ -862,21 +862,21 @@ export class ProbeSymbolView extends ProbeViewBaseBase {
return this.vlist.maindiv;
}
- getMemoryLineAt(row : number) : VirtualTextLine {
+ getMemoryLineAt(row: number): VirtualTextLine {
// header line
if (row == 0) {
- return {text: lpad("Symbol",35)+lpad("Reads",8)+lpad("Writes",8)};
+ return { text: lpad("Symbol", 35) + lpad("Reads", 8) + lpad("Writes", 8) };
}
- var sym = this.keys[row-1];
+ var sym = this.keys[row - 1];
var line = this.dumplines && this.dumplines[sym];
function getop(op) {
var n = line[op] | 0;
return lpad(n ? n.toString() : "", 8);
}
- var s : string;
- var c : string;
+ var s: string;
+ var c: string;
if (line != null) {
- s = lpad(sym, 35)
+ s = lpad(sym, 35)
+ getop(ProbeFlags.MEM_READ)
+ getop(ProbeFlags.MEM_WRITE);
if (line[ProbeFlags.EXECUTE])
@@ -889,7 +889,7 @@ export class ProbeSymbolView extends ProbeViewBaseBase {
s = lpad(sym, 35);
c = 'seg_unknown';
}
- return {text:s, clas:c};
+ return { text: s, clas: c };
}
refresh() {
@@ -899,7 +899,7 @@ export class ProbeSymbolView extends ProbeViewBaseBase {
tick() {
// cache each line in frame
this.dumplines = {};
- this.redraw((op,addr,col,row,clk,value) => {
+ this.redraw((op, addr, col, row, clk, value) => {
var sym = platform.debugSymbols.addr2symbol[addr];
if (sym != null) {
var line = this.dumplines[sym];
diff --git a/src/ide/views/editors.ts b/src/ide/views/editors.ts
index 566d4901..595282a0 100644
--- a/src/ide/views/editors.ts
+++ b/src/ide/views/editors.ts
@@ -1,25 +1,37 @@
-
-import { isMobileDevice, ProjectView } from "./baseviews";
-import { SourceFile, WorkerError, SourceLocation } from "../../common/workertypes";
+import { closeBrackets, deleteBracketPair } from "@codemirror/autocomplete";
+import { defaultKeymap, history, historyKeymap, indentWithTab, undo } from "@codemirror/commands";
+import { cpp } from "@codemirror/lang-cpp";
+import { markdown } from "@codemirror/lang-markdown";
+import { bracketMatching, foldGutter, indentOnInput, indentUnit } from "@codemirror/language";
+import { highlightSelectionMatches, search, searchKeymap } from "@codemirror/search";
+import { EditorState, Extension } from "@codemirror/state";
+import { crosshairCursor, drawSelection, dropCursor, EditorView, highlightActiveLine, highlightActiveLineGutter, highlightSpecialChars, keymap, lineNumbers, rectangularSelection, ViewUpdate } from "@codemirror/view";
import { CodeAnalyzer } from "../../common/analysis";
-import { platform, current_project, lastDebugState, runToPC, qs } from "../ui";
import { hex, rpad } from "../../common/util";
+import { SourceFile, SourceLocation, WorkerError } from "../../common/workertypes";
+import { asm6502 } from "../../parser/lang-6502";
+import { basic } from "../../parser/lang-basic";
+import { batariBasic } from "../../parser/lang-bataribasic";
+import { fastBasic } from "../../parser/lang-fastbasic";
+import { inform6 } from "../../parser/lang-inform6";
+import { verilog } from "../../parser/lang-verilog";
+import { wiz } from "../../parser/lang-wiz";
+import { asmZ80 } from "../../parser/lang-z80";
+import { cobalt } from "../../themes/cobalt";
+import { disassemblyTheme } from "../../themes/disassemblyTheme";
+import { editorTheme } from "../../themes/editorTheme";
+import { mbo } from "../../themes/mbo";
+import { clearBreakpoint, current_project, lastDebugState, platform, qs, runToPC } from "../ui";
+import { isMobileDevice, ProjectView } from "./baseviews";
+import { debugHighlightTagsTooltip } from "./debug";
+import { createTextTransformFilterEffect, textTransformFilterCompartment } from "./filters";
+import { breakpointMarkers, bytes, clock, currentPcMarker, errorMarkers, offset, statusMarkers } from "./gutter";
+import { currentPc, errorMessages, highlightLines, showValue } from "./visuals";
-declare var CodeMirror;
-
-// helper function for editor
-function jumpToLine(ed, i:number) {
- var t = ed.charCoords({line: i, ch: 0}, "local").top;
- var middleHeight = ed.getScrollerElement().offsetHeight / 2;
- ed.scrollTo(null, t - middleHeight - 5);
-}
+// TODO: make this an easily toggleable debug setting.
+// Debug syntax highlighting. Useful when developing new parsers and themes.
+const debugHighlightTags = false;
-function createTextSpan(text:string, className:string) : HTMLElement {
- var span = document.createElement("span");
- span.setAttribute("class", className);
- span.appendChild(document.createTextNode(text));
- return span;
-}
/////
@@ -29,55 +41,47 @@ export const PC_LINE_LOOKAHEAD = 64;
const MAX_ERRORS = 200;
const MODEDEFS = {
- default: { theme: 'mbo' }, // NOTE: Not merged w/ other modes
+ default: { theme: mbo }, // NOTE: Not merged w/ other modes
'6502': { isAsm: true },
z80: { isAsm: true },
jsasm: { isAsm: true },
gas: { isAsm: true },
vasm: { isAsm: true },
- inform6: { theme: 'cobalt' },
+ inform6: { theme: cobalt },
markdown: { lineWrap: true },
fastbasic: { noGutters: true },
basic: { noLineNumbers: true, noGutters: true }, // TODO: not used?
- ecs: { theme: 'mbo', isAsm: true },
+ ecs: { theme: mbo, isAsm: true },
}
export var textMapFunctions = {
- input: null
+ input: null as ((text: string) => string) | null
};
export class SourceEditor implements ProjectView {
- constructor(path:string, mode:string) {
+ constructor(path: string, mode: string) {
this.path = path;
this.mode = mode;
}
- path : string;
- mode : string;
+ path: string;
+ mode: string;
editor;
updateTimer = null;
dirtylisting = true;
- sourcefile : SourceFile;
- currentDebugLine : SourceLocation;
- markCurrentPC; // TextMarker
- markHighlight; // TextMarker
- errormsgs = [];
- errorwidgets = [];
- errormarks = [];
- inspectWidget;
+ sourcefile: SourceFile;
+ currentDebugLine: SourceLocation;
refreshDelayMsec = 300;
- createDiv(parent:HTMLElement) {
+ createDiv(parent: HTMLElement) {
var div = document.createElement('div');
div.setAttribute("class", "editor");
parent.appendChild(div);
var text = current_project.getFile(this.path) as string;
- var asmOverride = text && this.mode=='verilog' && /__asm\b([\s\S]+?)\b__endasm\b/.test(text);
- this.newEditor(div, asmOverride);
- if (text) {
- this.setText(text); // TODO: this calls setCode() and builds... it shouldn't
- this.editor.setSelection({line:0,ch:0}, {line:0,ch:0}, {scroll:true}); // move cursor to start
- }
- this.setupEditor();
+ var asmOverride = text && this.mode == 'verilog' && /__asm\b([\s\S]+?)\b__endasm\b/.test(text);
+ this.newEditor(div, text, asmOverride);
+ this.editor.dispatch({
+ effects: createTextTransformFilterEffect(textMapFunctions),
+ });
if (current_project.getToolForFilename(this.path).startsWith("remote:")) {
this.refreshDelayMsec = 1000; // remote URLs get slower refresh
}
@@ -90,7 +94,7 @@ export class SourceEditor implements ProjectView {
}
}
- newEditor(parent:HTMLElement, isAsmOverride?:boolean) {
+ newEditor(parent: HTMLElement, text: string, isAsmOverride?: boolean) {
var modedef = MODEDEFS[this.mode] || MODEDEFS.default;
var isAsm = isAsmOverride || modedef.isAsm;
var lineWrap = !!modedef.lineWrap;
@@ -100,240 +104,309 @@ export class SourceEditor implements ProjectView {
lineNums = false; // no line numbers while embedded
isAsm = false; // no opcode bytes either
}
- var gutters = ["CodeMirror-linenumbers", "gutter-offset", "gutter-info"];
- if (isAsm) gutters = ["CodeMirror-linenumbers", "gutter-offset", "gutter-bytes", "gutter-clock", "gutter-info"];
- if (modedef.noGutters || isMobileDevice) gutters = ["gutter-info"];
- this.editor = CodeMirror(parent, {
- theme: theme,
- lineNumbers: lineNums,
- matchBrackets: true,
- tabSize: 8,
- indentAuto: true,
- lineWrapping: lineWrap,
- gutters: gutters
+ const minimalGutters = modedef.noGutters || isMobileDevice;
+
+ var parser: Extension;
+ switch (this.mode) {
+ case '6502':
+ parser = asm6502();
+ break;
+ case 'basic':
+ parser = basic();
+ break;
+ case 'bataribasic':
+ parser = batariBasic();
+ break;
+ case 'fastbasic':
+ parser = fastBasic();
+ break;
+ case 'inform6':
+ parser = inform6();
+ break;
+ case 'markdown':
+ parser = markdown();
+ break;
+ case 'text/x-csrc':
+ parser = cpp();
+ break;
+ case 'text/x-wiz':
+ parser = wiz();
+ break;
+ case 'verilog':
+ parser = verilog();
+ break;
+ case 'z80':
+ parser = asmZ80();
+ break;
+ default:
+ console.warn("Unknown mode: " + this.mode);
+ break;
+ }
+ this.editor = new EditorView({
+ parent: parent,
+ doc: text,
+ extensions: [
+
+ // Custom keybindings must appear before default keybindings.
+ keymap.of([
+ { key: "Backspace", run: deleteBracketPair },
+ ]),
+ keymap.of(defaultKeymap),
+
+ lineNums ? lineNumbers() : [],
+
+ highlightSpecialChars(),
+
+ // Undo history.
+ history(),
+ keymap.of(historyKeymap),
+
+ // Code fold gutter.
+ foldGutter(),
+
+ dropCursor(),
+
+ EditorState.allowMultipleSelections.of(true),
+ drawSelection(),
+
+ indentOnInput(),
+ bracketMatching(),
+ closeBrackets(),
+
+ // Rectangular selection and crosshair cursor.
+ rectangularSelection(),
+ crosshairCursor(),
+
+ highlightActiveLine(),
+ highlightActiveLineGutter(),
+ highlightSelectionMatches(),
+
+ search({ top: true }),
+ keymap.of(searchKeymap),
+
+ // lintGutter(),
+ // autocompletion(),
+
+ parser || [],
+ theme,
+ editorTheme,
+ debugHighlightTags ? debugHighlightTagsTooltip : [],
+ EditorState.tabSize.of(8),
+ indentUnit.of(" "),
+ keymap.of([indentWithTab]),
+ lineWrap ? EditorView.lineWrapping : [],
+
+ currentPc.field,
+
+ !minimalGutters ? [
+ offset.field,
+ offset.gutter,
+ ] : [],
+
+ isAsm && !minimalGutters ? [
+ bytes.field,
+ bytes.gutter,
+
+ clock.field,
+ clock.gutter,
+ ] : [],
+
+ breakpointMarkers.field,
+ statusMarkers.gutter,
+ EditorView.updateListener.of(update => {
+ for (let effect of update.transactions.flatMap(tr => tr.effects)) {
+ if (effect.is(breakpointMarkers.set)) {
+ if (platform.isRunning()) {
+ this.runToBreakpoints(update.state);
+ }
+ }
+ if (effect.is(currentPcMarker.runToLine)) {
+ const lineNum = effect.value;
+ if (this.sourcefile && this.sourcefile.line2offset) {
+ const pc = this.sourcefile.line2offset[lineNum];
+ if (pc >= 0) {
+ runToPC([pc]);
+ }
+ }
+ }
+ }
+ }),
+
+ errorMarkers.field,
+
+ errorMessages.field,
+
+ currentPcMarker.field,
+ currentPcMarker.gutter,
+
+ highlightLines.field,
+
+ textTransformFilterCompartment.of([]),
+
+ // update file in project (and recompile) when edits made
+ EditorView.updateListener.of(update => {
+ if (update.docChanged) {
+ this.editorChanged();
+ }
+ }),
+
+ // inspect symbol when it's highlighted (double-click)
+ showValue.field,
+ EditorView.updateListener.of(update => {
+ if (update.selectionSet) {
+ this.inspectUnderCursor(update);
+ }
+ }),
+ ],
});
}
editorChanged() {
clearTimeout(this.updateTimer);
- this.updateTimer = setTimeout( () => {
- current_project.updateFile(this.path, this.editor.getValue());
+ this.updateTimer = setTimeout(() => {
+ current_project.updateFile(this.path, this.editor.state.doc.toString());
}, this.refreshDelayMsec);
- if (this.markHighlight) {
- this.markHighlight.clear();
- this.markHighlight = null;
- }
}
- setupEditor() {
- // update file in project (and recompile) when edits made
- this.editor.on('changes', (ed, changeobj) => {
- this.editorChanged();
- });
- // inspect symbol when it's highlighted (double-click)
- this.editor.on('cursorActivity', (ed) => {
- this.inspectUnderCursor();
- });
- // gutter clicked
- this.editor.on("gutterClick", (cm, n) => {
- this.toggleBreakpoint(n);
- });
- // set editor mode for highlighting, etc
- this.editor.setOption("mode", this.mode);
- // change text?
- this.editor.on('beforeChange', (cm, chgobj) => {
- if (textMapFunctions.input && chgobj.text) chgobj.text = chgobj.text.map(textMapFunctions.input);
- });
- }
+ inspectUnderCursor(update: ViewUpdate) {
+ // TODO: handle multi-select
+ const range = update.state.selection.main;
+ const selectedText = update.state.sliceDoc(range.from, range.to).trim();
- inspectUnderCursor() {
- var start = this.editor.getCursor(true);
- var end = this.editor.getCursor(false);
- if (start.line == end.line && start.ch < end.ch && end.ch-start.ch < 80) {
- var name = this.editor.getSelection();
- this.inspect(name);
- } else {
- this.inspect(null);
- }
- }
-
- inspect(ident : string) : void {
var result;
if (platform.inspect) {
- result = platform.inspect(ident);
- }
- if (this.inspectWidget) {
- this.inspectWidget.clear();
- this.inspectWidget = null;
+ result = platform.inspect(selectedText);
}
- if (result) {
- var infospan = createTextSpan(result, "tooltipinfoline");
- var line = this.editor.getCursor().line;
- this.inspectWidget = this.editor.addLineWidget(line, infospan, {above:false});
+
+ if (!range.empty && result && result.length < 80) {
+ update.view.dispatch({
+ effects: showValue.effect.of({ range: range, val: result })
+ });
+ } else {
+ update.view.dispatch({
+ effects: showValue.effect.of(null)
+ });
}
}
- setText(text:string) {
- var i,j;
- var oldtext = this.editor.getValue();
+ setText(text: string) {
+ var oldtext = this.editor.state.doc.toString();
if (oldtext != text) {
- this.editor.setValue(text);
- /*
- // find minimum range to undo
- for (i=0; i= numLines) line = 0;
- this.addErrorMarker(line, info.msg);
- if (info.start != null) {
- var markOpts = {className:"mark-error", inclusiveLeft:true};
- var start = {line:line, ch:info.end?info.start:info.start-1};
- var end = {line:line, ch:info.end?info.end:info.start};
- var mark = this.editor.markText(start, end, markOpts);
- this.errormarks.push(mark);
- }
- }
+ insertText(text: string) {
+ const main = this.editor.state.selection.main;
+ this.editor.dispatch({
+ changes: { from: main.from, to: main.to, insert: text },
+ selection: { anchor: main.from + text.length },
+ userEvent: "input.paste"
+ });
}
- addErrorMarker(line:number, msg:string) {
- var div = document.createElement("div");
- div.setAttribute("class", "tooltipbox tooltiperror");
- div.appendChild(document.createTextNode("\u24cd"));
- this.editor.setGutterMarker(line, "gutter-info", div);
- this.errormsgs.push({line:line, msg:msg});
- // expand line widgets when mousing over errors
- $(div).mouseover((e) => {
- this.expandErrors();
+ highlightLines(start: number, end: number) {
+ const startLine = this.editor.state.doc.line(start + 1);
+ this.editor.dispatch({
+ effects: [
+ highlightLines.effect.of({ start: start + 1, end: end + 1 }),
+ EditorView.scrollIntoView(startLine.from, { y: "start", yMargin: 100/*pixels*/ }),
+ ]
});
}
- addErrorLine(line:number, msg:string) {
- var errspan = createTextSpan(msg, "tooltiperrorline");
- this.errorwidgets.push(this.editor.addLineWidget(line, errspan));
+ getValue(): string {
+ return this.editor.state.doc.toString();
}
- expandErrors() {
- var e;
- while (e = this.errormsgs.shift()) {
- this.addErrorLine(e.line, e.msg);
- }
- }
+ getPath(): string { return this.path; }
- markErrors(errors:WorkerError[]) {
+ markErrors(errors: WorkerError[]) {
// TODO: move cursor to error line if offscreen?
this.clearErrors();
errors = errors.slice(0, MAX_ERRORS);
+ const newErrors = new Map();
for (var info of errors) {
- this.addError(info);
+ // only mark errors with this filename, or without any filename
+ if (!info.path || this.path.endsWith(info.path)) {
+ var numLines = this.editor.state.doc.lines;
+ var line = info.line;
+ if (isNaN(line) || line < 1 || line > numLines) line = 1;
+ newErrors.set(line, info.msg);
+ }
}
+ this.editor.dispatch({
+ effects: [
+ errorMarkers.set.of(newErrors),
+ ],
+ });
}
clearErrors() {
this.dirtylisting = true;
- // clear line widgets
- this.editor.clearGutter("gutter-info");
- this.errormsgs = [];
- while (this.errorwidgets.length) this.errorwidgets.shift().clear();
- while (this.errormarks.length) this.errormarks.shift().clear();
+ this.editor.dispatch({
+ effects: [
+ errorMarkers.set.of(new Map()),
+ errorMarkers.showMessage.of(null),
+ ],
+ });
}
- getSourceFile() : SourceFile { return this.sourcefile; }
+ getSourceFile(): SourceFile { return this.sourcefile; }
updateListing() {
// update editor annotations
// TODO: recreate editor if gutter-bytes is used (verilog)
this.clearErrors();
- this.editor.clearGutter("gutter-bytes");
- this.editor.clearGutter("gutter-offset");
- this.editor.clearGutter("gutter-clock");
var lstlines = this.sourcefile.lines || [];
+
+ const newOffsets = new Map();
+ const newBytes = new Map();
+ const newClocks = new Map();
+
for (var info of lstlines) {
//if (info.path && info.path != this.path) continue;
if (info.offset >= 0) {
- this.setGutter("gutter-offset", info.line-1, hex(info.offset&0xffff,4));
+ newOffsets.set(info.line, hex(info.offset & 0xffff, 4));
}
if (info.insns) {
var insnstr = info.insns.length > 9 ? ("...") : info.insns;
- this.setGutter("gutter-bytes", info.line-1, insnstr);
+ newBytes.set(info.line, insnstr);
if (info.iscode) {
// TODO: labels trick this part?
if (info.cycles) {
- this.setGutter("gutter-clock", info.line-1, info.cycles+"");
+ newClocks.set(info.line, info.cycles + "");
} else if (platform.getOpcodeMetadata) {
var opcode = parseInt(info.insns.split(" ")[0], 16);
var meta = platform.getOpcodeMetadata(opcode, info.offset);
if (meta && meta.minCycles) {
- var clockstr = meta.minCycles+"";
- this.setGutter("gutter-clock", info.line-1, clockstr);
+ var clockstr = meta.minCycles + "";
+ newClocks.set(info.line, clockstr);
}
}
}
}
}
+ this.editor.dispatch({
+ effects: [
+ offset.set.of(newOffsets),
+ bytes.set.of(newBytes),
+ clock.set.of(newClocks),
+ ],
+ });
}
- setGutter(type:string, line:number, text:string) {
- var lineinfo = this.editor.lineInfo(line);
- if (lineinfo && lineinfo.gutterMarkers && lineinfo.gutterMarkers[type]) {
- // do not replace existing marker
- } else {
- var textel = document.createTextNode(text);
- this.editor.setGutterMarker(line, type, textel);
- }
- }
-
- setGutterBytes(line:number, s:string) {
- this.setGutter("gutter-bytes", line-1, s);
- }
-
- setTimingResult(result:CodeAnalyzer) : void {
- this.editor.clearGutter("gutter-bytes");
+ setTimingResult(result: CodeAnalyzer): void {
if (this.sourcefile == null) return;
- // show the lines
+ var newBytes = new Map();
for (const line of Object.keys(this.sourcefile.line2offset)) {
let pc = this.sourcefile.line2offset[line];
let clocks = result.pc2clockrange[pc];
var minclocks = clocks && clocks.minclocks;
var maxclocks = clocks && clocks.maxclocks;
- if (minclocks>=0 && maxclocks>=0) {
+ if (minclocks >= 0 && maxclocks >= 0) {
var s;
if (maxclocks == minclocks)
s = minclocks + "";
@@ -341,51 +414,60 @@ export class SourceEditor implements ProjectView {
s = minclocks + "-" + maxclocks;
if (maxclocks == result.MAX_CLOCKS)
s += "+";
- this.setGutterBytes(parseInt(line), s);
+ newBytes.set(parseInt(line), s);
}
}
+ this.editor.dispatch({
+ effects: [
+ bytes.set.of(newBytes),
+ ],
+ });
}
- setCurrentLine(line:SourceLocation, moveCursor:boolean) {
- var blocked = platform.isBlocked && platform.isBlocked();
-
- var addCurrentMarker = (line:SourceLocation) => {
- var div = document.createElement("div");
- var cls = blocked ? 'currentpc-marker-blocked' : 'currentpc-marker';
- div.classList.add(cls);
- div.appendChild(document.createTextNode("\u25b6"));
- this.editor.setGutterMarker(line.line-1, "gutter-info", div);
+ setCurrentLine(line: SourceLocation, moveCursor: boolean) {
+ var addCurrentMarker = (line: SourceLocation) => {
+ this.editor.dispatch({
+ effects: [
+ currentPcMarker.set.of(line.line),
+ currentPc.effect.of(line.line),
+ // Optional: follow the execution point
+ EditorView.scrollIntoView(this.editor.state.doc.line(line.line).from, { y: "center" }),
+ ]
+ });
}
this.clearCurrentLine(moveCursor);
if (line) {
addCurrentMarker(line);
if (moveCursor) {
- this.editor.setCursor({line:line.line-1,ch:line.start||0}, {scroll:true});
+ const targetLine = this.editor.state.doc.line(line.line);
+ const pos = targetLine.from + (line.start || 0);
+ this.editor.dispatch({
+ selection: { anchor: pos, head: pos },
+ effects: EditorView.scrollIntoView(pos, { y: "center" })
+ });
}
- var cls = blocked ? 'currentpc-span-blocked' : 'currentpc-span';
- var markOpts = {className:cls, inclusiveLeft:true};
- if (line.start || line.end)
- this.markCurrentPC = this.editor.markText({line:line.line-1,ch:line.start}, {line:line.line-1,ch:line.end||line.start+1}, markOpts);
- else
- this.markCurrentPC = this.editor.markText({line:line.line-1,ch:0}, {line:line.line,ch:0}, markOpts);
this.currentDebugLine = line;
}
}
- clearCurrentLine(moveCursor:boolean) {
+ clearCurrentLine(moveCursor: boolean) {
if (this.currentDebugLine) {
- this.editor.clearGutter("gutter-info");
- if (moveCursor) this.editor.setSelection(this.editor.getCursor());
+ if (moveCursor) {
+ const pos = this.editor.state.selection.main.head;
+ this.editor.dispatch({ selection: { anchor: pos, head: pos } });
+ }
this.currentDebugLine = null;
}
- if (this.markCurrentPC) {
- this.markCurrentPC.clear();
- this.markCurrentPC = null;
- }
+ this.editor.dispatch({
+ effects: [
+ currentPcMarker.set.of(null),
+ currentPc.effect.of(null),
+ ]
+ });
}
- getActiveLine() : SourceLocation {
+ getActiveLine(): SourceLocation {
if (this.sourcefile) {
var cpustate = lastDebugState && lastDebugState.c;
if (!cpustate && platform.getCPUState && !platform.isRunning())
@@ -398,7 +480,7 @@ export class SourceEditor implements ProjectView {
}
}
- refreshDebugState(moveCursor:boolean) {
+ refreshDebugState(moveCursor: boolean) {
// TODO: only if line changed
// TODO: remove after compilation
this.clearCurrentLine(moveCursor);
@@ -424,20 +506,21 @@ export class SourceEditor implements ProjectView {
this.refreshListing();
this.refreshDebugState(moveCursor);
}
-
+
tick() {
this.refreshDebugState(false);
}
- getLine(line : number) {
- return this.editor.getLine(line-1);
+ getLine(line: number) {
+ return this.editor.state.doc.line(line).text;
}
- getCurrentLine() : number {
- return this.editor.getCursor().line+1;
+ getCurrentLine(): number {
+ const pos = this.editor.state.selection.main.head;
+ return this.editor.state.doc.lineAt(pos).number;
}
- getCursorPC() : number {
+ getCursorPC(): number {
var line = this.getCurrentLine();
while (this.sourcefile && line >= 0) {
var pc = this.sourcefile.line2offset[line];
@@ -448,24 +531,29 @@ export class SourceEditor implements ProjectView {
}
undoStep() {
- this.editor.execCommand('undo');
- }
-
- toggleBreakpoint(lineno: number) {
- // TODO: we have to always start at beginning of frame
- if (this.sourcefile != null) {
- var targetPC = this.sourcefile.line2offset[lineno+1];
- /*
- var bpid = "pc" + targetPC;
- if (platform.hasBreakpoint(bpid)) {
- platform.clearBreakpoint(bpid);
- } else {
- platform.setBreakpoint(bpid, () => {
- return platform.getPC() == targetPC;
- });
- }
- */
- runToPC(targetPC);
+ undo(this.editor);
+ }
+
+ getBreakpointPCs(): number[] {
+ if (this.sourcefile == null) return [];
+ const pcs: number[] = [];
+ const bpField = this.editor.state.field(breakpointMarkers.field);
+ const cursor = bpField.iter();
+ while (cursor.value) {
+ const line = this.editor.state.doc.lineAt(cursor.from).number;
+ const pc = this.sourcefile.line2offset[line];
+ if (pc >= 0) pcs.push(pc);
+ cursor.next();
+ }
+ return pcs;
+ }
+
+ runToBreakpoints(state: EditorState) {
+ const pcs = this.getBreakpointPCs();
+ if (pcs.length > 0) {
+ runToPC(pcs);
+ } else {
+ clearBreakpoint();
}
}
}
@@ -475,11 +563,9 @@ export class SourceEditor implements ProjectView {
const disasmWindow = 1024; // disassemble this many bytes around cursor
export class DisassemblerView implements ProjectView {
- disasmview;
-
- getDisasmView() { return this.disasmview; }
+ disasmview: EditorView;
- createDiv(parent : HTMLElement) {
+ createDiv(parent: HTMLElement) {
var div = document.createElement('div');
div.setAttribute("class", "editor");
parent.appendChild(div);
@@ -487,13 +573,24 @@ export class DisassemblerView implements ProjectView {
return div;
}
- newEditor(parent : HTMLElement) {
- this.disasmview = CodeMirror(parent, {
- mode: 'z80', // TODO: pick correct one
- theme: 'cobalt',
- tabSize: 8,
- readOnly: true,
- styleActiveLine: true
+ newEditor(parent: HTMLElement) {
+ this.disasmview = new EditorView({
+ parent: parent,
+ extensions: [
+ rectangularSelection(),
+ crosshairCursor(),
+ EditorState.allowMultipleSelections.of(true),
+ drawSelection(),
+ highlightActiveLine(),
+ highlightSelectionMatches(),
+ debugHighlightTags ? debugHighlightTagsTooltip : [],
+ disassemblyTheme,
+ cobalt,
+ currentPc.field,
+ EditorState.tabSize.of(8),
+ EditorState.readOnly.of(true),
+ ],
+ // mode: 'z80', // TODO: pick correct one
});
}
@@ -524,17 +621,17 @@ export class DisassemblerView implements ProjectView {
*/
let bytes = "";
let comment = "";
- for (let i=0; i {
+ dstr = dstr.replace(/([^#])[$]([0-9A-F]+)/, (substr: string, ...args: any[]): string => {
let addr = parseInt(args[1], 16);
let sym = addr2symbol[addr];
if (sym) return (args[0] + sym);
- sym = addr2symbol[addr-1];
+ sym = addr2symbol[addr - 1];
if (sym) return (args[0] + sym + "+1");
return substr;
});
@@ -545,7 +642,7 @@ export class DisassemblerView implements ProjectView {
comment = "; " + sym;
}
}
- let dline = hex(a, 4) + "\t" + rpad(bytes,14) + "\t" + rpad(dstr,30) + comment + "\n";
+ let dline = hex(a, 4) + "\t" + rpad(bytes, 14) + "\t" + rpad(dstr, 30) + comment + "\n";
s += dline;
if (a == pc) selline = curline;
curline++;
@@ -553,21 +650,29 @@ export class DisassemblerView implements ProjectView {
}
return s;
}
- var startpc = pc < 0 ? pc-disasmWindow : Math.max(0, pc-disasmWindow); // for 32-bit PCs w/ hi bit set
- let text = disassemble(startpc, pc-startpc) + disassemble(pc, disasmWindow);
- this.disasmview.setValue(text);
- if (moveCursor) {
- this.disasmview.setCursor(selline, 0);
+ var startpc = pc < 0 ? pc - disasmWindow : Math.max(0, pc - disasmWindow); // for 32-bit PCs w/ hi bit set
+ let text = disassemble(startpc, pc - startpc) + disassemble(pc, disasmWindow);
+ this.disasmview.dispatch({
+ changes: { from: 0, to: this.disasmview.state.doc.length, insert: text }
+ })
+ if (moveCursor) {
+ const line = this.disasmview.state.doc.line(selline + 1);
+ this.disasmview.dispatch({
+ selection: { anchor: line.from, head: line.from },
+ effects: EditorView.scrollIntoView(line.from, { y: "center" }),
+ });
}
- jumpToLine(this.disasmview, selline);
}
- getCursorPC() : number {
- var line = this.disasmview.getCursor().line;
- if (line >= 0) {
- var toks = this.disasmview.getLine(line).trim().split(/\s+/);
+ getCursorPC(): number {
+ const pos = this.disasmview.state.selection.main.head;
+ const lineNum = this.disasmview.state.doc.lineAt(pos).number;
+ if (lineNum >= 0) {
+ const lineText = this.disasmview.state.doc.line(lineNum).text;
+ const toks = lineText.trim().split(/\s+/);
if (toks && toks.length >= 1) {
- var pc = parseInt(toks[0], 16);
+ const pc = parseInt(toks[0], 16);
+ console.log("getCursorPC", pc);
if (pc >= 0) return pc;
}
}
@@ -578,10 +683,10 @@ export class DisassemblerView implements ProjectView {
///
export class ListingView extends DisassemblerView implements ProjectView {
- assemblyfile : SourceFile;
- path : string;
+ assemblyfile: SourceFile;
+ path: string;
- constructor(lstfn : string) {
+ constructor(lstfn: string) {
super();
this.path = lstfn;
}
@@ -589,7 +694,7 @@ export class ListingView extends DisassemblerView implements ProjectView {
refreshListing() {
// lookup corresponding assemblyfile for this file, using listing
var lst = current_project.getListingForFile(this.path);
- // TODO?
+ // TODO?
this.assemblyfile = lst && (lst.assemblyfile || lst.sourcefile);
}
@@ -598,9 +703,11 @@ export class ListingView extends DisassemblerView implements ProjectView {
// load listing text into editor
if (!this.assemblyfile) return;
var asmtext = this.assemblyfile.text;
- var disasmview = this.getDisasmView();
+
// TODO: sometimes it picks one without a text file
- disasmview.setValue(asmtext);
+ this.disasmview.dispatch({
+ changes: { from: 0, to: this.disasmview.state.doc.length, insert: asmtext }
+ })
// go to PC
if (!platform.saveState) return;
var state = lastDebugState || platform.saveState();
@@ -610,9 +717,12 @@ export class ListingView extends DisassemblerView implements ProjectView {
if (res) {
// set cursor while debugging
if (moveCursor) {
- disasmview.setCursor(res.line-1, 0);
+ const line = this.disasmview.state.doc.line(res.line);
+ this.disasmview.dispatch({
+ selection: { anchor: line.from, head: line.from },
+ effects: EditorView.scrollIntoView(line.from, { y: "center" }),
+ });
}
- jumpToLine(disasmview, res.line-1);
}
}
}
diff --git a/src/ide/views/filters.ts b/src/ide/views/filters.ts
new file mode 100644
index 00000000..5149de54
--- /dev/null
+++ b/src/ide/views/filters.ts
@@ -0,0 +1,43 @@
+import { Compartment, EditorState, Transaction } from "@codemirror/state";
+
+type TextMapFunctions = { input: ((text: string) => string) | null };
+
+function createTextTransformFilter(textMapFunctions: TextMapFunctions) {
+ return EditorState.transactionFilter.of((tr: Transaction) => {
+ // Only transform user-initiated text, and only when textMapFunctions.input is set.
+ if (!tr.docChanged || !tr.isUserEvent("input") || !textMapFunctions.input) return tr;
+
+ // Apply the transform to each inserted text segment.
+ let changes: { from: number; to: number; insert: string }[] = [];
+ let changed = false;
+ tr.changes.iterChanges((fromA, toA, fromB, toB, inserted) => {
+ const original = inserted.toString();
+ const transformed = textMapFunctions.input(original);
+ changes.push({ from: fromA, to: toA, insert: transformed });
+ if (transformed !== original) changed = true;
+ });
+ if (!changed) return tr;
+
+ // Preserve annotations from the original transaction.
+ const userEvent = tr.annotation(Transaction.userEvent);
+ const addToHistory = tr.annotation(Transaction.addToHistory);
+ return {
+ changes,
+ selection: tr.selection,
+ effects: tr.effects,
+ scrollIntoView: tr.scrollIntoView,
+ annotations: [
+ ...(userEvent != null ? [Transaction.userEvent.of(userEvent)] : []),
+ ...(addToHistory != null ? [Transaction.addToHistory.of(addToHistory)] : []),
+ ],
+ };
+ });
+}
+
+const textTransformFilterCompartment = new Compartment();
+
+function createTextTransformFilterEffect(textMapFunctions: TextMapFunctions) {
+ return textTransformFilterCompartment.reconfigure(createTextTransformFilter(textMapFunctions));
+}
+
+export { createTextTransformFilterEffect, textTransformFilterCompartment };
diff --git a/src/ide/views/gutter.ts b/src/ide/views/gutter.ts
new file mode 100644
index 00000000..6f6c9fbd
--- /dev/null
+++ b/src/ide/views/gutter.ts
@@ -0,0 +1,349 @@
+import { RangeSet, StateEffect, StateField } from "@codemirror/state";
+import { gutter, GutterMarker } from "@codemirror/view";
+import { hex } from "../../common/util";
+
+const setOffset = StateEffect.define>();
+const setBytes = StateEffect.define>();
+const setClock = StateEffect.define>();
+const toggleBreakpoint = StateEffect.define();
+const setErrors = StateEffect.define>();
+const setCurrentPc = StateEffect.define();
+const runToLineEffect = StateEffect.define();
+
+const showErrorMessage = StateEffect.define<{ line: number, msg: string, toggle?: boolean } | null>();
+
+const offsetField = StateField.define>({
+ create() { return RangeSet.empty; },
+ update(value, tr) {
+ value = value.map(tr.changes);
+ for (let e of tr.effects) {
+ if (e.is(setOffset)) {
+ const map = e.value;
+ const ranges = [];
+ for (let [line, val] of map.entries()) {
+ if (line >= 1 && line <= tr.state.doc.lines) {
+ const pos = tr.state.doc.line(line).from;
+ ranges.push(new OffsetMarker(hex(val, 4)).range(pos));
+ }
+ }
+ value = RangeSet.of(ranges, true);
+ }
+ }
+ return value;
+ },
+});
+
+const bytesField = StateField.define>({
+ create() { return RangeSet.empty; },
+ update(value, tr) {
+ value = value.map(tr.changes);
+ for (let e of tr.effects) {
+ if (e.is(setBytes)) {
+ const map = e.value;
+ const ranges = [];
+ for (let [line, val] of map.entries()) {
+ if (line >= 1 && line <= tr.state.doc.lines) {
+ const pos = tr.state.doc.line(line).from;
+ ranges.push(new BytesMarker(val).range(pos));
+ }
+ }
+ value = RangeSet.of(ranges, true);
+ }
+ }
+ return value;
+ },
+});
+
+const clockField = StateField.define>({
+ create() { return RangeSet.empty; },
+ update(value, tr) {
+ value = value.map(tr.changes);
+ for (let e of tr.effects) {
+ if (e.is(setClock)) {
+ const map = e.value;
+ const ranges = [];
+ for (let [line, val] of map.entries()) {
+ if (line >= 1 && line <= tr.state.doc.lines) {
+ const pos = tr.state.doc.line(line).from;
+ ranges.push(new ClockMarker(val).range(pos));
+ }
+ }
+ value = RangeSet.of(ranges, true);
+ }
+ }
+ return value;
+ },
+});
+
+const breakpointField = StateField.define>({
+ create() { return RangeSet.empty; },
+ update(value, tr) {
+ value = value.map(tr.changes);
+ for (let e of tr.effects) {
+ if (e.is(toggleBreakpoint)) {
+ if (e.value === null) {
+ value = RangeSet.empty;
+ } else {
+ const line = e.value;
+ if (line >= 1 && line <= tr.state.doc.lines) {
+ const pos = tr.state.doc.line(line).from;
+ let hasBreakpoint = false;
+ value.between(pos, pos, () => { hasBreakpoint = true; return false; });
+ if (hasBreakpoint) {
+ value = value.update({ filter: from => from !== pos });
+ } else {
+ value = value.update({ add: [BREAKPOINT_MARKER.range(pos)] });
+ }
+ }
+ }
+ }
+ }
+ return value;
+ },
+});
+
+const errorField = StateField.define>({
+ create() { return RangeSet.empty; },
+ update(value, tr) {
+ value = value.map(tr.changes);
+ for (let e of tr.effects) {
+ if (e.is(setErrors)) {
+ const map = e.value;
+ const ranges = [];
+ for (let [line, msg] of map.entries()) {
+ if (line >= 1 && line <= tr.state.doc.lines) {
+ const pos = tr.state.doc.line(line).from;
+ ranges.push(new ErrorMarker(line, msg).range(pos));
+ }
+ }
+ value = RangeSet.of(ranges, true);
+ }
+ }
+ return value;
+ },
+});
+
+const currentPcField = StateField.define>({
+ create() { return RangeSet.empty; },
+ update(value, tr) {
+ value = value.map(tr.changes);
+ for (let e of tr.effects) {
+ if (e.is(setCurrentPc)) {
+ if (e.value === null) {
+ value = RangeSet.empty;
+ } else {
+ const line = e.value;
+ if (line >= 1 && line <= tr.state.doc.lines) {
+ const pos = tr.state.doc.line(line).from;
+ value = RangeSet.of(CURRENT_PC_MARKER.range(pos));
+ }
+ }
+ }
+ }
+ return value;
+ },
+});
+
+class OffsetMarker extends GutterMarker {
+ constructor(readonly hex: string) { super(); }
+ toDOM() { return document.createTextNode(this.hex); }
+ eq(other: OffsetMarker) { return this.hex == other.hex; }
+}
+
+class BytesMarker extends GutterMarker {
+ constructor(readonly bytes: string) { super(); }
+ toDOM() { return document.createTextNode(this.bytes); }
+ eq(other: BytesMarker) { return this.bytes == other.bytes; }
+}
+
+class ClockMarker extends GutterMarker {
+ constructor(readonly clock: string) { super(); }
+ toDOM() { return document.createTextNode(this.clock); }
+ eq(other: ClockMarker) { return this.clock == other.clock; }
+}
+
+const BREAKPOINT_PLACEHOLDER_MARKER = new class extends GutterMarker {
+ toDOM() {
+ const span = document.createElement("span");
+ span.textContent = "●";
+ span.style.color = "transparent";
+ span.style.cursor = "pointer";
+ span.addEventListener("mouseenter", () => {
+ span.style.color = "rgba(255, 0, 0, 0.5)";
+ });
+ span.addEventListener("mouseleave", () => {
+ span.style.color = "transparent";
+ });
+ return span;
+ }
+};
+
+const BREAKPOINT_MARKER = new class extends GutterMarker {
+ toDOM() {
+ const span = document.createElement("span");
+ span.innerHTML = "●";
+ span.style.color = "rgba(255, 0, 0, 1.0)";
+ span.style.cursor = "pointer";
+ span.title = "Click to run to here"; // "Click to toggle breakpoint";
+ return span;
+ }
+};
+
+class ErrorMarker extends GutterMarker {
+ constructor(readonly line: number, readonly msg: string) { super(); }
+
+ toDOM() {
+ const span = document.createElement("span");
+ span.innerHTML = "ⓧ";
+ span.style.color = "red";
+ span.style.cursor = "pointer";
+ span.title = this.msg;
+ return span;
+ }
+ eq(other: ErrorMarker) { return this.line == other.line && this.msg == other.msg; }
+}
+
+const CURRENT_PC_PLACEHOLDER_MARKER = new class extends GutterMarker {
+ toDOM() {
+ const span = document.createElement("span");
+ span.textContent = "▶";
+ span.style.color = "transparent";
+ span.style.cursor = "pointer";
+ span.title = "Click to run to here";
+ span.addEventListener("mouseenter", () => {
+ span.style.color = "#ffee66";
+ });
+ span.addEventListener("mouseleave", () => {
+ span.style.color = "transparent";
+ });
+ return span;
+ }
+};
+
+const CURRENT_PC_MARKER = new class extends GutterMarker {
+ toDOM() {
+ const span = document.createElement("span");
+ span.innerHTML = "▶";
+ span.style.color = "#ff66ee";
+ span.style.cursor = "pointer";
+ span.title = "Current PC";
+ return span;
+ }
+};
+
+const offsetGutter = gutter({
+ class: "gutter-offset",
+ markers: v => v.state.field(offsetField),
+ initialSpacer: () => new OffsetMarker("0000")
+});
+
+const bytesGutter = gutter({
+ class: "gutter-bytes",
+ markers: v => v.state.field(bytesField),
+ initialSpacer: () => new BytesMarker("00 00 00")
+});
+
+const clockGutter = gutter({
+ class: "gutter-clock",
+ markers: v => v.state.field(clockField),
+ initialSpacer: () => new ClockMarker("00")
+});
+
+const statusGutter = gutter({
+ class: "gutter-status",
+ lineMarker(view, line, otherMarkers) {
+ // Show invisible placeholder on lines without markers, to enable hover.
+ return otherMarkers.length === 0 ? BREAKPOINT_PLACEHOLDER_MARKER : null;
+ },
+ markers: v => {
+ const errorMarkers = v.state.field(errorField);
+ if (errorMarkers.size > 0) {
+ return errorMarkers;
+ }
+ return v.state.field(breakpointField);
+ },
+ initialSpacer: () => new ErrorMarker(0, "ⓧ"), // "ⓧ" is wider than "●".
+ domEventHandlers: {
+ click(view, line) {
+ const errorMarkers = view.state.field(errorField);
+ if (errorMarkers.size > 0) {
+ const pos = line.from;
+ let msg = "";
+ errorMarkers.between(pos, pos, (from, to, marker: ErrorMarker) => {
+ msg = marker.msg;
+ });
+ if (msg) {
+ const lineNum = view.state.doc.lineAt(line.from).number;
+ view.dispatch({
+ effects: showErrorMessage.of({ line: lineNum, msg, toggle: true })
+ });
+ }
+ } else {
+ const lineNum = view.state.doc.lineAt(line.from).number;
+ view.dispatch({
+ effects: toggleBreakpoint.of(lineNum)
+ });
+ }
+ return true;
+ }
+ }
+});
+
+const currentPcGutter = gutter({
+ class: "gutter-currentpc",
+ lineMarker(view, line, otherMarkers) {
+ // Show invisible placeholder on lines without markers, to enable hover.
+ return otherMarkers.length === 0 ? CURRENT_PC_PLACEHOLDER_MARKER : null;
+ },
+ markers: v => v.state.field(currentPcField),
+ initialSpacer: () => CURRENT_PC_MARKER,
+ domEventHandlers: {
+ click(view, line) {
+ const lineNum = view.state.doc.lineAt(line.from).number;
+ view.dispatch({
+ effects: runToLineEffect.of(lineNum)
+ });
+ return true;
+ }
+ }
+});
+
+export const offset = {
+ set: setOffset,
+ field: offsetField,
+ gutter: offsetGutter,
+};
+
+export const bytes = {
+ set: setBytes,
+ field: bytesField,
+ gutter: bytesGutter,
+};
+
+export const clock = {
+ set: setClock,
+ field: clockField,
+ gutter: clockGutter,
+};
+
+export const breakpointMarkers = {
+ set: toggleBreakpoint,
+ field: breakpointField,
+};
+
+export const errorMarkers = {
+ set: setErrors,
+ field: errorField,
+ showMessage: showErrorMessage
+};
+
+export const statusMarkers = {
+ gutter: statusGutter
+};
+
+export const currentPcMarker = {
+ set: setCurrentPc,
+ runToLine: runToLineEffect,
+ field: currentPcField,
+ gutter: currentPcGutter,
+};
diff --git a/src/ide/views/visuals.ts b/src/ide/views/visuals.ts
new file mode 100644
index 00000000..737d5f30
--- /dev/null
+++ b/src/ide/views/visuals.ts
@@ -0,0 +1,216 @@
+
+import { errorMarkers } from "./gutter";
+
+import { SelectionRange, StateEffect, StateField } from "@codemirror/state";
+import { Decoration, DecorationSet, EditorView, WidgetType } from "@codemirror/view";
+
+// Highlight program counter line.
+const currentPcEffect = StateEffect.define();
+
+const currentPcDecoration = Decoration.line({
+ attributes: { class: "cm-currentpc" }
+});
+
+const currentPcLineField = StateField.define({
+ create() { return Decoration.none },
+ update(lines, tr) {
+ lines = lines.map(tr.changes)
+
+ for (let e of tr.effects) {
+ if (e.is(currentPcEffect)) {
+ if (e.value === null) return Decoration.none;
+
+ const line = tr.state.doc.line(e.value);
+ return Decoration.set([currentPcDecoration.range(line.from)]);
+ }
+ }
+ return lines;
+ },
+ provide: f => EditorView.decorations.from(f),
+});
+
+
+// Error message widget to show below error lines
+class ErrorMessageWidget extends WidgetType {
+ constructor(readonly message: string) { super() }
+
+ toDOM() {
+ let div = document.createElement("div");
+ div.textContent = this.message;
+ div.style.cssText = `
+ color: #ff6666;
+ background-color: #330000;
+ padding: 4px 8px;
+ margin: 2px 0;
+ border-left: 3px solid #ff0000;
+ font-family: monospace;
+ `;
+ return div;
+ }
+}
+
+// State field to manage error message decorations (supports multiple messages)
+const errorMessageField = StateField.define({
+ create() { return Decoration.none; },
+ update(decorations, tr) {
+ // Map existing decorations across document changes
+ decorations = decorations.map(tr.changes);
+
+ for (let e of tr.effects) {
+ if (e.is(errorMarkers.showMessage)) {
+ if (e.value === null || !e.value) {
+ // Clear all messages
+ return Decoration.none;
+ } else if (e.value.toggle) {
+ // Build new decoration set with toggled message
+ const widgets: any[] = [];
+
+ // Collect existing decorations
+ const existingMessages = new Map();
+ decorations.between(0, tr.state.doc.length, (from, to, value) => {
+ try {
+ const lineNum = tr.state.doc.lineAt(to).number;
+ if (value.spec.widget instanceof ErrorMessageWidget) {
+ existingMessages.set(lineNum, (value.spec.widget as ErrorMessageWidget).message);
+ }
+ } catch { }
+ });
+
+ // Check if we're adding or removing this line's message
+ const isCurrentlyShown = existingMessages.has(e.value.line);
+
+ if (isCurrentlyShown) {
+ // Remove the message
+ existingMessages.delete(e.value.line);
+ } else {
+ // Add the new message
+ existingMessages.set(e.value.line, e.value.msg);
+ }
+
+ // Build sorted decorations
+ const sortedLines = Array.from(existingMessages.keys()).sort((a, b) => a - b);
+ sortedLines.forEach(lineNum => {
+ try {
+ const line = tr.state.doc.line(lineNum);
+ widgets.push(
+ Decoration.widget({
+ widget: new ErrorMessageWidget(existingMessages.get(lineNum)!),
+ block: true,
+ side: 1
+ }).range(line.to)
+ );
+ } catch {
+ // Line doesn't exist, skip
+ }
+ });
+
+ return Decoration.set(widgets, true);
+ }
+ }
+ }
+ return decorations;
+ },
+ provide: f => EditorView.decorations.from(f),
+});
+
+// Decorator widget to show values.
+class ShowValueWidget extends WidgetType {
+ constructor(readonly value: string) { super() }
+
+ toDOM() {
+ let div = document.createElement("div");
+ div.textContent = `${this.value}`;
+ div.style.cssText = `
+ color: #ccccff;
+ background-color: #000066;
+ display: inline-block;
+ `;
+ div.className = "cm-line";
+ return div
+ }
+}
+
+// Effect to pass the position and value to the state.
+const showValueEffect = StateEffect.define<{ range: SelectionRange, val: any } | null>();
+
+const showValueDecorationField = StateField.define({
+ create() { return Decoration.none },
+ update(decorations, tr) {
+ decorations = decorations.map(tr.changes);
+
+ for (let e of tr.effects) {
+ if (e.is(showValueEffect)) {
+ if (e.value === null || !e.value) {
+ return Decoration.none;
+ }
+ const line = tr.state.doc.lineAt(e.value.range.to);
+ return Decoration.set([
+ Decoration.widget({
+ widget: new ShowValueWidget(e.value.val),
+ block: true,
+ side: 1 // Appears after the line
+ }).range(line.to)
+ ])
+ }
+ }
+ return decorations;
+ },
+ provide: f => EditorView.decorations.from(f),
+});
+
+const highlightLinesEffect = StateEffect.define<{ start: number, end: number } | null>();
+
+const highlightLinesDecoration = Decoration.line({
+ attributes: { class: "highlight-lines" }
+});
+
+const highlightLinesField = StateField.define({
+ create() { return Decoration.none },
+ update(decorations, tr) {
+ decorations = decorations.map(tr.changes);
+
+ for (let e of tr.effects) {
+ if (e.is(highlightLinesEffect)) {
+ if (e.value === null) return Decoration.none;
+
+ const { start, end } = e.value;
+ const decorationRanges: any[] = [];
+
+ // Highlight all lines in the range
+ for (let lineNum = start; lineNum <= end; lineNum++) {
+ try {
+ const line = tr.state.doc.line(lineNum);
+ decorationRanges.push(highlightLinesDecoration.range(line.from));
+ } catch {
+ // Line doesn't exist, skip
+ }
+ }
+
+ return Decoration.set(decorationRanges);
+ }
+ }
+ return decorations;
+ },
+ provide: f => EditorView.decorations.from(f),
+});
+
+export const errorMessages = {
+ field: errorMessageField,
+ widget: ErrorMessageWidget,
+};
+
+export const currentPc = {
+ effect: currentPcEffect,
+ decoration: currentPcDecoration,
+ field: currentPcLineField,
+};
+
+export const showValue = {
+ effect: showValueEffect,
+ field: showValueDecorationField,
+};
+
+export const highlightLines = {
+ effect: highlightLinesEffect,
+ field: highlightLinesField,
+};
diff --git a/src/parser/lang-6502.grammar b/src/parser/lang-6502.grammar
new file mode 100644
index 00000000..5dbee73e
--- /dev/null
+++ b/src/parser/lang-6502.grammar
@@ -0,0 +1,162 @@
+@top Program { Line* }
+
+@skip { space | Comment }
+
+Line {
+ Label? Statement? eol
+}
+
+Statement {
+ Instruction |
+ Directive |
+ MacroDef |
+ MacEnd |
+ ControlOp |
+ ErrorOp
+}
+
+Label { Identifier ":" | Identifier }
+
+Instruction {
+ Opcode Operand?
+}
+
+Register {
+ @specialize
+}
+
+Directive {
+ PseudoOp (Expression)*
+}
+
+PseudoOp {
+ @specialize
+}
+
+Mac { @specialize }
+MacEnd { @specialize }
+
+ControlOp { @specialize }
+ErrorOp { @specialize }
+
+MacroDef {
+ Mac Identifier
+}
+
+CurrentAddress {
+ @specialize
+}
+
+Opcode {
+ @specialize
+}
+
+Expression {
+ Expression !logic LogicOp Expression |
+ Expression !bit BitOp Expression |
+ Expression !compare (CompareOp | BinaryLt | BinaryGt) Expression |
+ Expression !term (ArithOp | Plus | Minus | Percent) Expression |
+ UnaryExpression |
+ Value |
+ "(" Expression ")"
+}
+
+UnaryExpression {
+ (Plus | Minus | Not | Tilde | UnaryLt | UnaryGt) Expression
+}
+
+BinaryLt { lt !bin }
+BinaryGt { gt !bin }
+UnaryLt { lt !un }
+UnaryGt { gt !un }
+
+Value {
+ Number |
+ Identifier |
+ CurrentAddress |
+ String |
+ Char
+}
+
+Operand {
+ "#" Expression |
+ "(" Expression Comma Register ")" |
+ Expression (Comma Register)? |
+ Register
+}
+
+@tokens {
+ Identifier { $[a-zA-Z_.] $[a-zA-Z0-9_.]* }
+
+ Number {
+ "$" $[0-9a-fA-F]+ |
+ "%" $[01]+ |
+ $[0-9]+
+ }
+
+ String { '"' (!["\\\n] | "\\" _)* '"' }
+
+ Char { "'" ![\n] "'"? }
+
+ Comment { ";" ![\n]* }
+
+ space { $[ \t]+ }
+ eol { $[\n\r]+ }
+
+ Comma { "," }
+ "#"
+ "(" ")"
+
+ ArithOp { "*" | "/" }
+ Percent { "%" }
+ Plus { "+" }
+ Minus { "-" }
+
+ BitOp { "&" | "|" | "^" | "<<" | ">>" }
+ Tilde { "~" }
+
+ LogicOp { "&&" | "||" }
+ Not { "!" }
+
+ CompareOp { "==" | "!=" | "<=" | ">=" }
+ lt { "<" }
+ gt { ">" }
+
+ @precedence { String, Char, Number, Percent, Identifier }
+}
+
+@precedence {
+ un,
+ term @left,
+ compare @left,
+ bit @left,
+ logic @left,
+ bin @left,
+ PseudoOp,
+ Opcode,
+ Label
+}
+
+@detectDelim
diff --git a/src/parser/lang-6502.ts b/src/parser/lang-6502.ts
new file mode 100644
index 00000000..17c8146b
--- /dev/null
+++ b/src/parser/lang-6502.ts
@@ -0,0 +1,55 @@
+import { LRLanguage, LanguageSupport, delimitedIndent, foldInside, foldNodeProp, indentNodeProp } from "@codemirror/language"
+import { styleTags, tags as t } from "@lezer/highlight"
+import { parser } from "../../gen/parser/lang-6502.grammar.js"
+
+export const Lezer6502: LRLanguage = LRLanguage.define({
+ parser: parser.configure({
+ props: [
+ indentNodeProp.add({
+ Application: delimitedIndent({ closing: ")", align: false })
+ }),
+ foldNodeProp.add({
+ Application: foldInside
+ }),
+ styleTags({
+ Identifier: t.variableName,
+ CurrentAddress: t.self,
+ PseudoOp: t.definition(t.variableName),
+ Opcode: t.keyword,
+ Label: t.labelName,
+ String: t.string,
+ Char: t.number,
+ Number: t.number,
+ Register: t.typeName,
+ Comment: t.lineComment,
+ ArithOp: t.arithmeticOperator,
+ Plus: t.arithmeticOperator,
+ Minus: t.arithmeticOperator,
+ Percent: t.arithmeticOperator,
+ BitOp: t.bitwiseOperator,
+ Tilde: t.bitwiseOperator,
+ LogicOp: t.logicOperator,
+ Not: t.logicOperator,
+ CompareOp: t.compareOperator,
+ BinaryLt: t.compareOperator,
+ BinaryGt: t.compareOperator,
+ UnaryLt: t.arithmeticOperator,
+ UnaryGt: t.arithmeticOperator,
+ Mac: t.definitionKeyword,
+ MacEnd: t.definitionKeyword,
+ "MacroDef/Identifier": t.macroName,
+ ControlOp: t.controlKeyword,
+ ErrorOp: t.keyword,
+ Comma: t.separator,
+ "( )": t.paren
+ })
+ ]
+ }),
+ languageData: {
+ commentTokens: { line: ";" }
+ }
+})
+
+export function asm6502(): LanguageSupport {
+ return new LanguageSupport(Lezer6502)
+}
diff --git a/src/parser/lang-basic.ts b/src/parser/lang-basic.ts
new file mode 100644
index 00000000..2eeeca5c
--- /dev/null
+++ b/src/parser/lang-basic.ts
@@ -0,0 +1,166 @@
+// CodeMirror 6 language support for BASIC
+// Migrated from CodeMirror 5 mode
+// Original copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+
+import { StreamLanguage, StreamParser, LanguageSupport } from "@codemirror/language";
+
+interface BasicState {
+ tokenize: (stream: any, state: BasicState) => string | null;
+ currentIndent: number;
+ doInCurrentLine: boolean;
+}
+
+// TODO: Migrate to CodeMirror 6 Lezer parser.
+const basicParser: StreamParser = {
+ startState() {
+ return {
+ tokenize: tokenBase,
+ currentIndent: 0,
+ doInCurrentLine: false
+ };
+ },
+
+ token(stream, state) {
+ if (stream.sol()) {
+ state.doInCurrentLine = false;
+ }
+ return state.tokenize(stream, state);
+ },
+
+ indent(state, textAfter, context) {
+ const unit = context.unit;
+ const closing = /^(?:next|end|wend|else|to|then)\b/i;
+ if (closing.test(textAfter)) {
+ return (state.currentIndent - 1) * unit;
+ }
+ return state.currentIndent * unit;
+ },
+
+ languageData: {
+ commentTokens: { line: "'" }
+ }
+};
+
+// --- Regex Helpers ---
+
+function wordRegexp(words: string[]) {
+ return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
+}
+
+const singleOperators = /^[\+\-\*/%&\\|\^~<>!]/;
+const singleDelimiters = /^[\(\)\[\]\{\}@,:`=;\.]/;
+const doubleOperators = /^((==)|(<>)|(<=)|(>=)|(<>)|(<<)|(>>)|(\/\/)|(\*\*))/;
+const doubleDelimiters = /^((\+=)|(\-=)|(\*=)|(%=)|(\/=)|(&=)|(\|=)|(\^=))/;
+const tripleDelimiters = /^(((\/\/)=)|(>>=)|(<<=)|(\*\*=))/;
+const identifiers = /^[_A-Za-z][_A-Za-z0-9]*/;
+
+const openingKeywords = ['if', 'for', 'while'];
+const middleKeywords = ['to', 'then', 'else'];
+const endKeywords = ['next', 'end', 'wend'];
+const operatorKeywords = ['and', 'or', 'not', 'xor', 'eqv', 'imp', 'mod'];
+
+const commonKeywords = [
+ 'BASE', 'DATA', 'DEF', 'DIM', 'GO', 'GOSUB', 'GOTO', 'INPUT', 'LET', 'ON', 'OPTION', 'PRINT',
+ 'RANDOMIZE', 'READ', 'REM', 'RESTORE', 'RETURN', 'STEP', 'STOP', 'SUB', 'CALL', 'CHANGE',
+ 'CONVERT', 'CLEAR', 'DIALECT', 'SELECT', 'CASE'
+];
+
+const commontypes = ['xxxxbyte', 'xxxxword'];
+
+const keywords = wordRegexp(commonKeywords);
+const types = wordRegexp(commontypes);
+const opening = wordRegexp(openingKeywords);
+const middle = wordRegexp(middleKeywords);
+const closing = wordRegexp(endKeywords);
+const doubleClosing = wordRegexp(['end']);
+const doOpening = wordRegexp(['do']);
+const wordOperators = wordRegexp(operatorKeywords);
+
+// --- Tokenizer Functions ---
+
+function tokenBase(stream: any, state: BasicState): string | null {
+ if (stream.eatSpace()) return null;
+
+ const ch = stream.peek();
+
+ // Comments
+ if (ch === "'") {
+ stream.skipToEnd();
+ return "comment";
+ }
+
+ // Numbers
+ if (stream.match(/^(\$)?[0-9\.a-f]/i, false)) {
+ if (stream.match(/^\d*\.\d+F?/i) || stream.match(/^\d+\.\d*F?/) || stream.match(/^\.\d+F?/)) {
+ stream.eat(/J/i);
+ return "number";
+ }
+ if (stream.match(/^\$[0-9a-f]+/i) || stream.match(/^&O[0-7]+/i) || stream.match(/^\d+F?/) || stream.match(/^0(?![\dx])/i)) {
+ stream.eat(/J/i);
+ stream.eat(/L/i);
+ return "number";
+ }
+ }
+
+ // REM Remark
+ if (stream.match(/\bREM/i)) {
+ stream.skipToEnd();
+ return "comment";
+ }
+
+ // Strings
+ if (ch === '"') {
+ state.tokenize = tokenString;
+ return state.tokenize(stream, state);
+ }
+
+ // Delimiters & Operators
+ if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) return null;
+ if (stream.match(doubleOperators) || stream.match(singleOperators) || stream.match(wordOperators)) return "operator";
+ if (stream.match(singleDelimiters)) return null;
+
+ // Indentation logic
+ if (stream.match(doOpening)) {
+ state.currentIndent++;
+ state.doInCurrentLine = true;
+ return "keyword";
+ }
+ if (stream.match(opening)) {
+ if (!state.doInCurrentLine) state.currentIndent++;
+ else state.doInCurrentLine = false;
+ return "keyword";
+ }
+ if (stream.match(middle)) return "keyword";
+ if (stream.match(doubleClosing)) {
+ state.currentIndent -= 2;
+ return "keyword";
+ }
+ if (stream.match(closing)) {
+ state.currentIndent--;
+ return "keyword";
+ }
+
+ if (stream.match(types) || stream.match(keywords)) return "keyword";
+ if (stream.match(identifiers)) return "variable";
+
+ stream.next();
+ return "error";
+}
+
+function tokenString(stream: any, state: BasicState): string {
+ stream.next(); // Skip initial quote
+ while (!stream.eol()) {
+ stream.eatWhile(/[^"]/);
+ if (stream.eat('"')) {
+ state.tokenize = tokenBase;
+ return "string";
+ }
+ }
+ state.tokenize = tokenBase;
+ return "string";
+}
+
+export function basic(): LanguageSupport {
+ return new LanguageSupport(StreamLanguage.define(basicParser));
+}
\ No newline at end of file
diff --git a/src/parser/lang-bataribasic.ts b/src/parser/lang-bataribasic.ts
new file mode 100644
index 00000000..f05a1d9e
--- /dev/null
+++ b/src/parser/lang-bataribasic.ts
@@ -0,0 +1,99 @@
+// CodeMirror 6 language support for Batari Basic
+// Migrated from CodeMirror 5 mode
+// Original copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+
+import { StreamLanguage, StreamParser } from "@codemirror/language";
+import { LanguageSupport } from "@codemirror/language";
+
+interface BatariBasicState {
+ context: number;
+}
+
+// TODO: Migrate to CodeMirror 6 Lezer parser.
+function createBatariBasicParser(): StreamParser {
+ const directives_list = [
+ 'rem', 'if', 'else', 'then', 'goto',
+ 'includesfile', 'include', 'inline', 'function',
+ 'bank', 'sdata', 'data',
+ 'on', 'off',
+ 'up', 'down',
+ 'const', 'dim', 'for', 'next', 'gosub',
+ 'pfpixel', 'pfhline', 'pfclear', 'pfvline', 'pfscroll',
+ 'drawscreen', 'asm', 'pop', 'set', 'return', 'reboot', 'vblank',
+ 'pfcolors', 'pfheights', 'playfield', 'lives',
+ 'player0', 'player1', 'player2', 'player3', 'player4', 'player5',
+ 'player0color', 'player1color',
+ 'let',
+ 'switchreset', 'switchselect', 'switchleftb', 'switchrightb', 'switchbw',
+ 'joy0up', 'joy0down', 'joy0left', 'joy0right', 'joy1up', 'joy1down', 'joy1left', 'joy1right', 'joy0fire', 'joy1fire',
+ 'size', '2k', '8k', '8kSC', '16k', '16kSC', '32k', '32kSC', '4k',
+ 'thisbank', 'otherbank', 'flip',
+ 'collision', 'missile0', 'missile1', 'ball',
+ 'stackpull', 'rand', 'score', 'scorec', 'Areg',
+ 'smartbranching', 'romsize', 'optimization', 'speed', 'size',
+ 'noinlinedata', 'inlinerand', 'none', 'kernal', 'kernel_options',
+ 'readpaddle', 'player1colors', 'playercolors', 'no_blank_lines',
+ 'kernel', 'multisprite', 'multisprite_no_include', 'debug',
+ 'cyclescore', 'cycles', 'legacy'
+ ];
+
+ const directives = new Map();
+ directives_list.forEach(s => directives.set(s, 'keyword'));
+
+ const numbers = /^([$][0-9a-f]+|[%][01]+|[0-9.]+)/i;
+
+ return {
+ startState(): BatariBasicState {
+ return {
+ context: 0
+ };
+ },
+
+ token(stream, state) {
+ if (!stream.column()) {
+ state.context = 0;
+ if (stream.eatWhile(/[\w.]/)) {
+ if (stream.current().toLowerCase() == 'end')
+ return 'keyword';
+ else
+ return 'meta';
+ }
+ }
+
+ if (stream.eatSpace())
+ return null;
+
+ let w;
+ if (stream.eatWhile(/[$%A-Z0-9]/i)) {
+ w = stream.current();
+ const cur = w.toLowerCase();
+ const style = directives.get(cur);
+
+ if (cur == 'rem') {
+ stream.eatWhile(/./);
+ return 'comment';
+ }
+
+ if (style)
+ return style;
+
+ if (numbers.test(w)) {
+ return 'number';
+ } else {
+ return null;
+ }
+ } else {
+ stream.next();
+ }
+ return null;
+ }
+ };
+}
+
+/**
+ * Language support for Batari Basic
+ */
+export function batariBasic(): LanguageSupport {
+ return new LanguageSupport(StreamLanguage.define(createBatariBasicParser()));
+}
diff --git a/src/parser/lang-fastbasic.ts b/src/parser/lang-fastbasic.ts
new file mode 100644
index 00000000..87f9aa13
--- /dev/null
+++ b/src/parser/lang-fastbasic.ts
@@ -0,0 +1,170 @@
+// CodeMirror 6 language support for FastBasic
+// Migrated from CodeMirror 5 mode
+// Original copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+
+import { StreamLanguage, StreamParser } from "@codemirror/language";
+import { LanguageSupport } from "@codemirror/language";
+
+interface FastBasicState {
+ tokenize: (stream: any, state: FastBasicState) => string | null;
+}
+
+// TODO: Migrate to CodeMirror 6 Lezer parser.
+function createFastBasicParser(): StreamParser {
+ function wordRegexp(words: string[]): RegExp {
+ return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
+ }
+
+ const singleOperators = /^[\+\-\*/%&\\|^\~<>!]/;
+ const singleDelimiters = /^[\(\)\[\]\{\}@,:`=;\\.]/;
+ const doubleOperators = /^((==)|(<>)|(<=)|(>=)|(<>)|(<<)|(>>)|(\/\/)|(\*\*))/;
+ const doubleDelimiters = /^((\+=)|(\-=)|(\*=)|(%=)|(\/=)|(&=)|(\|=)|(\^=))/;
+ const tripleDelimiters = /^((\/\/=)|(>>=)|(<<=)|(\*\*=))/;
+ const identifiers = /^[_A-Za-z][_A-Za-z0-9]*/;
+
+ const openingKeywords = ['while', 'repeat', 'proc', 'do', 'if', 'for'];
+ const middleKeywords = ['else', 'elseif', 'to'];
+ const endKeywords = ['next', 'loop', 'wend', 'endproc', 'endif', 'end', 'until'];
+ const operatorKeywords = ['and', 'or', 'not', 'xor', 'in'];
+ const commonKeywords = [
+ 'as', 'dim', 'break', 'continue', 'optional', 'then', 'until', 'goto', 'true', 'false',
+ 'data', 'graphics', 'poke', 'se', 'move', 'mset',
+ 'print', 'exec', 'pause', 'inc', 'dec', 'sound',
+ 'get', 'put', 'cls', 'input', 'position', 'exit',
+ 'color', 'drawto', 'fcolor', 'fillto', 'locate', 'plot', 'pmgraphics', 'pmhpos', 'setcolor',
+ 'bget', 'bput', 'close', 'open', 'xio',
+ 'clr', 'timer', 'dli', 'into', 'step', 'set',
+ 'dpoke', 'dpeek', 'adr', 'usr',
+ ];
+ const commontypes = ['byte', 'word'];
+
+ const keywords = wordRegexp(commonKeywords);
+ const types = wordRegexp(commontypes);
+ const opening = wordRegexp(openingKeywords);
+ const middle = wordRegexp(middleKeywords);
+ const closing = wordRegexp(endKeywords);
+ const wordOperators = wordRegexp(operatorKeywords);
+
+ function tokenBase(stream: any, state: FastBasicState): string | null {
+ if (stream.eatSpace()) {
+ return null;
+ }
+
+ const ch = stream.peek();
+
+ // Handle Comments
+ if (ch === "'") {
+ stream.skipToEnd();
+ return 'comment';
+ }
+
+ // Handle Number Literals
+ if (stream.match(/^(\$)?[0-9\.a-f]/i, false)) {
+ let floatLiteral = false;
+ // Floats
+ if (stream.match(/^\d*\.\d+F?/i)) { floatLiteral = true; }
+ else if (stream.match(/^\d+\.\d*F?/)) { floatLiteral = true; }
+ else if (stream.match(/^\.\d+F?/)) { floatLiteral = true; }
+
+ if (floatLiteral) {
+ // Float literals may be "imaginary"
+ stream.eat(/J/i);
+ return 'number';
+ }
+ // Integers
+ let intLiteral = false;
+ // Hex
+ if (stream.match(/^\$[0-9a-f]+/i)) { intLiteral = true; }
+ // Octal
+ else if (stream.match(/^&O[0-7]+/i)) { intLiteral = true; }
+ // Decimal
+ else if (stream.match(/^[1-9]\d*F?/)) {
+ // Decimal literals may be "imaginary"
+ stream.eat(/J/i);
+ intLiteral = true;
+ }
+ // Zero by itself with no other piece of number.
+ else if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
+ if (intLiteral) {
+ // Integer literals may be "long"
+ stream.eat(/L/i);
+ return 'number';
+ }
+ }
+
+ // Handle Strings
+ if (stream.eat('"')) {
+ state.tokenize = tokenString;
+ return tokenString(stream, state);
+ }
+
+ // Handle operators and Delimiters
+ if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) {
+ return null;
+ }
+ if (stream.match(doubleOperators)
+ || stream.match(singleOperators)
+ || stream.match(wordOperators)) {
+ return 'operator';
+ }
+ if (stream.match(singleDelimiters)) {
+ return null;
+ }
+
+ // Handle keywords
+ if (stream.match(opening) || stream.match(middle) || stream.match(closing)) {
+ return 'keyword';
+ }
+
+ if (stream.match(types)) {
+ return 'keyword';
+ }
+
+ if (stream.match(keywords)) {
+ return 'keyword';
+ }
+
+ if (stream.match(identifiers)) {
+ return 'variableName';
+ }
+
+ // Handle non-detected items
+ stream.next();
+ return null;
+ }
+
+ function tokenString(stream: any, state: FastBasicState): string | null {
+ while (!stream.eol()) {
+ stream.eatWhile(/[^'"]/);
+ if (stream.eat('"')) {
+ state.tokenize = tokenBase;
+ return 'string';
+ } else {
+ stream.eat(/['"]/);
+ }
+ }
+ // Single-line strings
+ state.tokenize = tokenBase;
+ return 'string';
+ }
+
+ return {
+ startState(): FastBasicState {
+ return {
+ tokenize: tokenBase
+ };
+ },
+
+ token(stream, state) {
+ return state.tokenize(stream, state);
+ }
+ };
+}
+
+/**
+ * Language support for FastBASIC
+ */
+export function fastBasic(): LanguageSupport {
+ return new LanguageSupport(StreamLanguage.define(createFastBasicParser()));
+}
diff --git a/src/parser/lang-inform6.ts b/src/parser/lang-inform6.ts
new file mode 100644
index 00000000..d49e1e62
--- /dev/null
+++ b/src/parser/lang-inform6.ts
@@ -0,0 +1,114 @@
+// CodeMirror 6 language support for Inform6
+// Migrated from CodeMirror 5 mode
+// Original copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+
+import { StreamLanguage, StreamParser } from "@codemirror/language";
+import { LanguageSupport } from "@codemirror/language";
+
+interface Inform6State {
+ context: number;
+ tokenize: (stream: any, state: Inform6State) => string | null;
+}
+
+// TODO: Migrate to CodeMirror 6 Lezer parser.
+function createInform6Parser(): StreamParser {
+ const keywords_list = "box|break|continue|do|else|fonton|fontoff|for|give|if|jump|new_line|objectloop|print|print_ret|remove|return|rfalse|rtrue|spaces|string|styleroman|stylebold|styleunderline|stylereverse|stylefixed|switch|until|while|has|hasnt|with|in|notin|ofclass|provides|or".split("|");
+ const directives_list = "Abbreviate|Array|Attribute|Class|Constant|Default|End|Endif|Extend|Global|Ifdef|Ifndef|Ifnot|Iftrue|Iffalse|Import|Include|Link|Lowstring|Message|Object|Property|Release|Replace|Serial|Switches|Statuslinescore|Statuslinetime|System_file|Verb|Zcharacter".toLowerCase().split("|");
+ const properties_list = "add_to_scope|after|article|articles|before|cant_go|capacity|d_to|daemon|describe|description|door_dir|door_to|e_to|each_turn|found_in|grammar|in_to|initial|inside_description|invent|life|list_together|name|n_to|ne_to|number|nw_to|orders|out_to|parse_name|plural|react_after|react_before|s_to|se_to|short_name|short_name_indef|sw_to|time_left|time_out|u_to|w_to|when_closed|when_open|when_on|when_off|with_key".split("|");
+ const attributes_list = "absent|animate|clothing|concealed|container|door|edible|enterable|female|general|light|lockable|locked|male|moved|neuter|open|openable|pluralname|proper|scenery|scored|static|supporter|switchable|talkable|transparent|visited|workflag|worn".split("|");
+ const actions_list = "Pronouns|Quit|Restart|Restore|Save|Verify|ScriptOn|ScriptOff|NotifyOn|NotifyOff|Places|Objects|Score|FullScore|Version|LMode1|LMode2|LMode3|Look|Examine|Search|Inv|InvTall|InvWide|Take|Drop|Remove|PutOn|Insert|LetGo|Receive|Empty|EmptyT|Remove|Transfer|Go|Enter|GetOff|GoIn|Exit|Unlock|Lock|SwitchOn|SwitchOff|Open|Close|Disrobe|Wear|Eat|Wait|LookUnder|Listen|Taste|Touch|Pull|Push|Wave|Turn|PushDir|ThrowAt|ThrownAt|JumpOver|Tie|Drink|Fill|Attack|Swing|Blow|Rub|Set|SetTo|Buy|Climb|Squeeze|Burn|Dig|Cut|Consult|Tell|Answer|Ask|Give|Show|AskFor|WakeOther|Kiss|Sleep|Sing|WaveHands|Swim|Sorry|Strong|Mild|Jump|Think|Smell|Pray|VagueGo|Yes|No|Wake|Answer|Ask|Attack|Give|Kiss|Order|Show|Tell|ThrowAt|WakeOther".toLowerCase().split("|");
+
+ const directives = new Map();
+ directives_list.forEach(s => directives.set(s, 'keyword'));
+ keywords_list.forEach(s => directives.set(s, 'keyword'));
+ properties_list.forEach(s => directives.set(s, 'keyword'));
+ attributes_list.forEach(s => directives.set(s, 'keyword'));
+ actions_list.forEach(s => directives.set(s, 'keyword'));
+
+ const numbers = /^([\da-f]+h|[0-7]+o|[01]+b|\d+d?)\b/i;
+
+ function tokenBase(stream: any, state: Inform6State): string | null {
+ if (stream.eatSpace())
+ return null;
+
+ let w;
+ if (stream.eatWhile(/\w/)) {
+ w = stream.current();
+ const cur = w.toLowerCase();
+ const style = directives.get(cur);
+ if (style)
+ return style;
+
+ if (numbers.test(w)) {
+ return 'number';
+ } else if (stream.match(numbers)) {
+ return 'number';
+ } else {
+ return null;
+ }
+ } else if (stream.eat('!')) {
+ stream.skipToEnd();
+ return 'comment';
+ } else if (stream.match(/\]|\[|\}|\{/)) {
+ return 'bracket';
+ } else if (stream.match(/<<|>>/)) {
+ return 'bracket';
+ } else if (stream.match(/[#]+\w+/)) {
+ return 'number';
+ } else if (stream.eat('"')) {
+ state.tokenize = tokenString;
+ return tokenString(stream, state);
+ } else if (stream.eat('\'')) {
+ return tokenString2(stream, state);
+ } else if (stream.eat('$')) {
+ if (stream.eatWhile(/[^;]/i))
+ return 'number';
+ } else {
+ stream.next();
+ }
+ return null;
+ }
+
+ function tokenString(stream: any, state: Inform6State): string | null {
+ let ch;
+ while (ch = stream.next()) {
+ if (ch == '"') {
+ state.tokenize = tokenBase;
+ break;
+ }
+ }
+ return "string";
+ }
+
+ function tokenString2(stream: any, state: Inform6State): string | null {
+ let ch;
+ while (ch = stream.next()) {
+ if (ch == "'") {
+ state.tokenize = tokenBase;
+ break;
+ }
+ }
+ return "meta";
+ }
+
+ return {
+ startState(): Inform6State {
+ return {
+ context: 0,
+ tokenize: tokenBase
+ };
+ },
+
+ token(stream, state) {
+ return state.tokenize(stream, state);
+ }
+ };
+}
+
+/**
+ * Language support for Inform6
+ */
+export function inform6(): LanguageSupport {
+ return new LanguageSupport(StreamLanguage.define(createInform6Parser()));
+}
diff --git a/src/parser/lang-verilog.ts b/src/parser/lang-verilog.ts
new file mode 100644
index 00000000..b980e4d6
--- /dev/null
+++ b/src/parser/lang-verilog.ts
@@ -0,0 +1,475 @@
+// CodeMirror 6 language support for Verilog/SystemVerilog
+// Migrated from CodeMirror 5 mode
+// Original copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+
+import { StreamLanguage, StreamParser } from "@codemirror/language";
+import { LanguageSupport } from "@codemirror/language";
+
+interface VerilogConfig {
+ statementIndentUnit?: number;
+ dontAlignCalls?: boolean;
+ compilerDirectivesUseRegularIndentation?: boolean;
+ noIndentKeywords?: string[];
+ multiLineStrings?: boolean;
+}
+
+interface VerilogContext {
+ indented: number;
+ column: number;
+ type: string;
+ scopekind: string;
+ align: boolean | null;
+ prev: VerilogContext | null;
+}
+
+interface VerilogState {
+ tokenize: ((stream: any, state: VerilogState) => string | null) | null;
+ context: VerilogContext;
+ indented: number;
+ compilerDirectiveIndented: number;
+ startOfLine: boolean;
+}
+
+function words(str: string): { [key: string]: boolean } {
+ const obj: { [key: string]: boolean } = {};
+ const wordList = str.split(" ");
+ for (let i = 0; i < wordList.length; ++i) obj[wordList[i]] = true;
+ return obj;
+}
+
+// TODO: Migrate to CodeMirror 6 Lezer parser.
+function createVerilogParser(config: VerilogConfig = {}): StreamParser {
+ const statementIndentUnit = config.statementIndentUnit || 3;
+ const dontAlignCalls = config.dontAlignCalls;
+ const compilerDirectivesUseRegularIndentation = config.compilerDirectivesUseRegularIndentation;
+ const noIndentKeywords = config.noIndentKeywords || [];
+ const multiLineStrings = config.multiLineStrings;
+
+ /**
+ * Keywords from IEEE 1800-2012
+ */
+ const keywords = words(
+ "accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind " +
+ "bins binsof bit break buf bufif0 bufif1 byte case casex casez cell chandle checker class clocking cmos config " +
+ "const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable " +
+ "dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup " +
+ "endinterface endmodule endpackage endprimitive endprogram endproperty endspecify endsequence endtable endtask " +
+ "enum event eventually expect export extends extern final first_match for force foreach forever fork forkjoin " +
+ "function generate genvar global highz0 highz1 if iff ifnone ignore_bins illegal_bins implements implies import " +
+ "incdir include initial inout input inside instance int integer interconnect interface intersect join join_any " +
+ "join_none large let liblist library local localparam logic longint macromodule matches medium modport module " +
+ "nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 null or output package packed " +
+ "parameter pmos posedge primitive priority program property protected pull0 pull1 pulldown pullup " +
+ "pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos real realtime ref reg " +
+ "reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime " +
+ "s_until s_until_with scalared sequence shortint shortreal showcancelled signed small soft solve specify " +
+ "specparam static string strong strong0 strong1 struct super supply0 supply1 sync_accept_on sync_reject_on " +
+ "table tagged task this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 triand trior " +
+ "trireg type typedef union unique unique0 unsigned until until_with untyped use uwire var vectored virtual void " +
+ "wait wait_order wand weak weak0 weak1 while wildcard wire with within wor xnor xor"
+ );
+
+ const isOperatorChar = /[\+\-\*\/!~&|^%=?:<>]/;
+ const isBracketChar = /[\[\]{}()]/;
+
+ const unsignedNumber = /\d[0-9_]*/;
+ const decimalLiteral = /\d*\s*'s?d\s*\d[0-9_]*/i;
+ const binaryLiteral = /\d*\s*'s?b\s*[xz01][xz01_]*/i;
+ const octLiteral = /\d*\s*'s?o\s*[xz0-7][xz0-7_]*/i;
+ const hexLiteral = /\d*\s*'s?h\s*[0-9a-fxz?][0-9a-fxz?_]*/i;
+ const realLiteral = /(\d[\d_]*(\.\d[\d_]*)?E-?[\d_]+)|(\d[\d_]*\.\d[\d_]*)/i;
+
+ const closingBracketOrWord = /^((`?\w+)|[)}\]])/;
+ const closingBracket = /[)}\]]/;
+ const compilerDirectiveRegex = new RegExp(
+ "^(`(?:ifdef|ifndef|elsif|else|endif|undef|undefineall|define|include|begin_keywords|celldefine|default|" +
+ "nettype|end_keywords|endcelldefine|line|nounconnected_drive|pragma|resetall|timescale|unconnected_drive))\\b"
+ );
+ const compilerDirectiveBeginRegex = /^(`(?:ifdef|ifndef|elsif|else))\b/;
+ const compilerDirectiveEndRegex = /^(`(?:elsif|else|endif))\b/;
+
+ let curPunc: string | null;
+ let curKeyword: string | null;
+
+ // Block openings which are closed by a matching keyword in the form of ("end" + keyword)
+ const blockKeywords = words(
+ "case checker class clocking config function generate interface module package " +
+ "primitive program property specify sequence table task"
+ );
+
+ // Opening/closing pairs
+ const openClose: { [key: string]: string | undefined } = {};
+ for (const keyword in blockKeywords) {
+ openClose[keyword] = "end" + keyword;
+ }
+ openClose["begin"] = "end";
+ openClose["casex"] = "endcase";
+ openClose["casez"] = "endcase";
+ openClose["do"] = "while";
+ openClose["fork"] = "join;join_any;join_none";
+ openClose["covergroup"] = "endgroup";
+ openClose["macro_begin"] = "macro_end";
+
+ for (const keyword of noIndentKeywords) {
+ if (openClose[keyword]) {
+ openClose[keyword] = undefined;
+ }
+ }
+
+ // Keywords which open statements that are ended with a semi-colon
+ const statementKeywords = words(
+ "always always_comb always_ff always_latch assert assign assume else export for foreach forever if import initial repeat while extern typedef"
+ );
+
+ function tokenBase(stream: any, state: VerilogState): string | null {
+ const ch = stream.peek();
+ let style: string | null;
+
+ if (/[,;:\.]/.test(ch)) {
+ curPunc = stream.next();
+ return null;
+ }
+ if (isBracketChar.test(ch)) {
+ curPunc = stream.next();
+ return "bracket";
+ }
+ // Macros (tick-defines)
+ if (ch == '`') {
+ stream.next();
+ if (stream.eatWhile(/[\w\$_]/)) {
+ const cur = stream.current();
+ curKeyword = cur;
+ // Macros that end in _begin, are start of block and end with _end
+ if (cur.startsWith("`uvm_") && cur.endsWith("_begin")) {
+ const keywordClose = curKeyword.substr(0, curKeyword.length - 5) + "end";
+ openClose[cur] = keywordClose;
+ curPunc = "newblock";
+ } else {
+ stream.eatSpace();
+ if (stream.peek() == '(') {
+ // Check if this is a block
+ curPunc = "newmacro";
+ }
+ const withSpace = stream.current();
+ // Move the stream back before the spaces
+ stream.backUp(withSpace.length - cur.length);
+ }
+ return "keyword.control";
+ } else {
+ return null;
+ }
+ }
+ // System calls
+ if (ch == '$') {
+ stream.next();
+ if (stream.eatWhile(/[\w\$_]/)) {
+ return "meta";
+ } else {
+ return null;
+ }
+ }
+ // Time literals
+ if (ch == '#') {
+ stream.next();
+ stream.eatWhile(/[\d_.]/);
+ return "keyword.control";
+ }
+ // Event
+ if (ch == '@') {
+ stream.next();
+ stream.eatWhile(/[@]/);
+ return "keyword.control";
+ }
+ // Strings
+ if (ch == '"') {
+ stream.next();
+ state.tokenize = tokenString(ch);
+ return state.tokenize(stream, state);
+ }
+ // Comments
+ if (ch == "/") {
+ stream.next();
+ if (stream.eat("*")) {
+ state.tokenize = tokenComment;
+ return tokenComment(stream, state);
+ }
+ if (stream.eat("/")) {
+ stream.skipToEnd();
+ return "comment";
+ }
+ stream.backUp(1);
+ }
+
+ // Numeric literals
+ if (
+ stream.match(realLiteral) ||
+ stream.match(decimalLiteral) ||
+ stream.match(binaryLiteral) ||
+ stream.match(octLiteral) ||
+ stream.match(hexLiteral) ||
+ stream.match(unsignedNumber) ||
+ stream.match(realLiteral)
+ ) {
+ return "number";
+ }
+
+ // Operators
+ if (stream.eatWhile(isOperatorChar)) {
+ curPunc = stream.current();
+ return "meta";
+ }
+
+ // Keywords / plain variables
+ if (stream.eatWhile(/[\w\$_]/)) {
+ const cur = stream.current();
+ if (keywords[cur]) {
+ if (openClose[cur]) {
+ curPunc = "newblock";
+ if (cur === "fork") {
+ // Fork can be a statement instead of block in cases of:
+ // "disable fork;" and "wait fork;" (trailing semicolon)
+ stream.eatSpace();
+ if (stream.peek() == ';') {
+ curPunc = "newstatement";
+ }
+ stream.backUp(stream.current().length - cur.length);
+ }
+ }
+ if (statementKeywords[cur]) {
+ curPunc = "newstatement";
+ }
+ curKeyword = cur;
+ return "keyword";
+ }
+ return "variableName";
+ }
+
+ stream.next();
+ return null;
+ }
+
+ function tokenString(quote: string) {
+ return function (stream: any, state: VerilogState): string | null {
+ let escaped = false,
+ next,
+ end = false;
+ while ((next = stream.next()) != null) {
+ if (next == quote && !escaped) {
+ end = true;
+ break;
+ }
+ escaped = !escaped && next == "\\";
+ }
+ if (end || !(escaped || multiLineStrings)) state.tokenize = tokenBase;
+ return "string";
+ };
+ }
+
+ function tokenComment(stream: any, state: VerilogState): string | null {
+ let maybeEnd = false,
+ ch;
+ while ((ch = stream.next())) {
+ if (ch == "/" && maybeEnd) {
+ state.tokenize = tokenBase;
+ break;
+ }
+ maybeEnd = ch == "*";
+ }
+ return "comment";
+ }
+
+ function pushContext(
+ state: VerilogState,
+ col: number,
+ type: string,
+ scopekind?: string
+ ): VerilogContext {
+ const indent = state.indented;
+ const c: VerilogContext = {
+ indented: indent,
+ column: col,
+ type: type,
+ scopekind: scopekind ? scopekind : "",
+ align: null,
+ prev: state.context
+ };
+ return (state.context = c);
+ }
+
+ function popContext(state: VerilogState): VerilogContext | null {
+ const t = state.context.type;
+ if (t == ")" || t == "]" || t == "}") {
+ state.indented = state.context.indented;
+ }
+ return (state.context = state.context.prev!);
+ }
+
+ function isClosing(text: string, contextClosing: string): boolean {
+ if (text == contextClosing) {
+ return true;
+ } else {
+ // contextClosing may be multiple keywords separated by ;
+ const closingKeywords = contextClosing.split(";");
+ for (const i in closingKeywords) {
+ if (text == closingKeywords[i]) {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+
+ function isInsideScopeKind(ctx: VerilogContext | null, scopekind: string): boolean {
+ if (ctx == null) {
+ return false;
+ }
+ if (ctx.scopekind === scopekind) {
+ return true;
+ }
+ return isInsideScopeKind(ctx.prev, scopekind);
+ }
+
+ return {
+ startState(): VerilogState {
+ return {
+ tokenize: null,
+ context: {
+ indented: 0,
+ column: 0,
+ type: "top",
+ scopekind: "top",
+ align: false,
+ prev: null
+ },
+ indented: 0,
+ compilerDirectiveIndented: 0,
+ startOfLine: true
+ };
+ },
+
+ token(stream, state) {
+ let ctx = state.context;
+ if (stream.sol()) {
+ if (ctx.align == null) ctx.align = false;
+ state.indented = stream.indentation();
+ state.startOfLine = true;
+ }
+ if (stream.eatSpace()) return null;
+ curPunc = null;
+ curKeyword = null;
+ const style = (state.tokenize || tokenBase)(stream, state);
+ if (style == "comment" || style == "meta" || style == "variableName") {
+ if (
+ (curPunc === "=" || curPunc === "<=") &&
+ !isInsideScopeKind(ctx, "assignment")
+ ) {
+ // '<=' could be nonblocking assignment or lessthan-equals (which shouldn't cause indent)
+ // Search through the context to see if we are already in an assignment.
+ // '=' could be inside port declaration with comma or ')' afterward, or inside for(;;) block.
+ pushContext(state, stream.column() + curPunc.length, "assignment", "assignment");
+ if (ctx.align == null) ctx.align = true;
+ }
+ return style;
+ }
+ if (ctx.align == null) ctx.align = true;
+
+ const isClosingAssignment =
+ ctx.type == "assignment" &&
+ closingBracket.test(curPunc!) &&
+ ctx.prev &&
+ ctx.prev.type === curPunc;
+ if (curPunc == ctx.type || isClosingAssignment) {
+ if (isClosingAssignment) {
+ ctx = popContext(state)!;
+ }
+ ctx = popContext(state)!;
+ if (curPunc == ")") {
+ // Handle closing macros, assuming they could have a semicolon or begin/end block inside.
+ if (ctx && ctx.type === "macro") {
+ ctx = popContext(state)!;
+ while (ctx && (ctx.type == "statement" || ctx.type == "assignment"))
+ ctx = popContext(state)!;
+ }
+ } else if (curPunc == "}") {
+ // Handle closing statements like constraint block: "foreach () {}" which
+ // do not have semicolon at end.
+ if (ctx && ctx.type === "statement") {
+ while (ctx && ctx.type == "statement") ctx = popContext(state)!;
+ }
+ }
+ } else if (
+ ((curPunc == ";" || curPunc == ",") &&
+ (ctx.type == "statement" || ctx.type == "assignment")) ||
+ (ctx.type && isClosing(curKeyword!, ctx.type))
+ ) {
+ ctx = popContext(state)!;
+ while (ctx && (ctx.type == "statement" || ctx.type == "assignment"))
+ ctx = popContext(state)!;
+ } else if (curPunc == "{") {
+ pushContext(state, stream.column(), "}");
+ } else if (curPunc == "[") {
+ pushContext(state, stream.column(), "]");
+ } else if (curPunc == "(") {
+ pushContext(state, stream.column(), ")");
+ } else if (ctx && ctx.type == "endcase" && curPunc == ":") {
+ pushContext(state, stream.column(), "statement", "case");
+ } else if (curPunc == "newstatement") {
+ pushContext(state, stream.column(), "statement", curKeyword!);
+ } else if (curPunc == "newblock") {
+ if (
+ curKeyword == "function" &&
+ ctx &&
+ (ctx.type == "statement" || ctx.type == "endgroup")
+ ) {
+ // The 'function' keyword can appear in some other contexts where it actually does not
+ // indicate a function (import/export DPI and covergroup definitions).
+ // Do nothing in this case
+ } else if (curKeyword == "task" && ctx && ctx.type == "statement") {
+ // Same thing for task
+ } else if (curKeyword == "class" && ctx && ctx.type == "statement") {
+ // Same thing for class (e.g. typedef)
+ } else {
+ const close = openClose[curKeyword!];
+ pushContext(state, stream.column(), close!, curKeyword!);
+ }
+ } else if (
+ curPunc == "newmacro" ||
+ (curKeyword && curKeyword.match(compilerDirectiveRegex))
+ ) {
+ if (curPunc == "newmacro") {
+ // Macros (especially if they have parenthesis) potentially have a semicolon
+ // or complete statement/block inside, and should be treated as such.
+ pushContext(state, stream.column(), "macro", "macro");
+ }
+ if (curKeyword && curKeyword.match(compilerDirectiveEndRegex)) {
+ state.compilerDirectiveIndented -= statementIndentUnit;
+ }
+ if (curKeyword && curKeyword.match(compilerDirectiveBeginRegex)) {
+ state.compilerDirectiveIndented += statementIndentUnit;
+ }
+ }
+
+ state.startOfLine = false;
+ return style;
+ },
+
+ blankLine(state) {
+ // Optional: handle blank lines
+ }
+ };
+}
+
+/**
+ * Language support for Verilog
+ */
+export function verilog(): LanguageSupport {
+ return new LanguageSupport(StreamLanguage.define(createVerilogParser()));
+}
+
+/**
+ * Language support for SystemVerilog
+ */
+export function systemverilog(): LanguageSupport {
+ return new LanguageSupport(StreamLanguage.define(createVerilogParser()));
+}
diff --git a/src/parser/lang-wiz.ts b/src/parser/lang-wiz.ts
new file mode 100644
index 00000000..57a229c2
--- /dev/null
+++ b/src/parser/lang-wiz.ts
@@ -0,0 +1,168 @@
+// CodeMirror 6 language support for Wiz
+// Migrated from CodeMirror 5 mode
+// Original copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
+
+import { StreamLanguage, StreamParser } from "@codemirror/language";
+import { LanguageSupport } from "@codemirror/language";
+
+interface WizState {
+ tokenize: ((stream: any, state: WizState) => string | null) | null;
+ lastToken: string | null;
+}
+
+// TODO: Migrate to CodeMirror 6 Lezer parser.
+function createWizParser(): StreamParser {
+ function words(str: string): Set {
+ return new Set(str.split(" "));
+ }
+
+ const keywords = words("u8 u16 u24 u32 u64 i8 i16 i24 i32 i64 bool iexpr " +
+ "vardata prgdata constdata chrdata varinitdata " +
+ "do else for if switch while in import embed bank config goto return by break continue " +
+ "zero carry negative overflow decimal nointerrupt push pop nop halt stop bit cmp " +
+ "var let const namespace func inline struct union enum typealias " +
+ "sizeof as compile_if");
+
+ const types = words("u8 u16 u24 u32 u64 i8 i16 i24 i32 i64 bool iexpr");
+ const atoms = words("true false null");
+
+ const isOperatorChar = /[+\-*&%=<>!?|\/]/;
+ const isIdentifierChar = /[\w$_\xa1-\uffff]/;
+ const number = /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.[\d_]+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i;
+
+ function tokenBase(stream: any, state: WizState): string | null {
+ const ch = stream.next();
+
+ // Handle # meta directives
+ if (ch === '#') {
+ stream.eatWhile(/\S/);
+ return 'meta';
+ }
+
+ // Handle strings
+ if (ch === '"' || ch === "'") {
+ state.tokenize = tokenString(ch);
+ return state.tokenize(stream, state);
+ }
+
+ // Handle punctuation
+ if (/[\[\]{}(),;:\.]/.test(ch)) {
+ return null;
+ }
+
+ // Handle numbers
+ if (/[\d\.]/.test(ch)) {
+ stream.backUp(1);
+ if (stream.match(number)) {
+ return 'number';
+ }
+ stream.next();
+ }
+
+ // Handle comments
+ if (ch === '/') {
+ if (stream.eat('*')) {
+ state.tokenize = tokenComment;
+ return tokenComment(stream, state);
+ }
+ if (stream.eat('/')) {
+ stream.skipToEnd();
+ return 'comment';
+ }
+ }
+
+ // Handle operators
+ if (isOperatorChar.test(ch)) {
+ while (!stream.match(/^\/[\/*]/, false) && stream.eat(isOperatorChar)) { }
+ return 'operator';
+ }
+
+ // Handle identifiers and keywords
+ if (isIdentifierChar.test(ch)) {
+ stream.eatWhile(isIdentifierChar);
+ const cur = stream.current();
+
+ if (keywords.has(cur)) {
+ return 'keyword';
+ }
+ if (types.has(cur)) {
+ return 'typeName';
+ }
+ if (atoms.has(cur)) {
+ return 'atom';
+ }
+
+ // Check if this identifier is a definition (follows definition keywords)
+ const defKeywords = ['in', 'bank', 'namespace', 'func', 'struct', 'union', 'enum', 'typealias'];
+ if (state.lastToken && defKeywords.includes(state.lastToken)) {
+ return 'definition.name';
+ }
+
+ return 'variableName';
+ }
+
+ return null;
+ }
+
+ function tokenString(quote: string) {
+ return function (stream: any, state: WizState): string | null {
+ let escaped = false;
+ let next;
+ while ((next = stream.next()) != null) {
+ if (next === quote && !escaped) {
+ state.tokenize = null;
+ break;
+ }
+ escaped = !escaped && next === '\\';
+ }
+ return 'string';
+ };
+ }
+
+ function tokenComment(stream: any, state: WizState): string | null {
+ let maybeEnd = false;
+ let ch;
+ while (ch = stream.next()) {
+ if (ch === '/' && maybeEnd) {
+ state.tokenize = null;
+ break;
+ }
+ maybeEnd = (ch === '*');
+ }
+ return 'comment';
+ }
+
+ return {
+ startState(): WizState {
+ return {
+ tokenize: null,
+ lastToken: null
+ };
+ },
+
+ token(stream, state) {
+ if (stream.eatSpace()) {
+ return null;
+ }
+ const style = (state.tokenize || tokenBase)(stream, state);
+
+ // Track the last keyword token for context
+ if (style === 'keyword') {
+ state.lastToken = stream.current();
+ } else if (style && style !== 'comment') {
+ // Reset lastToken after we've used it (but keep it through comments)
+ state.lastToken = null;
+ }
+
+ return style;
+ }
+ };
+}
+
+/**
+ * Language support for Wiz
+ */
+export function wiz(): LanguageSupport {
+ return new LanguageSupport(StreamLanguage.define(createWizParser()));
+}
diff --git a/src/parser/lang-z80.grammar b/src/parser/lang-z80.grammar
new file mode 100644
index 00000000..a4c5f063
--- /dev/null
+++ b/src/parser/lang-z80.grammar
@@ -0,0 +1,166 @@
+@top Program { Line* }
+
+@skip { space | Comment }
+
+Line {
+ Label? Statement? eol
+}
+
+Statement {
+ Instruction |
+ Directive
+}
+
+Label { Identifier ":" | Identifier }
+
+Instruction {
+ Opcode Operand?
+}
+
+Directive {
+ PseudoOp (Expression)*
+}
+
+PseudoOp {
+ @specialize
+}
+
+Condition {
+ @specialize
+}
+
+Register {
+ @specialize
+}
+
+Opcode {
+ @specialize
+}
+
+Expression {
+ Expression !logic LogicOp Expression |
+ Expression !bit BitOp Expression |
+ Expression !compare (CompareOp | BinaryLt | BinaryGt) Expression |
+ Expression !term (ArithOp | Plus | Minus | Percent) Expression |
+ UnaryExpression |
+ Value |
+ "(" Expression ")"
+}
+
+UnaryExpression {
+ (Plus | Minus | Not | Tilde | UnaryLt | UnaryGt) Expression
+}
+
+BinaryLt { lt !bin }
+BinaryGt { gt !bin }
+UnaryLt { lt !un }
+UnaryGt { gt !un }
+
+Value {
+ Number |
+ Identifier |
+ Register |
+ Condition |
+ String |
+ Char
+}
+
+Operand {
+ Expression (Comma Expression)*
+}
+
+@tokens {
+ Identifier { $[a-zA-Z_] $[a-zA-Z0-9_]* }
+
+ Hex { ("0x" | "$") $[0-9a-fA-F]+ | $[0-9] $[0-9a-fA-F]* "h" }
+ Bin { "%" $[01]+ | $[01]+ "b" }
+ Oct { "0o" $[0-7]+ | $[0-7]+ "o" }
+ Dec { $[0-9]+ }
+
+ Number { Hex | Bin | Oct | Dec }
+
+ String { '"' (!["\\\n] | "\\" _)* '"' }
+
+ Char { "'" !['\\\n] "'"? }
+
+ Comment { ";" ![\n]* }
+
+ space { $[ \t]+ }
+ eol { $[\n\r]+ }
+
+ Comma { "," }
+ ":"
+ "#"
+ "(" ")"
+
+ ArithOp { "*" | "/" }
+ Percent { "%" }
+ Plus { "+" }
+ Minus { "-" }
+
+ BitOp { "&" | "|" | "^" | "<<" | ">>" }
+ Tilde { "~" }
+
+ LogicOp { "&&" | "||" }
+ Not { "!" }
+
+ CompareOp { "==" | "!=" | "<=" | ">=" }
+ lt { "<" }
+ gt { ">" }
+
+ @precedence { String, Char, Number, Percent, Identifier }
+}
+
+@precedence {
+ un,
+ term @left,
+ compare @left,
+ bit @left,
+ logic @left,
+ bin @left,
+ PseudoOp,
+ Opcode,
+ Label
+}
+
+@detectDelim
diff --git a/src/parser/lang-z80.ts b/src/parser/lang-z80.ts
new file mode 100644
index 00000000..ba1cf47c
--- /dev/null
+++ b/src/parser/lang-z80.ts
@@ -0,0 +1,44 @@
+import { LRLanguage, LanguageSupport } from "@codemirror/language"
+import { styleTags, tags as t } from "@lezer/highlight"
+import { parser } from "../../gen/parser/lang-z80.grammar.js"
+
+export const LezerZ80: LRLanguage = LRLanguage.define({
+ parser: parser.configure({
+ props: [
+ styleTags({
+ Identifier: t.variableName,
+ PseudoOp: t.definition(t.variableName),
+ Opcode: t.keyword,
+ Register: t.typeName,
+ Condition: t.className,
+ Label: t.labelName,
+ String: t.string,
+ Char: t.number,
+ Number: t.number,
+ Comment: t.lineComment,
+ ArithOp: t.arithmeticOperator,
+ Plus: t.arithmeticOperator,
+ Minus: t.arithmeticOperator,
+ Percent: t.arithmeticOperator,
+ BitOp: t.bitwiseOperator,
+ Tilde: t.bitwiseOperator,
+ LogicOp: t.logicOperator,
+ Not: t.logicOperator,
+ CompareOp: t.compareOperator,
+ BinaryLt: t.compareOperator,
+ BinaryGt: t.compareOperator,
+ UnaryLt: t.arithmeticOperator,
+ UnaryGt: t.arithmeticOperator,
+ Comma: t.separator,
+ "( )": t.paren
+ })
+ ]
+ }),
+ languageData: {
+ commentTokens: { line: ";" }
+ }
+})
+
+export function asmZ80(): LanguageSupport {
+ return new LanguageSupport(LezerZ80)
+}
diff --git a/src/themes/cobalt.ts b/src/themes/cobalt.ts
new file mode 100644
index 00000000..134247db
--- /dev/null
+++ b/src/themes/cobalt.ts
@@ -0,0 +1,56 @@
+import { EditorView } from "@codemirror/view"
+import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"
+import { tags as t } from "@lezer/highlight"
+
+const cobaltTheme = EditorView.theme({
+ "&": {
+ color: "white",
+ backgroundColor: "#002240"
+ },
+ ".cm-content": {
+ caretColor: "white"
+ },
+ "&.cm-focused .cm-cursor": {
+ borderLeft: "1px solid white"
+ },
+ "&.cm-focused .cm-selectionBackground, .cm-selectionBackground, ::selection": {
+ backgroundColor: "#f77b35 !important"
+ },
+ ".cm-gutters": {
+ backgroundColor: "#002240",
+ color: "#d0d0d0",
+ borderRight: "1px solid #aaa"
+ },
+ ".cm-activeLine": {
+ backgroundColor: "#0055ff88"
+ },
+ ".cm-activeLineGutter": {
+ backgroundColor: "#0055ff88",
+ color: "#ffee80"
+ },
+ "&.cm-focused .cm-matchingBracket": {
+ outline: "1px solid grey",
+ color: "white !important",
+ backgroundColor: "transparent"
+ },
+}, { dark: true });
+
+const cobaltHighlightStyle = HighlightStyle.define([
+ { tag: t.comment, color: "#ccc" },
+ { tag: t.atom, color: "#845dc4 " },
+ { tag: [t.number, t.attributeName, t.className, t.constant(t.name)], color: "#ff80e1" },
+ { tag: t.keyword, color: "#ffee80" },
+ { tag: t.string, color: "#3ad900" },
+ { tag: t.meta, color: "#ff9d00" },
+ { tag: [t.tagName, t.variableName, t.modifier, t.labelName, t.namespace], color: "#9effff" },
+ { tag: [t.definition(t.variableName), t.typeName, t.className, t.namespace, t.definition(t.propertyName)], color: "white" },
+ { tag: t.bracket, color: "#d8d8d8" },
+ { tag: [t.standard(t.name), t.special(t.string), t.special(t.variableName)], color: "#ff9e59" },
+ { tag: t.link, color: "#845dc4" },
+ { tag: t.invalid, color: "#9d1e15" },
+]);
+
+export const cobalt = [
+ cobaltTheme,
+ syntaxHighlighting(cobaltHighlightStyle),
+];
\ No newline at end of file
diff --git a/src/themes/disassemblyTheme.ts b/src/themes/disassemblyTheme.ts
new file mode 100644
index 00000000..d06f3f86
--- /dev/null
+++ b/src/themes/disassemblyTheme.ts
@@ -0,0 +1,7 @@
+import { EditorView } from "@codemirror/view";
+
+export const disassemblyTheme = EditorView.theme({
+ "&": {
+ maxHeight: "100%"
+ },
+});
diff --git a/src/themes/editorTheme.ts b/src/themes/editorTheme.ts
new file mode 100644
index 00000000..11670b7a
--- /dev/null
+++ b/src/themes/editorTheme.ts
@@ -0,0 +1,37 @@
+import { EditorView } from "@codemirror/view";
+
+export const editorTheme = EditorView.theme({
+ "&": {
+ height: "100%",
+ },
+ ".cm-currentpc": {
+ backgroundColor: "#7e2a70 !important",
+ },
+ ".currentpc-span-blocked": {
+ backgroundColor: "#7e2a70 !important",
+ },
+ ".currentpc-marker-blocked": {
+ color: "#ffee33",
+ },
+ ".highlight-lines": {
+ backgroundColor: "#003399 !important",
+ },
+ ".gutter-offset": {
+ marginRight: "0.25em",
+ },
+ ".gutter-bytes": {
+ marginLeft: "0.25em",
+ marginRight: "0.25em",
+ opacity: 0.7,
+ },
+ ".gutter-currentpc": {
+ color: "#ff66ee",
+ },
+ ".gutter-clock": {
+ marginLeft: "0.25em",
+ marginRight: "0.25em",
+ },
+ "& .cm-lineNumbers .cm-gutterElement": {
+ color: "#99cc99",
+ },
+});
\ No newline at end of file
diff --git a/src/themes/mbo.ts b/src/themes/mbo.ts
new file mode 100644
index 00000000..b6ff0828
--- /dev/null
+++ b/src/themes/mbo.ts
@@ -0,0 +1,63 @@
+import { EditorView } from "@codemirror/view"
+import { HighlightStyle, syntaxHighlighting } from "@codemirror/language"
+import { tags as t } from "@lezer/highlight"
+
+export const mboTheme = EditorView.theme({
+ "&": {
+ backgroundColor: "#2c2c2c",
+ color: "#ffffec"
+ },
+ ".cm-content": {
+ caretColor: "#ffffec"
+ },
+ "&.cm-focused .cm-cursor": {
+ borderLeft: "1px solid #ffffec"
+ },
+ "&.cm-focused .cm-selectionBackground, .cm-selectionBackground, ::selection": {
+ backgroundColor: "rgba(113, 108, 98, .99) !important"
+ },
+ ".cm-gutters": {
+ backgroundColor: "#4e4e4e",
+ color: "#dadada",
+ borderRight: "none"
+ },
+ ".cm-activeLine": {
+ backgroundColor: "#494b4155"
+ },
+ ".cm-activeLineGutter": {
+ backgroundColor: "#494b4155"
+ },
+ "&.cm-focused .cm-gutterElement.cm-activeLineGutter": {
+ color: "#33ff33"
+ },
+ ".cm-linenumber": {
+ color: "#dadada"
+ },
+ ".cm-matchingBracket": {
+ color: "#33ff33 !important"
+ }
+}, { dark: true });
+
+export const mboHighlightStyle = HighlightStyle.define([
+ { tag: t.keyword, color: "#ffb928" },
+ { tag: [t.name, t.standard(t.name)], color: "#ffffec" },
+ { tag: t.variableName, color: "#9ddfe9" },
+ { tag: [t.deleted, t.macroName], color: "#00a8c6" }, // maps to cm-variable-2
+ { tag: [t.processingInstruction, t.string, t.inserted], color: "#b4fdb7" }, // Updated string color
+ { tag: t.number, color: "#33aadd" }, // Updated number color
+ { tag: [t.atom, t.bool, t.special(t.variableName)], color: "#00a8c6" },
+ { tag: t.definition(t.variableName), color: "#ffb928" },
+ { tag: [t.propertyName, t.attributeName, t.tagName], color: "#9ddfe9" },
+ { tag: t.definition(t.name), color: "#88eeff" }, // maps to cm-def
+ { tag: t.typeName, color: "#ffb928" }, // maps to cm-variable-3
+ { tag: t.bracket, color: "#fffffc", fontWeight: "bold" },
+ { tag: t.comment, color: "#95958a" },
+ { tag: t.link, color: "#f54b07" },
+ { tag: t.meta, color: "#aaddaa" },
+ { tag: t.invalid, color: "#ffffec", borderBottom: "1px solid #636363" },
+]);
+
+export const mbo = [
+ mboTheme,
+ syntaxHighlighting(mboHighlightStyle),
+];
\ No newline at end of file
diff --git a/test/parsers/testparser6502.js b/test/parsers/testparser6502.js
new file mode 100644
index 00000000..7513b416
--- /dev/null
+++ b/test/parsers/testparser6502.js
@@ -0,0 +1,40 @@
+
+const assert = require('assert');
+const { EditorState } = require("@codemirror/state");
+const { syntaxTree } = require("@codemirror/language");
+const { asm6502 } = require("../../gen/parser/lang-6502.js");
+
+
+describe('6502 Parser', function () {
+
+ it('Should parse basic instructions', function () {
+ const code = `
+ lda #$00
+ sta $1234
+ rts
+ `;
+
+ // Create an editor state with the new parser
+ const state = EditorState.create({
+ doc: code,
+ extensions: [asm6502()]
+ });
+
+ // Check if the tree is available (basic check that parser didn't crash)
+ // In a real environment we might traverse the tree to check specific nodes
+ // but here we just want to ensure it instantiates and runs without throwing.
+ assert.ok(syntaxTree(state), "Syntax tree should be generated");
+ });
+
+ it('Should handle labels', function () {
+ const code = `
+ start:
+ jmp start
+ `;
+ const state = EditorState.create({
+ doc: code,
+ extensions: [asm6502()]
+ });
+ assert.ok(syntaxTree(state), "Syntax tree should be generated");
+ });
+});
diff --git a/test/parsers/testparserz80.js b/test/parsers/testparserz80.js
new file mode 100644
index 00000000..08cd51a9
--- /dev/null
+++ b/test/parsers/testparserz80.js
@@ -0,0 +1,51 @@
+const assert = require('assert');
+const { EditorState } = require("@codemirror/state");
+const { syntaxTree } = require("@codemirror/language");
+const { asmZ80 } = require("../../gen/parser/lang-z80.js");
+
+describe('Z80 Parser', function () {
+
+ it('Should parse basic instructions', function () {
+ const code = `
+ ld a, 0
+ ld hl, $1234
+ ret
+ `;
+
+ // Create an editor state with the new parser
+ const state = EditorState.create({
+ doc: code,
+ extensions: [asmZ80()]
+ });
+
+ // Check if the tree is available (basic check that parser didn't crash)
+ assert.ok(syntaxTree(state), "Syntax tree should be generated");
+ });
+
+ it('Should handle labels', function () {
+ const code = `
+ start:
+ jp start
+ `;
+ const state = EditorState.create({
+ doc: code,
+ extensions: [asmZ80()]
+ });
+ assert.ok(syntaxTree(state), "Syntax tree should be generated");
+ });
+
+ it('Should handle 8080 instructions', function () {
+ const code = `
+ mvi a, 0
+ lxi h, $1234
+ mov a, b
+ inx h
+ jmp start
+ `;
+ const state = EditorState.create({
+ doc: code,
+ extensions: [asmZ80()]
+ });
+ assert.ok(syntaxTree(state), "Syntax tree should be generated");
+ });
+});