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

parserlib: fix reading \\, regressed in 6d04c0e

Browse Source
This commit is contained in:
tophf 2020-12-14 21:18:15 +03:00
parent 775d77a3a8
commit 7140993e6c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vendor-overwrites/csslint/parserlib.js
View File

@ -678,7 +678,8 @@ self.parserlib = (() => {
}; };
const rxIdentStart = /[-\\_a-zA-Z\u00A0-\uFFFF]+/yu; const rxIdentStart = /[-\\_a-zA-Z\u00A0-\uFFFF]+/yu;
const rxNameChar = /[-\\_\da-zA-Z\u00A0-\uFFFF]+/yu; const rxNameChar = /[-\\_\da-zA-Z\u00A0-\uFFFF]+/yu;
const rxUnquotedUrlChar = /[-!#$%&*-[\]-~\u00A0-\uFFFF]+/yu; const rxNameCharNoEsc = /[-_\da-zA-Z\u00A0-\uFFFF]+/yu; // must not match \\
const rxUnquotedUrlCharNoEsc = /[-!#$%&*-[\]-~\u00A0-\uFFFF]+/yu; // must not match \\
const rxVendorPrefix = /^-(webkit|moz|ms|o)-(.+)/i; const rxVendorPrefix = /^-(webkit|moz|ms|o)-(.+)/i;
const rxCalc = /^(?:-(webkit|moz|ms|o)-)?(calc|min|max|clamp)\(/i; const rxCalc = /^(?:-(webkit|moz|ms|o)-)?(calc|min|max|clamp)\(/i;
const lowercaseCache = new Map(); const lowercaseCache = new Map();
@ -2849,7 +2850,7 @@ self.parserlib = (() => {
identOrFunctionToken(first, token) { identOrFunctionToken(first, token) {
const reader = this._reader; const reader = this._reader;
const name = this.readChunksWithEscape(first, rxNameChar); const name = this.readChunksWithEscape(first, rxNameCharNoEsc);
const next = reader.peek(); const next = reader.peek();
token.value = name; token.value = name;
// might be a URI or function // might be a URI or function
@ -3016,7 +3017,7 @@ self.parserlib = (() => {
if (value == null) return null; if (value == null) return null;
value = parseString(value); value = parseString(value);
} else { } else {
value = this.readChunksWithEscape('', rxUnquotedUrlChar); value = this.readChunksWithEscape('', rxUnquotedUrlCharNoEsc);
} }
this._reader.readMatch(/\s+/y); this._reader.readMatch(/\s+/y);
// Ensure argument to URL is always double-quoted // Ensure argument to URL is always double-quoted
@ -3028,7 +3029,7 @@ self.parserlib = (() => {
} }
readName(first) { readName(first) {
return this.readChunksWithEscape(first, rxNameChar); return this.readChunksWithEscape(first, rxNameCharNoEsc);
} }
readEscape() { readEscape() {
@ -3036,6 +3037,11 @@ self.parserlib = (() => {
return cp ? String.fromCodePoint(parseInt(cp, 16)) : this._reader.read(); return cp ? String.fromCodePoint(parseInt(cp, 16)) : this._reader.read();
} }
/**
* @param {?string} first
* @param {RegExp} rx - must not match \\
* @returns {string}
*/
readChunksWithEscape(first, rx) { readChunksWithEscape(first, rx) {
const reader = this._reader; const reader = this._reader;
const url = first ? [first] : []; const url = first ? [first] : [];