From b5b3438916bd617fe2b61e090b438c3e27034fc1 Mon Sep 17 00:00:00 2001
From: Wliu <50Wliu@users.noreply.github.com>
Date: Wed, 1 Nov 2017 12:26:55 +0100
Subject: [PATCH] Revert "Improve mixin scopes"

---
 grammars/less.cson    | 290 ++++--------------------------------------
 spec/less-spec.coffee |  73 ++---------
 2 files changed, 36 insertions(+), 327 deletions(-)

diff --git a/grammars/less.cson b/grammars/less.cson
index c6505e0..9ac5ed9 100644
--- a/grammars/less.cson
+++ b/grammars/less.cson
@@ -13,7 +13,10 @@
     'include': '#strings'
   }
   {
-    'include': '#mixins'
+    'captures':
+      '1':
+        'name': 'entity.other.attribute-name.class.mixin.css'
+    'match': '(\\.[_a-zA-Z][a-zA-Z0-9_-]*(?=\\())'
   }
   {
     'captures':
@@ -216,7 +219,11 @@
     ]
   }
   {
-    'include': '#variables'
+    'match': '(@|\\-\\-)[\\w-]+(?=\\s*)'
+    'name': 'variable.other.less'
+    'captures':
+      '1':
+        'name': 'punctuation.definition.variable.less'
   }
   {
     'include': '#variable_interpolation'
@@ -263,10 +270,12 @@
     "name": "keyword.other.important.css"
   }
   {
-    'include': '#operators'
+    'match': '\\*|\\/|\\-|\\+|~|=|<=|>=|<|>'
+    'name': 'keyword.operator.less'
   }
   {
-    'include': '#logical_operators'
+    'match': '\\b(not|and|when)\\b'
+    'name': 'keyword.control.logical.operator.less'
   }
   {
     'include': 'source.css#tag-names'
@@ -311,13 +320,22 @@
     'name': 'punctuation.separator.key-value.css'
   }
   {
-    'include': '#booleans'
+    # true is truthy, everything else is false: there is no 'false' keyword
+    # http://lesscss.org/features/#mixin-guards-feature-guard-comparison-operators
+    'match': '\\btrue\\b'
+    'name': 'constant.language.boolean.less'
+  }
+  {
+    'match': '\\bdefault\\b'
+    'name': 'support.function.default.less'
   }
   {
-    'include': '#function_type_checking'
+    'match': '\\b(isurl|isstring|isnumber|iskeyword|iscolor)\\b'
+    'name': 'support.function.type-checking.less'
   }
   {
-    'include': '#function_unit_checking'
+    'match': '\\b(isunit|ispixel|ispercentage|isem)\\b'
+    'name': 'support.function.unit-checking.less'
   }
   {
     'include': 'source.css#property-keywords'
@@ -336,17 +354,6 @@
   }
 ]
 'repository':
-  'booleans':
-    # true is truthy, everything else is false: there is no 'false' keyword
-    # http://lesscss.org/features/#mixin-guards-feature-guard-comparison-operators
-    'match': '\\btrue\\b'
-    'name': 'constant.language.boolean.less'
-  'variables':
-    'match': '(@|\\-\\-)[\\w-]+'
-    'name': 'variable.other.less'
-    'captures':
-      '1':
-        'name': 'punctuation.definition.variable.less'
   'variable_interpolation':
     'match': '@{[a-zA-Z0-9_-]+}'
     'name': 'variable.other.interpolation.less'
@@ -396,12 +403,6 @@
   'brace_round':
     'match': '\\(|\\)'
     'name': 'meta.brace.round.css'
-  'operators':
-    'match': '\\*|\\/|\\-|\\+|~|=|<=|>=|<|>'
-    'name': 'keyword.operator.less'
-  'logical_operators':
-    'match': '\\b(not|and|when)\\b'
-    'name': 'keyword.control.logical.operator.less'
   'property_values':
     'begin': '(?<!&)(:)\\s*(?!(\\s*{))(?!.*(?<!@){)'
     'beginCaptures':
