highlight type, constructor and package

Signed-off-by: Yan Zhang <[email protected]>
eclipse-jdtls · Apr 23, 2020 · cb41511 · cb41511
1 parent 1defde2
commit cb41511
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 9 deletions.
diff --git a/...dt.ls.core/src/org/eclipse/jdt/ls/core/internal/semantictokens/SemanticTokensVisitor.java b/...dt.ls.core/src/org/eclipse/jdt/ls/core/internal/semantictokens/SemanticTokensVisitor.java
@@ -18,10 +18,12 @@
 
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.ASTVisitor;
+import org.eclipse.jdt.core.dom.ClassInstanceCreation;
 import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.dom.IVariableBinding;
 import org.eclipse.jdt.core.dom.MethodInvocation;
 import org.eclipse.jdt.core.dom.SimpleName;
+import org.eclipse.jdt.core.dom.SimpleType;
 import org.eclipse.jdt.ls.core.internal.handlers.JsonRpcHelpers;
 import org.eclipse.jface.text.IDocument;
 
@@ -123,19 +125,21 @@ public boolean visit(SimpleName node) {
  TokenType tokenType = null;
  switch (binding.getKind()) {
  case IBinding.VARIABLE: {
- if (((IVariableBinding) binding).isField()) {
- tokenType = TokenType.VARIABLE;
- }
+ tokenType = TokenType.VARIABLE;
  break;
  }
  case IBinding.METHOD: {
- tokenType = TokenType.METHOD;
+ tokenType = TokenType.FUNCTION;
  break;
  }
  case IBinding.TYPE: {
  tokenType = TokenType.TYPE;
  break;
  }
+ case IBinding.PACKAGE: {
+ tokenType = TokenType.NAMESPACE;
+ break;
+ }
  default:
  break;
  }
@@ -145,13 +149,15 @@ public boolean visit(SimpleName node) {
  }
 
  switch (tokenType) {
- case METHOD:
- case VARIABLE: {
+ case FUNCTION:
+ case VARIABLE:
+ case MEMBER: {
  ITokenModifier[] modifiers = getModifiers(binding);
  addToken(node, tokenType, modifiers);
  break;
  }
  case TYPE:
+ case NAMESPACE:
  addToken(node, tokenType, NO_MODIFIERS);
  break;
  default:
@@ -178,4 +184,14 @@ private ITokenModifier[] getModifiers(IBinding binding) {
  return modifiers;
  }
 
+ @Override
+ public boolean visit(SimpleType node) {
+ ASTNode parent = node.getParent();
+ if (parent instanceof ClassInstanceCreation) { // For ClassInstanceCreation "new E()", "E" should be highlighted as 'function' instead of 'type'
+ addToken(node, TokenType.FUNCTION, NO_MODIFIERS);
+ return false;
+ }
+ return super.visit(node);
+ }
+
 }
diff --git a/...lipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/semantictokens/TokenModifiers.java b/...lipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/semantictokens/TokenModifiers.java
@@ -82,7 +82,7 @@ public boolean applies(IBinding binding) {
 
  @Override
  public String toString() {
- return "final";
+ return "readonly";
  }
  }
 

diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/semantictokens/TokenType.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/semantictokens/TokenType.java
@@ -14,9 +14,26 @@
 package org.eclipse.jdt.ls.core.internal.semantictokens;
 
 public enum TokenType {
+ COMMENT("comment"),
+ KEYWORD("keyword"),
+ STRING("string"),
+ NUMBER("number"),
+ REGEXP("regexp"),
+ OPERATOR("operator"),
+ NAMESPACE("namespace"),
+ TYPE("type"),
+ STRUCT("struct"),
+ CLASS("class"),
+ INTERFACE("interface"),
+ ENUM("enum"),
+ TYPE_PARAMETER("typeParameter"),
+ FUNCTION("function"),
+ MEMBER("member"),
+ PROPERTY("property"),
+ MACRO("macro"),
  VARIABLE("variable"),
- METHOD("method"),
- TYPE("type")
+ PARAMETER("parameter"),
+ LABEL("label")
  ;
 
  private String literalString;