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

CSSLint: Selectors L4 :is() supersedes :matches()

Browse Source 
https://drafts.csswg.org/selectors-4/#matches
This commit is contained in:
tophf 2018-11-15 10:23:07 +03:00
parent ca84ff2460
commit 390b2a63b1
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1416,6 +1416,7 @@ self.parserlib = (() => {
{name: 'NOT'}, {name: 'NOT'},
{name: 'ANY', text: ['any', '-webkit-any', '-moz-any']}, {name: 'ANY', text: ['any', '-webkit-any', '-moz-any']},
{name: 'MATCHES'}, {name: 'MATCHES'},
{name: 'IS'},
/* /*
* Defined in CSS3 Paged Media * Defined in CSS3 Paged Media
@ -3020,11 +3021,13 @@ self.parserlib = (() => {
/* /*
* Potential tokens: * Potential tokens:
* - ANY * - ANY
* - IS
* - MATCHES
* - NOT * - NOT
* - CHAR * - CHAR
*/ */
case ':': case ':':
return this.notOrAnyOrMatchesToken(c, pos); return this.notOrIsToken(c, pos);
/* /*
* Potential tokens: * Potential tokens:
@ -3232,16 +3235,20 @@ self.parserlib = (() => {
} }
// NOT // NOT
// IS
// ANY // ANY
// MATCHES // MATCHES
// CHAR // CHAR
notOrAnyOrMatchesToken(first, pos) { notOrIsToken(first, pos) {
// first is always ':'
const reader = this._reader; const reader = this._reader;
const func = reader.readMatch(/(not|(-(moz|webkit)-)?any|matches)\(/iy); const func = reader.readMatch(/(not|is|(-(moz|webkit)-)?(any|matches))\(/iy);
if (func) { if (func) {
const lcase = func[0].toLowerCase();
const type = const type =
func.startsWith('n') || func.startsWith('N') ? Tokens.NOT : lcase === 'n' ? Tokens.NOT :
func.startsWith('m') || func.startsWith('M') ? Tokens.MATCHES : Tokens.ANY; lcase === 'i' ? Tokens.IS :
lcase === 'm' ? Tokens.MATCHES : Tokens.ANY;
return this.createToken(type, first + func, pos); return this.createToken(type, first + func, pos);
} }
return this.charToken(first, pos); return this.charToken(first, pos);
@ -4683,13 +4690,13 @@ self.parserlib = (() => {
return value.length ? value : null; return value.length ? value : null;
} }
_anyOrMatches() { _is() {
const stream = this._tokenStream; const stream = this._tokenStream;
if (!stream.match([Tokens.ANY, Tokens.MATCHES])) return null; if (!stream.match([Tokens.IS, Tokens.ANY, Tokens.MATCHES])) return null;
let arg; let arg;
const start = stream._token; const start = stream._token;
const type = start.type === Tokens.ANY ? 'any' : 'matches'; const type = lower(Tokens[start.type].name);
const value = const value =
start.value + start.value +
this._ws() + this._ws() +
@ -5416,8 +5423,9 @@ self.parserlib = (() => {
[Tokens.DOT, Parser.prototype._class], [Tokens.DOT, Parser.prototype._class],
[Tokens.LBRACKET, Parser.prototype._attrib], [Tokens.LBRACKET, Parser.prototype._attrib],
[Tokens.COLON, Parser.prototype._pseudo], [Tokens.COLON, Parser.prototype._pseudo],
[Tokens.ANY, Parser.prototype._anyOrMatches], [Tokens.IS, Parser.prototype._is],
[Tokens.MATCHES, Parser.prototype._anyOrMatches], [Tokens.ANY, Parser.prototype._is],
[Tokens.MATCHES, Parser.prototype._is],
[Tokens.NOT, Parser.prototype._negation], [Tokens.NOT, Parser.prototype._negation],
]), ]),
}; };