Remove lsp4j

20 files changed, 24 insertions, 66 deletions

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index ed8f470..4c714c6 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -3,7 +3,5 @@ module javacs {
     requires jdk.compiler;
     requires java.logging;
     requires java.xml;
-    requires org.eclipse.lsp4j;
     requires gson;
-    requires org.eclipse.lsp4j.jsonrpc;
 }
diff --git a/src/main/java/org/javacs/CompileBatch.java b/src/main/java/org/javacs/CompileBatch.java
index 88a728d..9acd669 100644
--- a/src/main/java/org/javacs/CompileBatch.java
+++ b/src/main/java/org/javacs/CompileBatch.java
@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
 import javax.lang.model.element.*;
 import javax.tools.Diagnostic;
 import javax.tools.JavaFileObject;
-import org.eclipse.lsp4j.Range;
+import org.javacs.lsp.*;
 
 public class CompileBatch {
     private final JavaCompilerService parent;
diff --git a/src/main/java/org/javacs/CompileFile.java b/src/main/java/org/javacs/CompileFile.java
index d928508..7437864 100644
--- a/src/main/java/org/javacs/CompileFile.java
+++ b/src/main/java/org/javacs/CompileFile.java
@@ -9,7 +9,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.logging.Logger;
 import javax.lang.model.element.*;
-import org.eclipse.lsp4j.Range;
+import org.javacs.lsp.*;
 
 public class CompileFile {
     private final JavaCompilerService parent;
diff --git a/src/main/java/org/javacs/CustomLanguageClient.java b/src/main/java/org/javacs/CustomLanguageClient.java
index 9cce272..3eae781 100644
--- a/src/main/java/org/javacs/CustomLanguageClient.java
+++ b/src/main/java/org/javacs/CustomLanguageClient.java
@@ -1,7 +1,6 @@
 package org.javacs;
 
-import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
-import org.eclipse.lsp4j.services.LanguageClient;
+import org.javacs.lsp.*;
 
 public interface CustomLanguageClient extends LanguageClient {
 
diff --git a/src/main/java/org/javacs/JavaLanguageServer.java b/src/main/java/org/javacs/JavaLanguageServer.java
index 4dfacec..cb60c95 100644
--- a/src/main/java/org/javacs/JavaLanguageServer.java
+++ b/src/main/java/org/javacs/JavaLanguageServer.java
@@ -14,8 +14,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.logging.Logger;
 import javax.tools.Diagnostic;
 import javax.tools.JavaFileObject;
-import org.eclipse.lsp4j.*;
-import org.eclipse.lsp4j.services.*;
+import org.javacs.lsp.*;
 
 class JavaLanguageServer implements LanguageServer {
     private static final Logger LOG = Logger.getLogger("main");
diff --git a/src/main/java/org/javacs/JavaTextDocumentService.java b/src/main/java/org/javacs/JavaTextDocumentService.java
index a1cc285..6d7dd30 100644
--- a/src/main/java/org/javacs/JavaTextDocumentService.java
+++ b/src/main/java/org/javacs/JavaTextDocumentService.java
@@ -1,6 +1,5 @@
 package org.javacs;
 
-import com.google.gson.JsonArray;
 import com.google.gson.JsonPrimitive;
 import com.sun.source.doctree.DocCommentTree;
 import com.sun.source.doctree.DocTree;
@@ -10,6 +9,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.lang.annotation.Annotation;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -19,9 +19,7 @@ import java.util.function.Function;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import javax.lang.model.element.*;
-import org.eclipse.lsp4j.*;
-import org.eclipse.lsp4j.jsonrpc.messages.Either;
-import org.eclipse.lsp4j.services.TextDocumentService;
+import org.javacs.lsp.*;
 
 class JavaTextDocumentService implements TextDocumentService {
     private final JavaLanguageServer server;
diff --git a/src/main/java/org/javacs/JavaWorkspaceService.java b/src/main/java/org/javacs/JavaWorkspaceService.java
index 998fb5c..f605396 100644
--- a/src/main/java/org/javacs/JavaWorkspaceService.java
+++ b/src/main/java/org/javacs/JavaWorkspaceService.java
@@ -8,12 +8,7 @@ import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import org.eclipse.lsp4j.DidChangeConfigurationParams;
-import org.eclipse.lsp4j.DidChangeWatchedFilesParams;
-import org.eclipse.lsp4j.ExecuteCommandParams;
-import org.eclipse.lsp4j.SymbolInformation;
-import org.eclipse.lsp4j.WorkspaceSymbolParams;
-import org.eclipse.lsp4j.services.WorkspaceService;
+import org.javacs.lsp.*;
 
 class JavaWorkspaceService implements WorkspaceService {
     private static final Logger LOG = Logger.getLogger("main");
diff --git a/src/main/java/org/javacs/Main.java b/src/main/java/org/javacs/Main.java
index f4f88ed..985c17b 100644
--- a/src/main/java/org/javacs/Main.java
+++ b/src/main/java/org/javacs/Main.java
@@ -3,7 +3,7 @@ package org.javacs;
 import java.util.concurrent.Executors;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.eclipse.lsp4j.jsonrpc.*;
+import org.javacs.lsp.*;
 
 public class Main {
     private static final Logger LOG = Logger.getLogger("main");
diff --git a/src/main/java/org/javacs/ParseFile.java b/src/main/java/org/javacs/ParseFile.java
index 0f7780a..ff9b4cd 100644
--- a/src/main/java/org/javacs/ParseFile.java
+++ b/src/main/java/org/javacs/ParseFile.java
@@ -9,8 +9,9 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.logging.Logger;
-import org.eclipse.lsp4j.Position;
-import org.eclipse.lsp4j.Range;
+import org.javacs.lsp.*;
+
+
 
 public class ParseFile {
     private final JavaCompilerService parent;
diff --git a/src/main/java/org/javacs/Parser.java b/src/main/java/org/javacs/Parser.java
index 8ac98b1..13cf305 100644
--- a/src/main/java/org/javacs/Parser.java
+++ b/src/main/java/org/javacs/Parser.java
@@ -17,11 +17,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.tools.*;
-import org.eclipse.lsp4j.Location;
-import org.eclipse.lsp4j.Position;
-import org.eclipse.lsp4j.Range;
-import org.eclipse.lsp4j.SymbolInformation;
-import org.eclipse.lsp4j.SymbolKind;
+import org.javacs.lsp.*;
 
 class Parser {
 
diff --git a/src/test/java/org/javacs/CodeLensTest.java b/src/test/java/org/javacs/CodeLensTest.java
index 9383de8..47f265d 100644
--- a/src/test/java/org/javacs/CodeLensTest.java
+++ b/src/test/java/org/javacs/CodeLensTest.java
@@ -9,9 +9,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.StringJoiner;
 import java.util.concurrent.ExecutionException;
-import org.eclipse.lsp4j.CodeLens;
-import org.eclipse.lsp4j.CodeLensParams;
-import org.eclipse.lsp4j.TextDocumentIdentifier;
+import org.javacs.lsp.*;
 import org.junit.Test;
 
 public class CodeLensTest {
diff --git a/src/test/java/org/javacs/CompletionsBase.java b/src/test/java/org/javacs/CompletionsBase.java
index 63d2634..8ad10a8 100644
--- a/src/test/java/org/javacs/CompletionsBase.java
+++ b/src/test/java/org/javacs/CompletionsBase.java
@@ -6,10 +6,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.eclipse.lsp4j.CompletionItem;
-import org.eclipse.lsp4j.CompletionParams;
-import org.eclipse.lsp4j.Position;
-import org.eclipse.lsp4j.TextDocumentIdentifier;
+import org.javacs.lsp.*;
 
 public class CompletionsBase {
     protected static final Logger LOG = Logger.getLogger("main");
diff --git a/src/test/java/org/javacs/CompletionsTest.java b/src/test/java/org/javacs/CompletionsTest.java
index 1a8171d..864ff24 100644
--- a/src/test/java/org/javacs/CompletionsTest.java
+++ b/src/test/java/org/javacs/CompletionsTest.java
@@ -5,7 +5,7 @@ import static org.junit.Assert.*;
 
 import com.google.common.collect.Lists;
 import java.util.stream.Collectors;
-import org.eclipse.lsp4j.CompletionItem;
+import org.javacs.lsp.*;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/src/test/java/org/javacs/FindReferencesTest.java b/src/test/java/org/javacs/FindReferencesTest.java
index 4cf0d2a..9356ded 100644
--- a/src/test/java/org/javacs/FindReferencesTest.java
+++ b/src/test/java/org/javacs/FindReferencesTest.java
@@ -8,9 +8,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Logger;
-import org.eclipse.lsp4j.Position;
-import org.eclipse.lsp4j.ReferenceParams;
-import org.eclipse.lsp4j.TextDocumentIdentifier;
+import org.javacs.lsp.*;
 import org.junit.Test;
 
 public class FindReferencesTest {
diff --git a/src/test/java/org/javacs/GotoTest.java b/src/test/java/org/javacs/GotoTest.java
index 7bb295a..ac60efc 100644
--- a/src/test/java/org/javacs/GotoTest.java
+++ b/src/test/java/org/javacs/GotoTest.java
@@ -8,10 +8,7 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
-import org.eclipse.lsp4j.Location;
-import org.eclipse.lsp4j.Position;
-import org.eclipse.lsp4j.TextDocumentIdentifier;
-import org.eclipse.lsp4j.TextDocumentPositionParams;
+import org.javacs.lsp.*;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/src/test/java/org/javacs/LanguageServerFixture.java b/src/test/java/org/javacs/LanguageServerFixture.java
index 514ab74..6f0a481 100644
--- a/src/test/java/org/javacs/LanguageServerFixture.java
+++ b/src/test/java/org/javacs/LanguageServerFixture.java
@@ -5,12 +5,7 @@ import java.nio.file.Paths;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import java.util.logging.Logger;
-import org.eclipse.lsp4j.Diagnostic;
-import org.eclipse.lsp4j.InitializeParams;
-import org.eclipse.lsp4j.MessageActionItem;
-import org.eclipse.lsp4j.MessageParams;
-import org.eclipse.lsp4j.PublishDiagnosticsParams;
-import org.eclipse.lsp4j.ShowMessageRequestParams;
+import org.javacs.lsp.*;
 
 class LanguageServerFixture {
 
diff --git a/src/test/java/org/javacs/SearchTest.java b/src/test/java/org/javacs/SearchTest.java
index 16b51fc..ace86e8 100644
--- a/src/test/java/org/javacs/SearchTest.java
+++ b/src/test/java/org/javacs/SearchTest.java
@@ -12,7 +12,7 @@ import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import org.eclipse.lsp4j.*;
+import org.javacs.lsp.*;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/src/test/java/org/javacs/SignatureHelpTest.java b/src/test/java/org/javacs/SignatureHelpTest.java
index 125e6fb..6019021 100644
--- a/src/test/java/org/javacs/SignatureHelpTest.java
+++ b/src/test/java/org/javacs/SignatureHelpTest.java
@@ -5,10 +5,7 @@ import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
-import org.eclipse.lsp4j.Position;
-import org.eclipse.lsp4j.SignatureHelp;
-import org.eclipse.lsp4j.TextDocumentIdentifier;
-import org.eclipse.lsp4j.TextDocumentPositionParams;
+import org.javacs.lsp.*;
 import org.junit.Test;
 
 public class SignatureHelpTest {
diff --git a/src/test/java/org/javacs/SymbolUnderCursorTest.java b/src/test/java/org/javacs/SymbolUnderCursorTest.java
index 92c2ee4..ca04883 100644
--- a/src/test/java/org/javacs/SymbolUnderCursorTest.java
+++ b/src/test/java/org/javacs/SymbolUnderCursorTest.java
@@ -5,9 +5,7 @@ import static org.junit.Assert.*;
 
 import java.util.StringJoiner;
 import java.util.concurrent.ExecutionException;
-import org.eclipse.lsp4j.Position;
-import org.eclipse.lsp4j.TextDocumentIdentifier;
-import org.eclipse.lsp4j.TextDocumentPositionParams;
+import org.javacs.lsp.*;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/src/test/test-project/workspace/src/org/javacs/example/Bad.java b/src/test/test-project/workspace/src/org/javacs/example/Bad.java
index f21f237..3fdf663 100644
--- a/src/test/test-project/workspace/src/org/javacs/example/Bad.java
+++ b/src/test/test-project/workspace/src/org/javacs/example/Bad.java
@@ -1,18 +1,10 @@
 package org.javacs.example;
 
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.TreeScanner;
-import org.eclipse.lsp4j.Location;
-import org.eclipse.lsp4j.LocationImpl;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Stream;
 
+
+
+
 public class Bad {
     // This is a really evil input that causes the Attr phase to throw a null pointer exception
     public void test(Stream<?> stream) {