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

lint issues list: show rule name only on hover

Browse Source
This commit is contained in:
tophf 2017-08-28 15:07:30 +03:00
parent 37bff1c5c9
commit dd6182aef3
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
edit/lint.js
View File

@ -188,18 +188,18 @@ function updateLintReport(cm, delay) {
const info = mark.__annotation; const info = mark.__annotation;
const isActiveLine = info.from.line === cm.getCursor().line; const isActiveLine = info.from.line === cm.getCursor().line;
const pos = isActiveLine ? 'cursor' : (info.from.line + ',' + info.from.ch); const pos = isActiveLine ? 'cursor' : (info.from.line + ',' + info.from.ch);
// stylelint rule added in parentheses at the end; extract it out for the stylelint info popup // rule name added in parentheses at the end; extract it out for the info popup
const lintRuleName = info.message const text = info.message;
.substring(info.message.lastIndexOf('('), info.message.length) const parenPos = text.endsWith(')') ? text.lastIndexOf('(') : text.length;
.replace(/[()]/g, ''); const ruleName = text.slice(parenPos + 1, -1);
const title = escapeHtml(info.message); const title = escapeHtml(text);
const message = title.length > 100 ? title.substr(0, 100) + '...' : title; const message = escapeHtml(text.substr(0, Math.min(100, parenPos)), {limit: 100});
if (isActiveLine || oldMarkers[pos] === message) { if (isActiveLine || oldMarkers[pos] === message) {
delete oldMarkers[pos]; delete oldMarkers[pos];
} }
newMarkers[pos] = message; newMarkers[pos] = message;
return `<tr class="${info.severity}"> return `<tr class="${info.severity}">
<td role="severity" data-rule="${lintRuleName}"> <td role="severity" data-rule="${ruleName}">
<div class="CodeMirror-lint-marker-${info.severity}">${info.severity}</div> <div class="CodeMirror-lint-marker-${info.severity}">${info.severity}</div>
</td> </td>
<td role="line">${info.from.line + 1}</td> <td role="line">${info.from.line + 1}</td>
@ -226,9 +226,14 @@ function updateLintReport(cm, delay) {
} }
} }
} }
function escapeHtml(html) { function escapeHtml(html, {limit} = {}) {
const chars = {'&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;', '/': '&#x2F;'}; const chars = {'&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;', '/': '&#x2F;'};
return html.replace(/[&<>"'/]/g, char => chars[char]); let ellipsis = '';
if (limit && html.length > limit) {
html = html.substr(0, limit);
ellipsis = '...';
}
return html.replace(/[&<>"'/]/g, char => chars[char]) + ellipsis;
} }
} }