open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: try to get error message

Browse Source
This commit is contained in:
eight 2018-09-25 21:55:55 +08:00
parent 3d32b0428b
commit 3c30bc3eb0
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
edit/codemirror-editing-hooks.js
View File

@ -689,13 +689,17 @@ onDOMscriptReady('/codemirror.js').then(() => {
}).then(() => { }).then(() => {
errors.classList.add('hidden'); errors.classList.add('hidden');
}).catch(err => { }).catch(err => {
if (Array.isArray(err)) err = err.join('\n'); let message;
if (err && editor && !isNaN(err.index)) { if (Array.isArray(err)) {
message = err.join('\n');
} else if (err && editor && !isNaN(err.index)) {
const pos = editors[0].posFromIndex(err.index); const pos = editors[0].posFromIndex(err.index);
err = `${pos.line}:${pos.ch} ${err}`; message = `${pos.line}:${pos.ch} ${err.message || String(err)}`;
} else {
message = err.message || String(err);
} }
errors.classList.remove('hidden'); errors.classList.remove('hidden');
errors.onclick = () => messageBox.alert(String(err), 'pre'); errors.onclick = () => messageBox.alert(message, 'pre');
}); });
} }
}); });

2
edit/source-editor.js
View File

@ -224,7 +224,7 @@ function createSourceEditor(style) {
} }
const contents = Array.isArray(err) ? const contents = Array.isArray(err) ?
$create('pre', err.join('\n')) : $create('pre', err.join('\n')) :
[String(err)]; [err.message || String(err)];
if (Number.isInteger(err.index)) { if (Number.isInteger(err.index)) {
const pos = cm.posFromIndex(err.index); const pos = cm.posFromIndex(err.index);
contents[0] += ` (line ${pos.line + 1} col ${pos.ch + 1})`; contents[0] += ` (line ${pos.line + 1} col ${pos.ch + 1})`;