Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups: more type-checked representation of LanguageId

Browse Source
This commit is contained in:
Kris De Volder
2017-04-20 13:57:56 -07:00
parent e83059c1b4
commit 5284d96533
15 changed files with 149 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
View File

@@ -46,6 +46,7 @@ import org.eclipse.lsp4j.TextDocumentPositionParams;
import org.eclipse.lsp4j.TextEdit;
import org.eclipse.lsp4j.jsonrpc.messages.Either;
import org.junit.Assert;
import org.springframework.ide.vscode.commons.util.text.LanguageId;
import com.google.common.collect.ImmutableList;
@@ -102,11 +103,11 @@ public class Editor {
private int selectionStart;
private Set<String> ignoredTypes;
private String languageId;
private LanguageId languageId;
public Editor(LanguageServerHarness harness, String contents, String languageId) throws Exception {
public Editor(LanguageServerHarness harness, String contents, LanguageId languageId) throws Exception {
this.harness = harness;
this.languageId = new String(languageId); // So we can catch bugs that use == for langauge id comparison.
this.languageId = LanguageId.of(languageId.getId()); // So we can catch bugs that use == for langauge id comparison.
EditorState state = new EditorState(contents);
this.document = harness.openDocument(harness.createWorkingCopy(state.documentContents, this.languageId));
this.selectionStart = state.selectionStart;
@@ -651,7 +652,7 @@ public class Editor {
return new Range(document.toPosition(start), document.toPosition(start+focusSnippet.length()));
}
public String getLanguageId() {
public LanguageId getLanguageId() {
return languageId;
}

18
headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
View File

@@ -72,7 +72,6 @@ import org.eclipse.lsp4j.WorkspaceClientCapabilites;
import org.eclipse.lsp4j.WorkspaceEdit;
import org.eclipse.lsp4j.jsonrpc.messages.Either;
import org.eclipse.lsp4j.services.LanguageClientAware;
import org.springframework.ide.vscode.commons.languageserver.LanguageIds;
import org.springframework.ide.vscode.commons.languageserver.ProgressParams;
import org.springframework.ide.vscode.commons.languageserver.STS4LanguageClient;
import org.springframework.ide.vscode.commons.languageserver.completion.DocumentEdits;
@@ -80,6 +79,7 @@ import org.springframework.ide.vscode.commons.languageserver.util.LanguageServer
import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
import org.springframework.ide.vscode.commons.util.Assert;
import org.springframework.ide.vscode.commons.util.ExceptionUtil;
import org.springframework.ide.vscode.commons.util.text.LanguageId;
import org.springframework.ide.vscode.commons.util.text.TextDocument;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -94,7 +94,7 @@ public class LanguageServerHarness {
private Random random = new Random();
private Callable<? extends SimpleLanguageServer> factory;
private String defaultLanguageId;
private LanguageId defaultLanguageId;
private SimpleLanguageServer server;
@@ -105,13 +105,13 @@ public class LanguageServerHarness {
private List<Editor> activeEditors = new ArrayList<>();
public LanguageServerHarness(Callable<? extends SimpleLanguageServer> factory, String defaultLanguageId) {
public LanguageServerHarness(Callable<? extends SimpleLanguageServer> factory, LanguageId defaultLanguageId) {
this.factory = factory;
this.defaultLanguageId = defaultLanguageId;
}
public LanguageServerHarness(Callable<? extends SimpleLanguageServer> factory) throws Exception {
this(factory, LanguageIds.PLAINTEXT);
this(factory, LanguageId.PLAINTEXT);
}
public synchronized TextDocumentInfo getOrReadFile(File file, String languageId) throws Exception {
@@ -137,7 +137,7 @@ public class LanguageServerHarness {
private synchronized TextDocumentItem setDocumentContent(String uri, String newContent) {
TextDocumentInfo o = documents.get(uri);
TextDocumentItem n = new TextDocumentItem();
n.setLanguageId(o.getLanguageId());
n.setLanguageId(o.getLanguageId().getId());
n.setText(newContent);
n.setVersion(o.getVersion()+1);
n.setUri(o.getUri());
@@ -149,7 +149,7 @@ public class LanguageServerHarness {
return Charset.forName("utf8");
}
protected String getDefaultLanguageId() {
protected LanguageId getDefaultLanguageId() {
return defaultLanguageId;
}
@@ -397,15 +397,15 @@ public class LanguageServerHarness {
return newEditor(getDefaultLanguageId(), contents);
}
public synchronized Editor newEditor(String languageId, String contents) throws Exception {
public synchronized Editor newEditor(LanguageId languageId, String contents) throws Exception {
Editor editor = new Editor(this, contents, languageId);
activeEditors.add(editor);
return editor;
}
public synchronized TextDocumentInfo createWorkingCopy(String contents, String languageId) throws Exception {
public synchronized TextDocumentInfo createWorkingCopy(String contents, LanguageId languageId) throws Exception {
TextDocumentItem doc = new TextDocumentItem();
doc.setLanguageId(languageId);
doc.setLanguageId(languageId.getId());
doc.setText(contents);
doc.setUri(createTempUri());
doc.setVersion(getFirstVersion());

5
headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/TextDocumentInfo.java
View File

@@ -20,6 +20,7 @@ import org.eclipse.lsp4j.Position;
import org.eclipse.lsp4j.Range;
import org.eclipse.lsp4j.TextDocumentIdentifier;
import org.eclipse.lsp4j.TextDocumentItem;
import org.springframework.ide.vscode.commons.util.text.LanguageId;
/**
* Deprecated, we should get rid of this class and use {@link TextDocument}.
@@ -37,8 +38,8 @@ public class TextDocumentInfo {
this.document = document;
}
public String getLanguageId() {
return getDocument().getLanguageId();
public LanguageId getLanguageId() {
return LanguageId.of(getDocument().getLanguageId());
}
public int getVersion() {