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

tweak autocomplete helper

Browse Source 
* use the faster getStyleAtPos
* autocomplete !important on typing !
* don't autocomplete hex colors
This commit is contained in:
tophf 2018-01-14 16:16:31 +03:00
parent eaed0de486
commit 3c15521fc2
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
edit/codemirror-default.js
View File

@ -226,34 +226,45 @@ CodeMirror.hint && (() => {
const USO_VAR = 'uso-variable'; const USO_VAR = 'uso-variable';
const USO_VALID_VAR = 'variable-3 ' + USO_VAR; const USO_VALID_VAR = 'variable-3 ' + USO_VAR;
const USO_INVALID_VAR = 'error ' + USO_VAR; const USO_INVALID_VAR = 'error ' + USO_VAR;
const RX_IMPORTANT = /(i(m(p(o(r(t(a(nt?)?)?)?)?)?)?)?)?(?=\b|\W|$)/iyu;
const originalHelper = CodeMirror.hint.css || (() => {}); const originalHelper = CodeMirror.hint.css || (() => {});
CodeMirror.registerHelper('hint', 'css', function (cm) { CodeMirror.registerHelper('hint', 'css', function (cm) {
const {line, ch} = cm.getCursor(); const pos = cm.getCursor();
const {line, ch} = pos;
const {styles, text} = cm.getLineHandle(line); const {styles, text} = cm.getLineHandle(line);
if (!styles || !editor) { if (!styles) return originalHelper(cm);
const {style, index} = cm.getStyleAtPos({styles, pos: ch}) || {};
if (style && (style.startsWith('comment') || style.startsWith('string'))) {
return originalHelper(cm); return originalHelper(cm);
} }
let prev = 0; if (text[ch - 1] === '!' && /i|\W|^$/iu.test(text[ch] || '')) {
for (let i = 1; i < styles.length; i += 2) { RX_IMPORTANT.lastIndex = ch;
let end = styles[i]; return {
if (prev <= ch && ch <= end && list: ['important'],
(styles[i + 1] || '').includes(USO_VAR)) { from: pos,
const adjust = text[prev] === '/' ? 4 : 0; to: {line, ch: ch + RX_IMPORTANT.exec(text)[0].length},
prev += adjust; };
end -= adjust;
const leftPart = text.slice(prev, ch);
const list = Object.keys(editor.getStyle().usercssData.vars)
.filter(name => name.startsWith(leftPart));
return {
list,
from: {line, ch: prev},
to: {line, ch: end},
};
}
prev = end;
} }
return originalHelper(cm); let prev = index > 2 ? styles[index - 2] : 0;
let end = styles[index];
if (text[prev] === '#') {
return {list: [], from: pos, to: pos};
}
if (!editor || !style || !style.includes(USO_VAR)) {
return originalHelper(cm);
}
const adjust = text[prev] === '/' ? 4 : 0;
prev += adjust;
end -= adjust;
const leftPart = text.slice(prev, ch);
const list = Object.keys(editor.getStyle().usercssData.vars)
.filter(name => name.startsWith(leftPart));
return {
list,
from: {line, ch: prev},
to: {line, ch: end},
};
}); });
const hooks = CodeMirror.mimeModes['text/css'].tokenHooks; const hooks = CodeMirror.mimeModes['text/css'].tokenHooks;