@@ -455,244 +456,3 @@
   'less_builtin_functions':
     'match': '\\b(abs|acos|alpha|argb|asin|atan|average|blue|calc|ceil|color|contrast|convert|convert|cos|darken|data-uri|desaturate|difference|e|escape|exclusion|extract|fade|fadein|fadeout|floor|format|green|greyscale|hardlight|hsl|hsla|hsv|hsva|hsvhue|hsvsaturation|hsvvalue|hue|length|lighten|lightness|luma|max|min|mix|mod|multiply|negation|overlay|percentage|pi|pow|red|replace|round|saturate|saturation|screen|sin|softlight|spin|sqrt|tan|unit)\\b'
     'name': 'support.function.any-method.builtin.less'
-  'function_type_checking':
-    'begin': '\\b(isurl|isstring|isnumber|iskeyword|iscolor)(\\()'
-    'beginCaptures':
-      '1':
-        'name': 'support.function.type-checking.less'
-      '2':
-        'name': 'meta.brace.round.css'
-    'end': '\\)'
-    'endCaptures':
-      '0':
-        'name': 'meta.brace.round.css'
-    'patterns': [
-      {
-        'include': '#property_values'
-      }
-      {
-        'include': '#variables'
-      }
-    ]
-  'function_default':
-    'match': '\\b(default)(\\()(\\))'
-    'captures':
-      '1':
-        'name': 'support.function.default.less'
-      '2':
-        'name': 'meta.brace.round.css'
-      '3':
-        'name': 'meta.brace.round.css'
-  'function_unit_checking':
-    'begin': '\\b(isunit|ispixel|ispercentage|isem)(\\()'
-    'beginCaptures':
-      '1':
-        'name': 'support.function.unit-checking.less'
-      '2':
-        'name': 'meta.brace.round.css'
-    'end': '\\)'
-    'endCaptures':
-      '0':
-        'name': 'meta.brace.round.css'
-    'patterns': [
-      {
-        'include': '#property_values'
-      }
-      {
-        'include': '#variables'
-      }
-    ]
-  'mixins':
-    'name': 'meta.mixin.less'
-    'begin': '((\\.)[_a-zA-Z][a-zA-Z0-9_-]*)(?=\\s*\\()'
-    'beginCaptures':
-      '0':
-        'name': 'meta.definition.mixin.less'
-      '1':
-        'name': 'entity.name.mixin.less'
-      '2':
-        'name': 'punctuation.definition.mixin.less'
-    'end': '(?<=})'
-    'patterns': [
-      {
-        'include': '#mixin_parameters'
-      }
-      {
-        'include': '#mixin_guards'
-      }
-      {
-        'include': '$self'
-      }
-    ]
-  'mixin_parameters':
-    'name': 'meta.parameters.less'
-    'begin': '\\((?=\\s*@|\\))'
-    'beginCaptures':
-      '0':
-        'name': 'punctuation.definition.parameters.begin.bracket.round.less'
-    'end': '\\)'
-    'endCaptures':
-      '0':
-        'name': 'punctuation.definition.parameters.end.bracket.round.less'
-    'patterns': [
-      {
-        'include': '#mixin_parameter_semicolon'
-      }
-      {
-        'include': '#mixin_parameter_comma'
-      }
-      {
-        'include': '#mixin_parameter'
-      }
-    ]
-  'mixin_parameter_semicolon':
-    'begin': '(@)[a-zA-Z][a-zA-Z0-9-]*(?=.*?;)'
-    'beginCaptures':
-      '0':
-        'name': 'variable.parameter.less'
-      '1':
-        'name': 'punctuation.definition.variable.less'
-    'end': ';'
-    'endCaptures':
-      '0':
-        'name': 'punctuation.separator.parameter.less'
-    'patterns': [
-      {
-        'match': ':'
-        'name': 'punctuation.separator.key-value.less'
-      }
-      {
-        'include': 'source.css#numeric-values'
-      }
-      {
-        'include': 'source.css#color-keywords'
-      }
-      {
-        'include': 'source.css#functions'
-      }
-      {
-        'include': '#less_builtin_functions'
-      }
-      {
-        'include': 'source.css#property-keywords'
-      }
-      {
-        'include': '#strings'
-      }
-      {
-        'include': 'source.css#commas'
-      }
-    ]
-  'mixin_parameter_comma':
-    'begin': '(@)[a-zA-Z][a-zA-Z0-9-]*(?=.*?,\\s*@)'
-    'beginCaptures':
-      '0':
-        'name': 'variable.parameter.less'
-      '1':
-        'name': 'punctuation.definition.variable.less'
-    'end': ',(?=\\s*@)'
-    'endCaptures':
-      '0':
-        'name': 'punctuation.separator.parameter.less'
-    'patterns': [
-      {
-        'match': ':'
-        'name': 'punctuation.separator.key-value.less'
-      }
-      {
-        'include': 'source.css#numeric-values'
-      }
-      {
-        'include': 'source.css#color-keywords'
-      }
-      {
-        'include': 'source.css#functions'
-      }
-      {
-        'include': '#less_builtin_functions'
-      }
-      {
-        'include': 'source.css#property-keywords'
-      }
-      {
-        'include': '#strings'
-      }
-    ]
-  'mixin_parameter':
-    'begin': '(@)[a-zA-Z][a-zA-Z0-9-]*'
-    'beginCaptures':
-      '0':
-        'name': 'variable.parameter.less'
-      '1':
-        'name': 'punctuation.definition.variable.less'
-    'end': '(?=\\))'
-    'patterns': [
-      {
-        'match': ':'
-        'name': 'punctuation.separator.key-value.less'
-      }
-      {
-        'include': 'source.css#numeric-values'
-      }
-      {
-        'include': 'source.css#color-keywords'
-      }
-      {
-        'include': 'source.css#functions'
-      }
-      {
-        'include': '#less_builtin_functions'
-      }
-      {
-        'include': 'source.css#property-keywords'
-      }
-      {
-        'include': '#strings'
-      }
-      {
-        'include': 'source.css#commas'
-      }
-    ]
-  'mixin_guards':
-    'name': 'meta.guard.less'
-    'begin': '(?:(when|and|when\\s+not|and\\s+not)\\s*|(,)\\s*)+(\\()'
-    'beginCaptures':
-      '1':
-        'name': 'keyword.control.logical.operator.less'
-      '2':
-        'name': 'punctuation.separator.list.comma.css'
-      '3':
-        'name': 'meta.brace.round.css'
-    'end': '\\)'
-    'endCaptures':
-      '0':
-        'name': 'meta.brace.round.css'
-    'patterns': [
-      {
-        'include': '#function_type_checking'
-      }
-      {
-        'include': '#function_default'
-      }
-      {
-        'include': '#function_unit_checking'
-      }
-      {
-        'include': '#property_values'
-      }
-      {
-        'include': '#variables'
-      }
-      {
-        'include': 'source.css#numeric-values'
-      }
-      {
-        'include': '#booleans'
-      }
-      {
-        'include': '#strings'
-      }
-      {
-        'include': '#operators'
-      }
-    ]
diff --git a/spec/less-spec.coffee b/spec/less-spec.coffee
index b92c808..5e48050 100644
--- a/spec/less-spec.coffee
+++ b/spec/less-spec.coffee
@@ -350,68 +350,17 @@ describe "Less grammar", ->
     {tokens} = grammar.tokenizeLine '@var: true;'
     expect(tokens[4]).toEqual value: "true", scopes: ['source.css.less', 'constant.language.boolean.less']
 
