Use protocol types from haxe.display

HaxeFoundation/haxe#8610
vshaxe · Aug 12, 2019 · f25af26 · f25af26
1 parent eaf1c3c
commit f25af26
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/.haxerc b/.haxerc
@@ -1,4 +1,4 @@
 {
-  "version": "019ea83",
+  "version": "2454b76",
   "resolveLibs": "scoped"
 }
diff --git a/server b/server
diff --git a/src/vshaxe/server/LanguageServer.hx b/src/vshaxe/server/LanguageServer.hx
@@ -1,15 +1,15 @@
 package vshaxe.server;
 
 import haxe.extern.Rest;
+import haxe.display.Protocol.Response;
+import haxe.display.Protocol.HaxeRequestMethod;
 import js.lib.Promise;
 import jsonrpc.Types;
 import vshaxe.display.DisplayArguments;
 import vshaxe.configuration.HaxeInstallation;
 import vshaxe.server.LanguageClient;
 import haxeLanguageServer.LanguageServerMethods;
 import haxeLanguageServer.Configuration.DisplayServerConfig;
-import haxeLanguageServer.protocol.Protocol.Response;
-import haxeLanguageServer.protocol.Protocol.HaxeRequestMethod;
 import languageServerProtocol.Types.DocumentUri;
 
 class LanguageServer {

diff --git a/src/vshaxe/view/cache/CacheTreeView.hx b/src/vshaxe/view/cache/CacheTreeView.hx
@@ -1,7 +1,7 @@
 package vshaxe.view.cache;
 
 import vshaxe.server.LanguageServer;
-import haxeLanguageServer.protocol.Server;
+import haxe.display.Server;
 import haxe.display.JsonModuleTypes.JsonTypePath;
 import haxe.ds.ArraySort;
 

diff --git a/src/vshaxe/view/cache/Node.hx b/src/vshaxe/view/cache/Node.hx
@@ -1,6 +1,6 @@
 package vshaxe.view.cache;
 
-import haxeLanguageServer.protocol.Server;
+import haxe.display.Server;
 
 enum Kind {
 	ServerRoot;

diff --git a/src/vshaxe/view/methods/MethodTreeView.hx b/src/vshaxe/view/methods/MethodTreeView.hx
@@ -2,7 +2,7 @@ package vshaxe.view.methods;
 
 import vshaxe.server.LanguageServer;
 import haxeLanguageServer.LanguageServerMethods;
-import haxeLanguageServer.protocol.Protocol.Timer;
+import haxe.display.Protocol.Timer;
 import js.lib.Date;
 
 enum abstract MethodTreeViewType(String) {

diff --git a/src/vshaxe/view/methods/Node.hx b/src/vshaxe/view/methods/Node.hx
@@ -1,6 +1,6 @@
 package vshaxe.view.methods;
 
-import haxeLanguageServer.protocol.Protocol.Timer;
+import haxe.display.Protocol.Timer;
 import haxeLanguageServer.LanguageServerMethods.MethodResultKind;
 
 class Node extends TreeItem {
+1 −1		.haxerc
+1 −1		src/haxeLanguageServer/Configuration.hx
+8 −8		src/haxeLanguageServer/Context.hx
+1 −1		src/haxeLanguageServer/LanguageServerMethods.hx
+1 −1		src/haxeLanguageServer/features/DeterminePackageFeature.hx
+1 −1		src/haxeLanguageServer/features/FindReferencesFeature.hx
+1 −1		src/haxeLanguageServer/features/GotoDefinitionFeature.hx
+1 −1		src/haxeLanguageServer/features/GotoTypeDefinitionFeature.hx
+2 −2		src/haxeLanguageServer/features/HoverFeature.hx
+4 −4		src/haxeLanguageServer/features/SignatureHelpFeature.hx
+1 −1		src/haxeLanguageServer/features/completion/CompletionContextData.hx
+7 −6		src/haxeLanguageServer/features/completion/CompletionFeature.hx
+2 −2		src/haxeLanguageServer/features/completion/ExpectedTypeCompletion.hx
+2 −2		src/haxeLanguageServer/features/completion/PostfixCompletion.hx
+1 −1		src/haxeLanguageServer/features/completion/SnippetCompletion.hx
+1 −1		src/haxeLanguageServer/features/documentSymbols/SymbolStack.hx
+3 −11		src/haxeLanguageServer/helper/FsPathHelper.hx
+1 −1		src/haxeLanguageServer/helper/ImportHelper.hx
+3 −2		src/haxeLanguageServer/import.hx
+13 −0		src/haxeLanguageServer/protocol/CompilerMetadata.hx
+0 −503		src/haxeLanguageServer/protocol/Display.hx
+2 −2		src/haxeLanguageServer/protocol/DisplayPrinter.hx
+3 −3		src/haxeLanguageServer/protocol/Helper.hx
+0 −77		src/haxeLanguageServer/protocol/Protocol.hx
+0 −119		src/haxeLanguageServer/protocol/Server.hx
+2 −2		src/haxeLanguageServer/server/HaxeServer.hx
+1 −1		test/TestMain.hx
+1 −1		test/haxeLanguageServer/protocol/HelperTest.hx
+2 −1		test/import.hx