Remove variable.other

elixir-editors · Oct 16, 2016 · b3033b6 · b3033b6
1 parent 51a2ff0
commit b3033b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/grammars/elixir.cson b/grammars/elixir.cson
@@ -1465,11 +1465,11 @@
   }
   {
     'match': '\\b_([\\w]+[?!]?)'
-    'name': 'variable.other.unused.comment.elixir'
+    'name': 'unused.comment.elixir'
   }
   {
     'match': '\\b_\\b'
-    'name': 'variable.other.wildcard.comment.elixir'
+    'name': 'wildcard.comment.elixir'
   }
   {
     'comment': """

diff --git a/spec/elixir-spec.coffee b/spec/elixir-spec.coffee
@@ -14,16 +14,16 @@ describe "Elixir grammar", ->
 
   it "tokenizes underscore variables as comments", ->
     {tokens} = grammar.tokenizeLine('_some_variable?')
-    expect(tokens[0]).toEqual value: '_some_variable?', scopes: ['source.elixir', 'variable.other.unused.comment.elixir']
+    expect(tokens[0]).toEqual value: '_some_variable?', scopes: ['source.elixir', 'unused.comment.elixir']
 
     {tokens} = grammar.tokenizeLine('some_variable')
     expect(tokens[0]).toEqual value: 'some_variable', scopes: ['source.elixir']
 
   it "tokenizes underscore as wildcard variable", ->
     {tokens} = grammar.tokenizeLine('this _ other_thing')
-    expect(tokens[0]).not.toEqual value: 'this ', scopes: ['source.elixir', 'variable.other.wildcard.comment.elixir']
-    expect(tokens[1]).toEqual value: '_', scopes: ['source.elixir', 'variable.other.wildcard.comment.elixir']
-    expect(tokens[2]).not.toEqual value: ' other_thing', scopes: ['source.elixir', 'variable.other.wildcard.comment.elixir']
+    expect(tokens[0]).not.toEqual value: 'this ', scopes: ['source.elixir', 'wildcard.comment.elixir']
+    expect(tokens[1]).toEqual value: '_', scopes: ['source.elixir', 'wildcard.comment.elixir']
+    expect(tokens[2]).not.toEqual value: ' other_thing', scopes: ['source.elixir', 'wildcard.comment.elixir']
 
     {tokens} = grammar.tokenizeLine('some_variable')
     expect(tokens[0]).toEqual value: 'some_variable', scopes: ['source.elixir']