793dc20722
* linter and compact layout improvements Closes #748 While investigating the best way to fix linter scrolling, when I double-checked the compact layout, an old bug I meant to fix a long time ago was immediately apparent. Basically, the linter adds/removes errors as you type, causing the editor to bounce up and down, making it practically unusable. This PR fixes scrolling, and also collapses options and the linter in the compact layout, but always shows the collapsed linter so you're aware of the error count without the content jumping. It also collapses options in the non-compact layout if the viewport is too short to accommodate them, factoring in the min-height of the linter. All automatic collapsing factors in whether a linter is active so they can adjust accordingly, and disables the setting of collapsed state prefs, since we're deciding the pref anyway, and this allows for re-expanding on resize based on the previous pref. It's quite possible I failed to account for certain scenarios, so try to break it. Also think it's problematic for the linter to not always be visible if enabled, so I hooked up a 40px fixed header on scroll with just the linter in it for the compact layout. A few other little details are included. I removed redundant line and column numbers spelled out at the end of lint messages to prevent horizontal overflow. I noticed that the expand/collapse prefs do not toggle correctly when clicking directly on the details-marker arrow. Simplest solution was covering them with the `h2` (we may wanna hook up the manager as well). Also, unrelated, but I switched to opacity to hide resizing sectioned editors, because `visibility: hidden;` breaks editor auto-focus. If either of you guys wanna fix any bugs, or improve any code, feel free to just commit to this PR directly. * linter and compact layout improvements * linter and compact layout improvements * No usercss scroll listener and delay header check * Some code tweaks
162 lines
4.2 KiB
JavaScript
162 lines
4.2 KiB
JavaScript
/* global linter editor clipString createLinterHelpDialog $ $create */
|
|
'use strict';
|
|
|
|
Object.assign(linter, (() => {
|
|
const tables = new Map();
|
|
const helpDialog = createLinterHelpDialog(getIssues);
|
|
|
|
document.addEventListener('DOMContentLoaded', () => {
|
|
$('#lint-help').addEventListener('click', helpDialog.show);
|
|
}, {once: true});
|
|
|
|
linter.onLintingUpdated((annotationsNotSorted, annotations, cm) => {
|
|
let table = tables.get(cm);
|
|
if (!table) {
|
|
table = createTable(cm);
|
|
tables.set(cm, table);
|
|
const container = $('.lint-report-container');
|
|
const nextSibling = findNextSibling(tables, cm);
|
|
container.insertBefore(table.element, nextSibling && tables.get(nextSibling).element);
|
|
}
|
|
table.updateCaption();
|
|
table.updateAnnotations(annotations);
|
|
updateCount();
|
|
});
|
|
|
|
linter.onUnhook(cm => {
|
|
const table = tables.get(cm);
|
|
if (table) {
|
|
table.element.remove();
|
|
tables.delete(cm);
|
|
}
|
|
updateCount();
|
|
});
|
|
|
|
return {refreshReport};
|
|
|
|
function updateCount() {
|
|
const issueCount = Array.from(tables.values())
|
|
.reduce((sum, table) => sum + table.trs.length, 0);
|
|
$('#lint').classList.toggle('hidden-unless-compact', issueCount === 0);
|
|
$('#issue-count').textContent = issueCount;
|
|
}
|
|
|
|
function getIssues() {
|
|
const issues = new Set();
|
|
for (const table of tables.values()) {
|
|
for (const tr of table.trs) {
|
|
issues.add(tr.getAnnotation());
|
|
}
|
|
}
|
|
return issues;
|
|
}
|
|
|
|
function findNextSibling(tables, cm) {
|
|
const editors = editor.getEditors();
|
|
let i = editors.indexOf(cm) + 1;
|
|
while (i < editors.length) {
|
|
if (tables.has(editors[i])) {
|
|
return editors[i];
|
|
}
|
|
i++;
|
|
}
|
|
}
|
|
|
|
function refreshReport() {
|
|
for (const table of tables.values()) {
|
|
table.updateCaption();
|
|
}
|
|
}
|
|
|
|
function createTable(cm) {
|
|
const caption = $create('caption');
|
|
const tbody = $create('tbody');
|
|
const table = $create('table', [caption, tbody]);
|
|
const trs = [];
|
|
return {
|
|
element: table,
|
|
trs,
|
|
updateAnnotations,
|
|
updateCaption
|
|
};
|
|
|
|
function updateCaption() {
|
|
caption.textContent = editor.getEditorTitle(cm);
|
|
}
|
|
|
|
function updateAnnotations(lines) {
|
|
let i = 0;
|
|
for (const anno of getAnnotations()) {
|
|
let tr;
|
|
if (i < trs.length) {
|
|
tr = trs[i];
|
|
} else {
|
|
tr = createTr();
|
|
trs.push(tr);
|
|
tbody.append(tr.element);
|
|
}
|
|
tr.update(anno);
|
|
i++;
|
|
}
|
|
if (i === 0) {
|
|
trs.length = 0;
|
|
tbody.textContent = '';
|
|
} else {
|
|
while (trs.length > i) {
|
|
trs.pop().element.remove();
|
|
}
|
|
}
|
|
table.classList.toggle('empty', trs.length === 0);
|
|
|
|
function *getAnnotations() {
|
|
for (const line of lines.filter(Boolean)) {
|
|
yield *line;
|
|
}
|
|
}
|
|
}
|
|
|
|
function createTr() {
|
|
let anno;
|
|
const severityIcon = $create('div');
|
|
const severity = $create('td', {attributes: {role: 'severity'}}, severityIcon);
|
|
const line = $create('td', {attributes: {role: 'line'}});
|
|
const col = $create('td', {attributes: {role: 'col'}});
|
|
const message = $create('td', {attributes: {role: 'message'}});
|
|
|
|
const trElement = $create('tr', {
|
|
onclick: () => gotoLintIssue(cm, anno)
|
|
}, [
|
|
severity,
|
|
line,
|
|
$create('td', {attributes: {role: 'sep'}}, ':'),
|
|
col,
|
|
message
|
|
]);
|
|
return {
|
|
element: trElement,
|
|
update,
|
|
getAnnotation: () => anno
|
|
};
|
|
|
|
function update(_anno) {
|
|
anno = _anno;
|
|
trElement.className = anno.severity;
|
|
severity.dataset.rule = anno.rule;
|
|
severityIcon.className = `CodeMirror-lint-marker-${anno.severity}`;
|
|
severityIcon.textContent = anno.severity;
|
|
line.textContent = anno.from.line + 1;
|
|
col.textContent = anno.from.ch + 1;
|
|
message.title = clipString(anno.message, 1000) +
|
|
(anno.rule ? `\n(${anno.rule})` : '');
|
|
message.textContent = clipString(anno.message, 100).replace(/ at line.*/, '');
|
|
}
|
|
}
|
|
}
|
|
|
|
function gotoLintIssue(cm, anno) {
|
|
editor.scrollToEditor(cm);
|
|
cm.focus();
|
|
cm.setSelection(anno.from);
|
|
}
|
|
})());
|