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

add "||" column combinator

Browse Source
This commit is contained in:
tophf 2020-06-26 07:14:26 +03:00
parent 02716010d1
commit 3dd3714234
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1426,6 +1426,7 @@ self.parserlib = (() => {
GREATER: {text: '>'}, GREATER: {text: '>'},
COMMA: {text: ','}, COMMA: {text: ','},
TILDE: {text: '~'}, TILDE: {text: '~'},
COLUMN: {text: '||'},
// modifier // modifier
NOT: {}, NOT: {},
@ -1468,7 +1469,6 @@ self.parserlib = (() => {
// part of CSS3 grammar but not the Flex code // part of CSS3 grammar but not the Flex code
CHAR: {}, CHAR: {},
// TODO: Needed?
// Not defined as tokens, but might as well be // Not defined as tokens, but might as well be
PIPE: {text: '|'}, PIPE: {text: '|'},
SLASH: {text: '/'}, SLASH: {text: '/'},
@ -2205,6 +2205,7 @@ self.parserlib = (() => {
value === '>' ? 'child' : value === '>' ? 'child' :
value === '+' ? 'adjacent-sibling' : value === '+' ? 'adjacent-sibling' :
value === '~' ? 'sibling' : value === '~' ? 'sibling' :
value === '||' ? 'column' :
!value.trim() ? 'descendant' : !value.trim() ? 'descendant' :
'unknown'; 'unknown';
} }
@ -2943,6 +2944,7 @@ self.parserlib = (() => {
* - PREFIXMATCH * - PREFIXMATCH
* - SUFFIXMATCH * - SUFFIXMATCH
* - SUBSTRINGMATCH * - SUBSTRINGMATCH
* - COLUMN
* - CHAR * - CHAR
*/ */
case '|': case '|':
@ -2950,10 +2952,11 @@ self.parserlib = (() => {
case '^': case '^':
case '$': case '$':
case '*': case '*':
return reader.peek() === '=' ? return (
this.comparisonToken(c, pos) : reader.peek() === '=' ? this.comparisonToken(c, pos) :
this.charToken(c, pos); reader.readMatch('|') ? this.createToken(Tokens.COLUMN, '||', pos) :
this.charToken(c, pos)
);
/* /*
* Potential tokens: * Potential tokens:
* - STRING * - STRING
@ -4369,7 +4372,7 @@ self.parserlib = (() => {
} }
_combinator() { _combinator() {
if (this._tokenStream.match([Tokens.PLUS, Tokens.GREATER, Tokens.TILDE])) { if (this._tokenStream.match([Tokens.PLUS, Tokens.GREATER, Tokens.TILDE, Tokens.COLUMN])) {
const value = new Combinator(this._tokenStream._token); const value = new Combinator(this._tokenStream._token);
this._ws(); this._ws();
return value; return value;
@ -4634,7 +4637,7 @@ self.parserlib = (() => {
if (stream.match([Tokens.IDENT])) { if (stream.match([Tokens.IDENT])) {
const caseMod = lower(stream._token.value); const caseMod = lower(stream._token.value);
if (caseMod === 'i' || caseMode === 's') { if (caseMod === 'i' || caseMod === 's') {
value += stream._token.value + value += stream._token.value +
this._ws(); this._ws();
} else { } else {