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

parserlib: accept uso-var as ident/string

Browse Source
This commit is contained in:
tophf 2021-08-24 14:38:19 +03:00
parent b0ed85c5ea
commit 12764baacb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/csslint/parserlib.js
View File

@ -1341,6 +1341,7 @@ self.parserlib = (() => {
identString: [ identString: [
Tokens.IDENT, Tokens.IDENT,
Tokens.STRING, Tokens.STRING,
Tokens.USO_VAR,
], ],
LParenBracket: [ LParenBracket: [
Tokens.LPAREN, Tokens.LPAREN,
@ -1395,6 +1396,7 @@ self.parserlib = (() => {
stringUri: [ stringUri: [
Tokens.STRING, Tokens.STRING,
Tokens.URI, Tokens.URI,
Tokens.USO_VAR,
], ],
term: [ term: [
Tokens.NUMBER, Tokens.NUMBER,
@ -2636,7 +2638,7 @@ self.parserlib = (() => {
/** /**
* @param {Number|Number[]} tokenTypes * @param {Number|Number[]} tokenTypes
* @param {Boolean} [skipCruftBefore=true] - skip comments/uso-vars/whitespace before matching * @param {Boolean} [skipCruftBefore=true] - skip comments/whitespace before matching
* @returns {Object} token * @returns {Object} token
*/ */
mustMatch(tokenTypes, skipCruftBefore = true) { mustMatch(tokenTypes, skipCruftBefore = true) {
@ -2648,16 +2650,17 @@ self.parserlib = (() => {
/** /**
* @param {Boolean} [skipWS] - skip whitespace too * @param {Boolean} [skipWS] - skip whitespace too
* @param {Boolean} [skipUsoVar] - skip USO_VAR too
*/ */
skipComment(skipWS) { skipComment(skipWS, skipUsoVar) {
const tt = this.LT(1, true).type; const tt = this.LT(1, true).type;
if (skipWS && tt === Tokens.S || if (skipWS && tt === Tokens.S ||
tt === Tokens.USO_VAR || skipUsoVar && tt === Tokens.USO_VAR ||
tt === Tokens.COMMENT || tt === Tokens.COMMENT ||
tt == null && this._ltIndex === this._ltAhead && ( tt == null && this._ltIndex === this._ltAhead && (
skipWS && this._reader.readMatch(/\s+/y), skipWS && this._reader.readMatch(/\s+/y),
this._reader.peekTest(/\/\*/y))) { this._reader.peekTest(/\/\*/y))) {
while (this.match(TT.usoS)) { /*NOP*/ } while (this.match(skipUsoVar ? TT.usoS : Tokens.S)) { /*NOP*/ }
} }
} }
@ -3811,7 +3814,7 @@ self.parserlib = (() => {
const stream = this._tokenStream; const stream = this._tokenStream;
let braceOpened; let braceOpened;
try { try {
stream.skipComment(); stream.skipComment(undefined, true);
if (parserCache.findBlock()) { if (parserCache.findBlock()) {
return true; return true;
} }
@ -4275,7 +4278,7 @@ self.parserlib = (() => {
_keyframes(start) { _keyframes(start) {
const stream = this._tokenStream; const stream = this._tokenStream;
const prefix = /^@-([^-]+)-/.test(start.value) ? RegExp.$1 : ''; const prefix = rxVendorPrefix.test(start.value) ? RegExp.$1 : '';
this._ws(); this._ws();
const name = this._keyframeName(); const name = this._keyframeName();
stream.mustMatch(Tokens.LBRACE); stream.mustMatch(Tokens.LBRACE);