diff --git a/src/ide/views/asseteditor.ts b/src/ide/views/asseteditor.ts index 5a4fc7a4..1b98db47 100644 --- a/src/ide/views/asseteditor.ts +++ b/src/ide/views/asseteditor.ts @@ -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 = $('
').appendTo(this.ensureFileDiv(fileid)); var snip = $('
').appendTo(block); var linenos = $('').appendTo(snip); - $('').text(frag.line).appendTo(linenos); + $('').text(frag.startline).appendTo(linenos); linenos.append('-'); $('').text(frag.endline).appendTo(linenos); snip.append(' ' + frag.header);