highlight comments in module

Signed-off-by: Yan Zhang <[email protected]>
atom · Jan 20, 2021 · a3d1e9b · a3d1e9b
1 parent 5f2f890
commit a3d1e9b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/grammars/java.cson b/grammars/java.cson
@@ -1002,6 +1002,12 @@
             'match': '\\b(requires|transitive|exports|opens|to|uses|provides|with)\\b'
             'name': 'keyword.module.java'
           }
+          {
+            'include': '#comments'
+          }
+          {
+            'include': '#comments-javadoc'
+          }
         ]
       }
     ]

diff --git a/spec/java-spec.coffee b/spec/java-spec.coffee
@@ -209,6 +209,27 @@ describe 'Java grammar', ->
     expect(lines[2][3]).toEqual value: 'with', scopes: ['source.java', 'meta.module.java', 'meta.module.body.java', 'keyword.module.java']
     expect(lines[3][0]).toEqual value: '}', scopes: ['source.java', 'meta.module.java', 'punctuation.section.module.end.bracket.curly.java']
 
+  # TODO: module names in module body not implemented.
+  it 'tokenizes module name and comments', ->
+    lines = grammar.tokenizeLines '''
+      module com.foo.bar {
+        // comments
+        /* comments */
+        /** javadoc */
+        requires java.base;
+      }
+    '''
+
+    expect(lines[0][0]).toEqual value: 'module', scopes: ['source.java', 'meta.module.java', 'storage.modifier.java']
+    # expect(lines[0][2]).toEqual value: 'com.foo.bar', scopes: ['source.java', 'meta.module.java', 'entity.name.type.module.java']
+    expect(lines[0][4]).toEqual value: '{', scopes: ['source.java', 'meta.module.java', 'punctuation.section.module.begin.bracket.curly.java']
+    expect(lines[1][2]).toEqual value: ' comments', scopes: ['source.java', 'meta.module.java', 'meta.module.body.java', 'comment.line.double-slash.java']
+    expect(lines[2][2]).toEqual value: ' comments ', scopes: ['source.java', 'meta.module.java', 'meta.module.body.java', 'comment.block.java']
+    expect(lines[3][2]).toEqual value: ' javadoc ', scopes: ['source.java', 'meta.module.java', 'meta.module.body.java', 'comment.block.javadoc.java']
+    expect(lines[4][1]).toEqual value: 'requires', scopes: ['source.java', 'meta.module.java', 'meta.module.body.java', 'keyword.module.java']
+    # expect(lines[4][2]).toEqual value: 'java.base', scopes: ['source.java', 'meta.module.java', 'meta.module.body.java', 'entity.name.type.module.java']
+    expect(lines[5][0]).toEqual value: '}', scopes: ['source.java', 'meta.module.java', 'punctuation.section.module.end.bracket.curly.java']
+
   it 'tokenizes classes', ->
     lines = grammar.tokenizeLines '''
       class Thing {