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

fixup 80547aef: autocomplete should fallback to original helper

Browse Source
This commit is contained in:
tophf 2017-11-25 04:29:56 +03:00
parent 2dda22f700
commit 3ed98cb506
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
edit/codemirror-default.js
View File

@ -133,16 +133,18 @@
}); });
})(); })();
(() => { // eslint-disable-next-line no-unused-expressions
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 originalHelper = CodeMirror.hint.css || (() => {});
CodeMirror.registerHelper('hint', 'css', function (cm) { CodeMirror.registerHelper('hint', 'css', function (cm) {
const {line, ch} = cm.getCursor(); const {line, ch} = cm.getCursor();
const {styles, text} = cm.getLineHandle(line); const {styles, text} = cm.getLineHandle(line);
if (!styles || !editor) { if (!styles || !editor) {
return; return originalHelper(cm);
} }
let prev = 0; let prev = 0;
for (let i = 1; i < styles.length; i += 2) { for (let i = 1; i < styles.length; i += 2) {
@ -155,7 +157,6 @@
const leftPart = text.slice(prev, ch); const leftPart = text.slice(prev, ch);
const list = Object.keys(editor.getStyle().usercssData.vars) const list = Object.keys(editor.getStyle().usercssData.vars)
.filter(name => name.startsWith(leftPart)); .filter(name => name.startsWith(leftPart));
console.log(leftPart, ...list);
return { return {
list, list,
from: {line, ch: prev}, from: {line, ch: prev},
@ -164,6 +165,7 @@
} }
prev = end; prev = end;
} }
return originalHelper(cm);
}); });
const hooks = CodeMirror.mimeModes['text/css'].tokenHooks; const hooks = CodeMirror.mimeModes['text/css'].tokenHooks;