Use a custom color for Java Annotations

lkishalmi · Dec 27, 2023 · d0a512d · d0a512d
1 parent 5fe7d3d
commit d0a512d
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 15 deletions.
diff --git a/ide/defaults/src/org/netbeans/modules/defaults/BlueTheme-Java-fontsColors.xml b/ide/defaults/src/org/netbeans/modules/defaults/BlueTheme-Java-fontsColors.xml
@@ -23,6 +23,7 @@
 
 <fontscolors>
     <!-- JavaTokenId categories -->
+    <fontcolor name="annotation-separator" foreColor="ff66ccff" default="separator"/>
     <fontcolor name="character" default="char"/>
     <fontcolor name="errors" default="error"/>
     <fontcolor name="identifier" default="identifier"/>
@@ -52,7 +53,7 @@
     </fontcolor>
     <fontcolor name="mod-class" />
     <fontcolor name="mod-interface" />
-    <fontcolor name="mod-annotation-type" />
+    <fontcolor name="mod-annotation-type" foreColor="ff66ccff" default="identifier" />
     <fontcolor name="mod-enum" />
     <fontcolor name="mod-deprecated" strikeThrough="404040" />
     <fontcolor name="mod-static" >

diff --git a/...itor.base/src/org/netbeans/modules/java/editor/base/semantic/SemanticHighlighterBase.java b/...itor.base/src/org/netbeans/modules/java/editor/base/semantic/SemanticHighlighterBase.java
@@ -479,7 +479,8 @@ private Collection<ColoringAttributes> getVariableColoring(Element decl) {
         private void handlePossibleIdentifier(TreePath expr, boolean declaration) {
             handlePossibleIdentifier(expr, declaration, null);
         }
-
+
+        @SuppressWarnings("AssignmentToMethodParameter")
         private void handlePossibleIdentifier(TreePath expr, boolean declaration, Element decl) {
             if (Utilities.isKeyword(expr.getLeaf())) {
                 //ignore keywords:
@@ -504,6 +505,12 @@ private void handlePossibleIdentifier(TreePath expr, boolean declaration, Elemen
             TreePath currentPath = getCurrentPath();
             TreePath parent = currentPath.getParentPath();
 
+            if (isDeclType && 
+                    parent.getLeaf().getKind() == Kind.IMPORT) {
+                // Coloring types upon their kind is distracting on import statements
+                return;
+            }
+
             //for new <type>(), highlight <type> as a constructor:
             if (isDeclType &&
                 parent.getLeaf().getKind() == Kind.NEW_CLASS) {
@@ -533,12 +540,12 @@ private void handlePossibleIdentifier(TreePath expr, boolean declaration, Elemen
             }
 
             if (decl.getKind() == ElementKind.MODULE) {
-                c = new ArrayList<ColoringAttributes>();
+                c = new ArrayList<>();
                 c.add(ColoringAttributes.MODULE);
             }
 
             if (isDeclType) {
-                c = new ArrayList<ColoringAttributes>();
+                c = new ArrayList<>();
 
                 addModifiers(decl, c);
 
@@ -557,7 +564,7 @@ private void handlePossibleIdentifier(TreePath expr, boolean declaration, Elemen
 
             if (declaration) {
                 if (c == null) {
-                    c = new ArrayList<ColoringAttributes>();
+                    c = new ArrayList<>();
                 }
 
                 c.add(ColoringAttributes.DECLARATION);

diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/resources/Bundle.properties b/java/java.editor/src/org/netbeans/modules/java/editor/resources/Bundle.properties
@@ -31,6 +31,7 @@ operator=Operator
 comment=Comment
 literal=Literal
 separator=Separator
+annotation-separator=Annotation Separator
 
 # JavaStringTokenId categories
 string-escape=String Escape Sequence
@@ -67,6 +68,7 @@ mod-private=Private Element
 mod-package-private=Package Private Element
 mod-protected=Protected Element
 mod-public=Public Element
+mod-keyword=Contextual Keyword
 
 mod-field-declaration=Field Declaration
 mod-record-component-declaration=Record Component Declaration

diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/resources/fontsColors.xml b/java/java.editor/src/org/netbeans/modules/java/editor/resources/fontsColors.xml
@@ -23,6 +23,7 @@
 
 <fontscolors>
     <!-- JavaTokenId categories -->
+    <fontcolor name="annotation-separator"  foreColor="996600" default="separator"/>
     <fontcolor name="character" default="char"/>
     <fontcolor name="identifier" default="identifier"/>
     <fontcolor name="keyword" default="keyword"/>
@@ -52,16 +53,16 @@
         <font style="bold" />
     </fontcolor>
     <fontcolor name="mod-module-declaration" default="identifier">
-            <font style="bold" />
+        <font style="bold" />
     </fontcolor>
     <fontcolor name="mod-class-declaration" default="identifier">
-            <font style="bold" />
+        <font style="bold" />
     </fontcolor>
     <fontcolor name="mod-interface-declaration" default="identifier">
-            <font style="bold" />
+        <font style="bold" />
     </fontcolor>
     <fontcolor name="mod-annotation-type-declaration" default="identifier">
-                <font style="bold" />
+        <font style="bold" />
     </fontcolor>
     <fontcolor name="mod-enum-declaration" default="identifier">
         <font style="bold" />
@@ -77,7 +78,7 @@
     <fontcolor name="mod-class" default="identifier"/>
     <fontcolor name="mod-record" default="identifier"/>
     <fontcolor name="mod-interface" default="identifier"/>
-    <fontcolor name="mod-annotation-type" default="identifier"/>
+    <fontcolor name="mod-annotation-type" foreColor="996600" default="identifier"/>
     <fontcolor name="mod-enum" default="identifier"/>
 
 

diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/semantic/ColoringManager.java b/java/java.editor/src/org/netbeans/modules/java/editor/semantic/ColoringManager.java
@@ -87,7 +87,7 @@ public final class ColoringManager {
         put("mod-deprecated", DEPRECATED);
         put("mod-undefined", UNDEFINED);
         put("mod-unused", UNUSED);
-        put("mod-keyword", KEYWORD);
+        //put("mod-keyword", KEYWORD);
         put("javadoc-identifier", JAVADOC_IDENTIFIER);
         put("mod-unindented-text-block", UNINDENTED_TEXT_BLOCK);
     }

diff --git a/java/java.lexer/src/org/netbeans/api/java/lexer/JavaTokenId.java b/java/java.lexer/src/org/netbeans/api/java/lexer/JavaTokenId.java
@@ -186,8 +186,8 @@ public enum JavaTokenId implements TokenId {
     /**@since 1.23*/
     ARROW("->", "operator"),
 
-    ELLIPSIS("...", "special"),
-    AT("@", "special"),
+    ELLIPSIS("...", "separator"), // Both '...' and '@' are separators in Java 8 language spec
+    AT("@", "annotation-separator"),
 
     WHITESPACE(null, "whitespace"),
     LINE_COMMENT(null, "comment"), // Token includes ending new-line

diff --git a/java/java.lexer/test/unit/src/org/netbeans/lib/java/lexer/JavaLanguageTest.java b/java/java.lexer/test/unit/src/org/netbeans/lib/java/lexer/JavaLanguageTest.java
@@ -56,7 +56,7 @@ public void testTokenIds() {
         Set testCats = language.tokenCategories();
         Collection cats = Arrays.asList(new String[] {
             "error", "identifier", "operator", "separator", "whitespace", "error", "comment",
-            "keyword", "string", "character", "number", "literal", "special", "keyword-directive"
+            "keyword", "string", "character", "number", "literal", "annotation-separator", "keyword-directive"
         });
         LexerTestUtilities.assertCollectionsEqual("Invalid categories", cats, testCats);
 

diff --git a/...latlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Java-tokenColorings.xml b/...latlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Java-tokenColorings.xml
@@ -21,6 +21,7 @@
 -->
 <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
 <fontscolors>
+    <fontcolor name="annotation-separator" foreColor="ffffafaf" default="separator"/>
     <fontcolor name="character" default="char"/>
     <fontcolor name="character-escape" default="character"><font style="bold"/></fontcolor>
     <fontcolor name="character-escape-invalid" default="character"><font style="italic"/></fontcolor>
@@ -34,7 +35,7 @@
     <fontcolor name="keyword-directive" default="keyword"/>
     <fontcolor name="literal" default="keyword"/>
     <fontcolor name="mod-abstract"/>
-    <fontcolor name="mod-annotation-type" default="identifier"/>
+    <fontcolor name="mod-annotation-type" foreColor="fffffafa" default="identifier"/>
     <fontcolor name="mod-annotation-type-declaration" default="identifier"><font style="bold"/></fontcolor>
     <fontcolor name="mod-class" default="identifier"/>
     <fontcolor name="mod-class-declaration" default="identifier"/>