atom
diff --git a/‎grammars/tree-sitter-java.cson‎
Lines changed: 2 additions & 2 deletions b/‎grammars/tree-sitter-java.cson‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎spec/tree-sitter-java-spec.coffee‎
Lines changed: 6 additions & 0 deletions b/‎spec/tree-sitter-java-spec.coffee‎
Lines changed: 6 additions & 0 deletions
@@ -298,9 +298,9 @@ scopes:
   method_reference > identifier,
   method_invocation > identifier
   ''': [
-    {match: '^[A-Z][A-Z_]+$', scopes: 'constant.other'},
+    {match: '^[A-Z][A-Z0-9_\\$]+$', scopes: 'constant.other'},
     {match: '^[A-Z]', scopes: 'storage.type'}
   ]
   'identifier': [
-    {match: '^[A-Z][A-Z_]+$', scopes: 'constant.other'}
+    {match: '^[A-Z][A-Z0-9_\\$]+$', scopes: 'constant.other'}
   ]
@@ -246,12 +246,18 @@ describe 'Tree-sitter based Java grammar', ->
       a = CONSTANT + obj.func();
       b = conf.get(CONSTANT_ANOTHER);
       c = Integer.MAX_VALUE;
+      d = A1_B2_C3;
+      e = A1_B2_C$;
+      f = Test.A1_B2_C3;
     '''
 
     expect(tokens[0][2]).toEqual value: 'CONSTANT_STR', scopes: ['source.java', 'constant.other']
     expect(tokens[1][3]).toEqual value: 'CONSTANT', scopes: ['source.java', 'constant.other']
     expect(tokens[2][6]).toEqual value: 'CONSTANT_ANOTHER', scopes: ['source.java', 'constant.other']
     expect(tokens[3][5]).toEqual value: 'MAX_VALUE', scopes: ['source.java', 'constant.other']
+    expect(tokens[4][3]).toEqual value: 'A1_B2_C3', scopes: ['source.java', 'constant.other']
+    expect(tokens[5][3]).toEqual value: 'A1_B2_C$', scopes: ['source.java', 'constant.other']
+    expect(tokens[6][5]).toEqual value: 'A1_B2_C3', scopes: ['source.java', 'constant.other']
 
   it 'tokenizes reserved keywords', ->
     tokens = tokenizeLine 'const value;'
Original file line number	Diff line number	Diff line change
@@ -298,9 +298,9 @@ scopes:
298	298	method_reference > identifier,
299	299	method_invocation > identifier
300	300	''': [
301		- {match: '^[A-Z][A-Z_]+$', scopes: 'constant.other'},
	301	+ {match: '^[A-Z][A-Z0-9_\\$]+$', scopes: 'constant.other'},
302	302	{match: '^[A-Z]', scopes: 'storage.type'}
303	303	]
304	304	'identifier': [
305		- {match: '^[A-Z][A-Z_]+$', scopes: 'constant.other'}
	305	+ {match: '^[A-Z][A-Z0-9_\\$]+$', scopes: 'constant.other'}
306	306	]