mirror of
https://github.com/sehugg/8bitworkshop.git
synced 2026-10-27 14:10:38 +00:00
rename line to startline
This commit is contained in:
1 parent
546dd1a460
commit
6aa45a5bf6
1 file changed
+6
-6
@@ -159,22 +159,22 @@ export class AssetEditorView implements ProjectView, pixed.EditorContext {
|
||||
end = data.indexOf(';', start); // C
|
||||
}
|
||||
//console.log(id, start, end, m[1], data.substring(start,end));
|
||||
var line = getLineNumber(data, m.index);
|
||||
var startline = getLineNumber(data, m.index);
|
||||
var header = m[0];
|
||||
var endline = end >= 0 ? getLineNumber(data, end) : '???';
|
||||
if (end < 0) {
|
||||
var closingDelim = platform_id.includes('verilog') ? '"end"' : m[0].startsWith(';;') ? '";;"' : '";"';
|
||||
result.push({ fileid: id, header: header, line: line, endline: endline, error: `No closing ${closingDelim} found after asset header` });
|
||||
result.push({ fileid: id, header: header, startline: startline, endline: endline, error: `No closing ${closingDelim} found after asset header` });
|
||||
} else if (end <= start) {
|
||||
result.push({ fileid: id, header: header, line: line, endline: endline, error: `Empty data block after asset header` });
|
||||
result.push({ fileid: id, header: header, startline: startline, endline: endline, error: `Empty data block after asset header` });
|
||||
} else {
|
||||
try {
|
||||
var jsontxt = m[1].replace(/([A-Za-z]+):/g, '"$1":'); // fix lenient JSON
|
||||
var json = JSON.parse(jsontxt);
|
||||
// TODO: name?
|
||||
result.push({ fileid: id, header: header, line: line, endline: endline, fmt: json, start: start, end: end });
|
||||
result.push({ fileid: id, header: header, startline: startline, endline: endline, fmt: json, start: start, end: end });
|
||||
} catch (e) {
|
||||
result.push({ fileid: id, header: header, line: line, endline: endline, error: `Invalid asset format: ${e.message}` });
|
||||
result.push({ fileid: id, header: header, startline: startline, endline: endline, error: `Invalid asset format: ${e.message}` });
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -328,7 +328,7 @@ export class AssetEditorView implements ProjectView, pixed.EditorContext {
|
||||
const block = $('<div class="asset_block"/>').appendTo(this.ensureFileDiv(fileid));
|
||||
var snip = $('<div class="asset_snip"/>').appendTo(block);
|
||||
var linenos = $('<span class="asset_linenos"/>').appendTo(snip);
|
||||
$('<span class="asset_lineno"/>').text(frag.line).appendTo(linenos);
|
||||
$('<span class="asset_lineno"/>').text(frag.startline).appendTo(linenos);
|
||||
linenos.append('-');
|
||||
$('<span class="asset_lineno"/>').text(frag.endline).appendTo(linenos);
|
||||
snip.append(' ' + frag.header);
|
||||
|
||||
Reference in new issue
Block a user