6502
/
8bitworkshop
mirror of https://github.com/sehugg/8bitworkshop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

if error line position is available, underline

This commit is contained in:
Steven Hugg 2020-08-20 11:41:58 -05:00
parent 74238b334f
commit eb7b665536
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
css/ui.css
View File

@ -28,6 +28,9 @@
.currentpc-marker-blocked {
color: #ffee33;
}
.mark-error {
text-decoration: underline wavy 1px #ff6666;
}
.tooltipbox {
position: relative;
display: inline-block;

3
src/common/basic/compiler.ts
View File

@ -353,7 +353,8 @@ export class BASICParser {
this.scopestack = [];
}
addError(msg: string, loc?: SourceLocation) {
if (!loc) loc = this.peekToken().$loc;
var tok = this.lasttoken || this.peekToken();
if (!loc) loc = tok.$loc;
this.errors.push({path:loc.path, line:loc.line, label:this.curlabel, start:loc.start, end:loc.end, msg:msg});
}
compileError(msg: string, loc?: SourceLocation) {

30
src/ide/views.ts
View File

@ -92,6 +92,7 @@ export class SourceEditor implements ProjectView {
markCurrentPC; // TextMarker
errormsgs = [];
errorwidgets = [];
errormarks = [];
inspectWidget;
createDiv(parent:HTMLElement) {
@ -210,6 +211,23 @@ export class SourceEditor implements ProjectView {
getPath() : string { return this.path; }
addError(info: WorkerError) {
// only mark errors with this filename, or without any filename
if (!info.path || this.path.endsWith(info.path)) {
var numLines = this.editor.lineCount();
var line = info.line-1;
if (line < 0 || line >= 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);
}
}
}
addErrorMarker(line:number, msg:string) {
var div = document.createElement("div");
div.setAttribute("class", "tooltipbox tooltiperror");
@ -237,15 +255,9 @@ export class SourceEditor implements ProjectView {
markErrors(errors:WorkerError[]) {
// TODO: move cursor to error line if offscreen?
this.clearErrors();
var numLines = this.editor.lineCount();
errors = errors.slice(0, MAX_ERRORS);
for (var info of errors) {
// only mark errors with this filename, or without any filename
if (!info.path || this.path.endsWith(info.path)) {
var line = info.line-1;
if (line < 0 || line >= numLines) line = 0;
this.addErrorMarker(line, info.msg);
}
this.addError(info);
}
}
@ -255,8 +267,8 @@ export class SourceEditor implements ProjectView {
this.dirtylisting = true;
// clear line widgets
this.errormsgs = [];
while (this.errorwidgets.length)
this.errorwidgets.shift().clear();
while (this.errorwidgets.length) this.errorwidgets.shift().clear();
while (this.errormarks.length) this.errormarks.shift().clear();
}
getSourceFile() : SourceFile { return this.sourcefile; }