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

fixup: assuming 90% of variables are colors

Browse Source
This commit is contained in:
tophf 2021-03-14 08:32:14 +03:00
parent 36e70c91c3
commit c7ef0d02c1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
edit/autocomplete.js
View File

@ -12,6 +12,7 @@
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 rxPROP = /^(prop(erty)?|variable-2)\b/;
const rxVAR = /(^|[^-.\w\u0080-\uFFFF])var\(/iyu; const rxVAR = /(^|[^-.\w\u0080-\uFFFF])var\(/iyu;
const rxCONSUME = /([-\w]*\s*:\s?)?/yu; const rxCONSUME = /([-\w]*\s*:\s?)?/yu;
const cssMime = CodeMirror.mimeModes['text/css']; const cssMime = CodeMirror.mimeModes['text/css'];
@ -134,11 +135,11 @@
default: default:
// property values // property values
if (isStylusLang || getTokenState() === 'prop') { if (isStylusLang || getTokenState() === 'prop') {
while (i > 0 && !/^prop(erty)?\b/.test(styles[i + 1])) i -= 2; while (i > 0 && !rxPROP.test(styles[i + 1])) i -= 2;
const propEnd = styles[i]; const propEnd = styles[i];
let prop; let prop;
if (propEnd > text.lastIndexOf(';', ch - 1)) { if (propEnd > text.lastIndexOf(';', ch - 1)) {
while (i > 0 && /^prop(erty)?\b/.test(styles[i + 1])) i -= 2; while (i > 0 && rxPROP.test(styles[i + 1])) i -= 2;
prop = text.slice(styles[i] || 0, propEnd).match(/([-\w]+)?$/u)[1]; prop = text.slice(styles[i] || 0, propEnd).match(/([-\w]+)?$/u)[1];
} }
if (prop) { if (prop) {
@ -146,6 +147,7 @@
prev += execAt(/[\s:()]*/y, prev, text)[0].length; prev += execAt(/[\s:()]*/y, prev, text)[0].length;
leftLC = leftLC.replace(/^[^\w\s]\s*/, ''); leftLC = leftLC.replace(/^[^\w\s]\s*/, '');
} }
if (prop.startsWith('--')) prop = 'color'; // assuming 90% of variables are colors
if (!cssPropsValues) cssPropsValues = await linterMan.worker.getCssPropsValues(); if (!cssPropsValues) cssPropsValues = await linterMan.worker.getCssPropsValues();
list = [...new Set([...cssPropsValues[prop] || [], ...cssGlobalValues])]; list = [...new Set([...cssPropsValues[prop] || [], ...cssGlobalValues])];
end = prev + execAt(/(\s*[-a-z(]+)?/y, prev, text)[0].length; end = prev + execAt(/(\s*[-a-z(]+)?/y, prev, text)[0].length;