Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve semantic token modifiers #1539

Merged
merged 1 commit into from
Oct 14, 2020
Merged

Improve semantic token modifiers #1539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JDTDelegateCommandHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
import org.eclipse.jdt.ls.core.internal.commands.DiagnosticsCommand;
import org.eclipse.jdt.ls.core.internal.commands.OrganizeImportsCommand;
import org.eclipse.jdt.ls.core.internal.commands.ProjectCommand;
import org.eclipse.jdt.ls.core.internal.commands.ProjectCommand.ClasspathOptions;
import org.eclipse.jdt.ls.core.internal.commands.SemanticTokensCommand;
import org.eclipse.jdt.ls.core.internal.commands.SourceAttachmentCommand;
import org.eclipse.jdt.ls.core.internal.commands.ProjectCommand.ClasspathOptions;
import org.eclipse.jdt.ls.core.internal.semantictokens.SemanticTokensLegend;
import org.eclipse.lsp4j.WorkspaceEdit;

public class JDTDelegateCommandHandler implements IDelegateCommandHandler {
Expand Down Expand Up @@ -74,7 +75,7 @@ public Object executeCommand(String commandId, List<Object> arguments, IProgress
case "java.project.provideSemanticTokens":
return SemanticTokensCommand.provide((String) arguments.get(0));
case "java.project.getSemanticTokensLegend":
return SemanticTokensCommand.getLegend();
return new SemanticTokensLegend();
case "java.project.import":
ProjectCommand.importProject(monitor);
return null;
Expand Down
14 changes: 3 additions & 11 deletions ...ipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/commands/SemanticTokensCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,14 @@

package org.eclipse.jdt.ls.core.internal.commands;

import java.util.Collections;

import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.ITypeRoot;
import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jdt.core.manipulation.CoreASTProvider;
import org.eclipse.jdt.ls.core.internal.JDTUtils;
import org.eclipse.jdt.ls.core.internal.JobHelpers;
import org.eclipse.jdt.ls.core.internal.handlers.DocumentLifeCycleHandler;
import org.eclipse.jdt.ls.core.internal.semantictokens.SemanticTokenManager;
import org.eclipse.jdt.ls.core.internal.semantictokens.SemanticTokens;
import org.eclipse.jdt.ls.core.internal.semantictokens.SemanticTokensLegend;
import org.eclipse.jdt.ls.core.internal.semantictokens.SemanticTokensVisitor;

public class SemanticTokensCommand {
Expand All @@ -36,20 +32,16 @@ public static SemanticTokens provide(String uri) {
private static SemanticTokens doProvide(String uri) {
ITypeRoot typeRoot = JDTUtils.resolveTypeRoot(uri);
if (typeRoot == null) {
return new SemanticTokens(Collections.emptyList());
return new SemanticTokens(new int[0]);
}

CompilationUnit root = CoreASTProvider.getInstance().getAST(typeRoot, CoreASTProvider.WAIT_YES, new NullProgressMonitor());
if (root == null) {
return new SemanticTokens(Collections.emptyList());
return new SemanticTokens(new int[0]);
}

SemanticTokensVisitor collector = new SemanticTokensVisitor(root, SemanticTokenManager.getInstance());
SemanticTokensVisitor collector = new SemanticTokensVisitor(root);
root.accept(collector);
return collector.getSemanticTokens();
}

public static SemanticTokensLegend getLegend() {
return SemanticTokenManager.getInstance().getLegend();
}
}
53 changes: 0 additions & 53 deletions ...jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/semantictokens/SemanticTokenManager.java
View file
Open in desktop

This file was deleted.

12 changes: 5 additions & 7 deletions ...lipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/semantictokens/SemanticTokens.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
*******************************************************************************/
package org.eclipse.jdt.ls.core.internal.semantictokens;

import java.util.List;

import org.eclipse.lsp4j.util.Preconditions;

public class SemanticTokens {
Expand Down Expand Up @@ -74,7 +72,7 @@ public class SemanticTokens {
* [ 2,5,3,0,3, 0,5,4,1,0, 3,2,7,2,0 ]
* ```
*/
private final List<Integer> data;
private final int[] data;

/**
* The result id of the tokens (optional).
Expand All @@ -83,20 +81,20 @@ public class SemanticTokens {
*/
private final String resultId;

public SemanticTokens(List<Integer> data) {
public SemanticTokens(int[] data) {
this(data, null);
}

public SemanticTokens(List<Integer> data, String resultId) {
this.data = Preconditions.<List<Integer>>checkNotNull(data, "data");
public SemanticTokens(int[] data, String resultId) {
this.data = Preconditions.<int[]>checkNotNull(data, "data");
this.resultId = resultId;
}

public String getResultId() {
return resultId;
}

public List<Integer> getData() {
public int[] getData() {
return data;
}
}
28 changes: 16 additions & 12 deletions ...jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/semantictokens/SemanticTokensLegend.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,26 @@
*******************************************************************************/
package org.eclipse.jdt.ls.core.internal.semantictokens;

import java.util.List;
import java.util.Arrays;

public class SemanticTokensLegend {
private final List<String> tokenTypes;
private final List<String> tokenModifiers;
public final class SemanticTokensLegend {
private final String[] tokenTypes;
private final String[] tokenModifiers;

public SemanticTokensLegend(List<String> tokenTypes, List<String> tokenModifiers){
this.tokenTypes = tokenTypes;
this.tokenModifiers = tokenModifiers;
};
public SemanticTokensLegend() {
tokenTypes = Arrays.stream(TokenType.values())
.map(TokenType::toString)
.toArray(String[]::new);
tokenModifiers = Arrays.stream(TokenModifier.values())
.map(TokenModifier::toString)
.toArray(String[]::new);
}

public List<String> getTokenTypes() {
return this.tokenTypes;
public String[] getTokenTypes() {
return tokenTypes;
}

public List<String> getTokenModifiers() {
return this.tokenModifiers;
public String[] getTokenModifiers() {
return tokenModifiers;
}
}
Loading