-  describe 'mixins', ->
-    it 'parses mixin guards', ->
-      {tokens} = grammar.tokenizeLine '.mixin() when (isnumber(@b)) and (default()), (ispixel(@a)) and not (@a < 0) { }'
-      expect(tokens[0]).toEqual value: '.', scopes: ['source.css.less', 'meta.mixin.less', 'meta.definition.mixin.less', 'entity.name.mixin.less', 'punctuation.definition.mixin.less']
-      expect(tokens[1]).toEqual value: 'mixin', scopes: ['source.css.less', 'meta.mixin.less', 'meta.definition.mixin.less', 'entity.name.mixin.less']
-      expect(tokens[2]).toEqual value: '(', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'punctuation.definition.parameters.begin.bracket.round.less']
-      expect(tokens[3]).toEqual value: ')', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'punctuation.definition.parameters.end.bracket.round.less']
-      expect(tokens[5]).toEqual value: 'when', scopes: ['source.css.less', 'meta.mixin.less', 'meta.guard.less', 'keyword.control.logical.operator.less']
-      expect(tokens[6]).toEqual value: ' ', scopes: ['source.css.less', 'meta.mixin.less', 'meta.guard.less']
-      expect(tokens[8]).toEqual value: 'isnumber', scopes: ['source.css.less', 'meta.mixin.less', 'meta.guard.less', 'support.function.type-checking.less']
-      expect(tokens[10]).toEqual value: '@', scopes: ['source.css.less', 'meta.mixin.less', 'meta.guard.less', 'variable.other.less', 'punctuation.definition.variable.less']
-      expect(tokens[11]).toEqual value: 'b', scopes: ['source.css.less', 'meta.mixin.less', 'meta.guard.less', 'variable.other.less']
-      expect(tokens[15]).toEqual value: 'and', scopes: ['source.css.less', 'meta.mixin.less', 'meta.guard.less', 'keyword.control.logical.operator.less']
-      expect(tokens[22]).toEqual value: ',', scopes: ['source.css.less', 'meta.mixin.less', 'meta.guard.less', 'punctuation.separator.list.comma.css']
-      expect(tokens[32]).toEqual value: 'and not', scopes: ['source.css.less', 'meta.mixin.less', 'meta.guard.less', 'keyword.control.logical.operator.less']
-      expect(tokens[43]).toEqual value: '{', scopes: ['source.css.less', 'meta.mixin.less', 'meta.property-list.css', 'punctuation.section.property-list.begin.bracket.curly.css']
-
-    it 'parses mixin parameters', ->
-      {tokens} = grammar.tokenizeLine '.foo(@a: 4px, @b) {}'
-      expect(tokens[0]).toEqual value: '.', scopes: ['source.css.less', 'meta.mixin.less', 'meta.definition.mixin.less', 'entity.name.mixin.less', 'punctuation.definition.mixin.less']
-      expect(tokens[1]).toEqual value: 'foo', scopes: ['source.css.less', 'meta.mixin.less', 'meta.definition.mixin.less', 'entity.name.mixin.less']
-      expect(tokens[2]).toEqual value: '(', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'punctuation.definition.parameters.begin.bracket.round.less']
-      expect(tokens[3]).toEqual value: '@', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'variable.parameter.less', 'punctuation.definition.variable.less']
-      expect(tokens[4]).toEqual value: 'a', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'variable.parameter.less']
-      expect(tokens[5]).toEqual value: ':', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'punctuation.separator.key-value.less']
-      expect(tokens[7]).toEqual value: '4', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'constant.numeric.css']
-      expect(tokens[8]).toEqual value: 'px', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'constant.numeric.css', 'keyword.other.unit.px.css']
-      expect(tokens[9]).toEqual value: ',', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'punctuation.separator.parameter.less']
-      expect(tokens[11]).toEqual value: '@', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'variable.parameter.less', 'punctuation.definition.variable.less']
-      expect(tokens[12]).toEqual value: 'b', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'variable.parameter.less']
-      expect(tokens[13]).toEqual value: ')', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'punctuation.definition.parameters.end.bracket.round.less']
-
-    it 'parses mixin parameters with lists and semicolons', ->
-      {tokens} = grammar.tokenizeLine '.foo(@a: darken(#fafafa), absolute, calc(100vh - 40px + 5%), red; @b; @c) {}'
-      expect(tokens[3]).toEqual value: '@', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'variable.parameter.less', 'punctuation.definition.variable.less']
-      expect(tokens[4]).toEqual value: 'a', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'variable.parameter.less']
-      expect(tokens[5]).toEqual value: ':', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'punctuation.separator.key-value.less']
-      expect(tokens[7]).toEqual value: 'darken', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'support.function.any-method.builtin.less']
-      expect(tokens[9]).toEqual value: '#', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'constant.other.color.rgb-value.hex.css', 'punctuation.definition.constant.css']
-      expect(tokens[10]).toEqual value: 'fafafa', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'constant.other.color.rgb-value.hex.css']
-      expect(tokens[12]).toEqual value: ',', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'punctuation.separator.list.comma.css']
-      expect(tokens[14]).toEqual value: 'absolute', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'support.constant.property-value.css']
-      expect(tokens[15]).toEqual value: ',', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'punctuation.separator.list.comma.css']
-      expect(tokens[17]).toEqual value: 'calc', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'meta.function.calc.css', 'support.function.calc.css']
-      expect(tokens[19]).toEqual value: '100', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'meta.function.calc.css', 'constant.numeric.css']
-      expect(tokens[20]).toEqual value: 'vh', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'meta.function.calc.css', 'constant.numeric.css', 'keyword.other.unit.vh.css']
-      expect(tokens[22]).toEqual value: '-', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'meta.function.calc.css', 'keyword.operator.arithmetic.css']
-      expect(tokens[24]).toEqual value: '40', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'meta.function.calc.css', 'constant.numeric.css']
-      expect(tokens[25]).toEqual value: 'px', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'meta.function.calc.css', 'constant.numeric.css', 'keyword.other.unit.px.css']
-      expect(tokens[27]).toEqual value: '+', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'meta.function.calc.css', 'keyword.operator.arithmetic.css']
-      expect(tokens[29]).toEqual value: '5', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'meta.function.calc.css', 'constant.numeric.css']
-      expect(tokens[30]).toEqual value: '%', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'meta.function.calc.css', 'constant.numeric.css', 'keyword.other.unit.percentage.css']
-      expect(tokens[32]).toEqual value: ',', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'punctuation.separator.list.comma.css']
-      expect(tokens[34]).toEqual value: 'red', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'support.constant.color.w3c-standard-color-name.css']
-      expect(tokens[35]).toEqual value: ';', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'punctuation.separator.parameter.less']
-      expect(tokens[37]).toEqual value: '@', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'variable.parameter.less', 'punctuation.definition.variable.less']
-      expect(tokens[38]).toEqual value: 'b', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'variable.parameter.less']
-      expect(tokens[39]).toEqual value: ';', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'punctuation.separator.parameter.less']
-      expect(tokens[41]).toEqual value: '@', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'variable.parameter.less', 'punctuation.definition.variable.less']
-      expect(tokens[42]).toEqual value: 'c', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'variable.parameter.less']
-      expect(tokens[43]).toEqual value: ')', scopes: ['source.css.less', 'meta.mixin.less', 'meta.parameters.less', 'punctuation.definition.parameters.end.bracket.round.less']
-      expect(tokens[44]).toEqual value: ' ', scopes: ['source.css.less', 'meta.mixin.less']
+  it 'parses mixin guards', ->
+    {tokens} = grammar.tokenizeLine '.mixin() when (isnumber(@b)) and (default()), (ispixel(@a)) and  not (@a < 0) { }'
+    expect(tokens[4]).toEqual value: "when", scopes: ['source.css.less', 'keyword.control.logical.operator.less']
+    expect(tokens[7]).toEqual value: "isnumber", scopes: ['source.css.less', 'support.function.type-checking.less']
+    expect(tokens[14]).toEqual value: "and", scopes: ['source.css.less', 'keyword.control.logical.operator.less']
+    expect(tokens[17]).toEqual value: "default", scopes: ['source.css.less', 'support.function.default.less']
+    expect(tokens[21]).toEqual value: ",", scopes: ['source.css.less', 'punctuation.separator.list.comma.css']
+    expect(tokens[24]).toEqual value: "ispixel", scopes: ['source.css.less', 'support.function.unit-checking.less']
+    expect(tokens[31]).toEqual value: "and", scopes: ['source.css.less', 'keyword.control.logical.operator.less']
+    expect(tokens[33]).toEqual value: "not", scopes: ['source.css.less', 'keyword.control.logical.operator.less']
+    expect(tokens[39]).toEqual value: "<", scopes: ['source.css.less', 'keyword.operator.less']
 
   describe 'strings', ->
     it 'tokenizes single-quote strings', ->