shorten request modules

lukaszsamson · lukaszsamson · commit 8272b8fbad24 · 2023-05-06T12:04:03.000+02:00
diff --git a/apps/language_server/lib/language_server/experimental/language_server.ex b/apps/language_server/lib/language_server/experimental/language_server.ex
@@ -1,5 +1,4 @@
 defmodule ElixirLS.LanguageServer.Experimental.LanguageServer do
-  alias ElixirLS.LanguageServer.Experimental.Protocol
 
   require Logger
 
@@ -58,7 +57,7 @@ defmodule ElixirLS.LanguageServer.Experimental.LanguageServer do
   defp load_handler_states do
     access_map =
       Map.merge(
-        Protocol.Requests.__meta__(:access),
+        LSP.Requests.__meta__(:access),
         LSP.Notifications.__meta__(:access)
       )
 
diff --git a/apps/language_server/lib/language_server/experimental/protocol/requests.ex b/apps/language_server/lib/language_server/experimental/protocol/requests.ex
@@ -1,4 +1,4 @@
-defmodule ElixirLS.LanguageServer.Experimental.Protocol.Requests do
+defmodule LSP.Requests do
   alias ElixirLS.LanguageServer.Experimental.Protocol.LspTypes
   alias ElixirLS.LanguageServer.Experimental.Protocol.Proto
   alias LSP.Types
diff --git a/apps/language_server/lib/language_server/experimental/provider/code_action/replace_remote_function.ex b/apps/language_server/lib/language_server/experimental/provider/code_action/replace_remote_function.ex
@@ -5,7 +5,7 @@ defmodule ElixirLS.LanguageServer.Experimental.Provider.CodeAction.ReplaceRemote
 
   alias ElixirLS.LanguageServer.Experimental.CodeMod
   alias ElixirLS.LanguageServer.Experimental.CodeMod.Ast
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests.CodeAction
+  alias LSP.Requests.CodeAction
   alias LSP.Types.CodeAction, as: CodeActionResult
   alias LSP.Types.Diagnostic
   alias LSP.Types.TextEdit
diff --git a/apps/language_server/lib/language_server/experimental/provider/code_action/replace_with_underscore.ex b/apps/language_server/lib/language_server/experimental/provider/code_action/replace_with_underscore.ex
@@ -5,7 +5,7 @@ defmodule ElixirLS.LanguageServer.Experimental.Provider.CodeAction.ReplaceWithUn
 
   alias ElixirLS.LanguageServer.Experimental.CodeMod
   alias ElixirLS.LanguageServer.Experimental.CodeMod.Ast
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests.CodeAction
+  alias LSP.Requests.CodeAction
   alias LSP.Types.CodeAction, as: CodeActionResult
   alias LSP.Types.Diagnostic
   alias LSP.Types.TextEdit
diff --git a/apps/language_server/lib/language_server/experimental/provider/handlers/code_action.ex b/apps/language_server/lib/language_server/experimental/provider/handlers/code_action.ex
@@ -2,7 +2,7 @@ defmodule ElixirLS.LanguageServer.Experimental.Provider.Handlers.CodeAction do
   alias ElixirLS.LanguageServer.Experimental.Provider.CodeAction.ReplaceRemoteFunction
   alias ElixirLS.LanguageServer.Experimental.Provider.CodeAction.ReplaceWithUnderscore
   alias ElixirLS.LanguageServer.Experimental.Provider.Env
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests
+  alias LSP.Requests
   alias ElixirLS.LanguageServer.Experimental.Protocol.Responses
 
   require Logger
diff --git a/apps/language_server/lib/language_server/experimental/provider/handlers/find_references.ex b/apps/language_server/lib/language_server/experimental/provider/handlers/find_references.ex
@@ -2,7 +2,7 @@ defmodule ElixirLS.LanguageServer.Experimental.Provider.Handlers.FindReferences
   alias ElixirLS.LanguageServer.Build
   alias ElixirLS.LanguageServer.Tracer
 
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests.FindReferences
+  alias LSP.Requests.FindReferences
   alias ElixirLS.LanguageServer.Experimental.Protocol.Responses
   alias LSP.Types.Location
   alias ElixirLS.LanguageServer.Experimental.SourceFile
diff --git a/apps/language_server/lib/language_server/experimental/provider/handlers/formatting.ex b/apps/language_server/lib/language_server/experimental/provider/handlers/formatting.ex
@@ -1,7 +1,7 @@
 defmodule ElixirLS.LanguageServer.Experimental.Provider.Handlers.Formatting do
   alias ElixirLS.LanguageServer.Experimental.Provider.Env
   alias ElixirLS.LanguageServer.Experimental.CodeMod.Format
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests
+  alias LSP.Requests
   alias ElixirLS.LanguageServer.Experimental.Protocol.Responses
   require Logger
 
diff --git a/apps/language_server/lib/language_server/experimental/provider/handlers/goto_definition.ex b/apps/language_server/lib/language_server/experimental/provider/handlers/goto_definition.ex
@@ -1,5 +1,5 @@
 defmodule ElixirLS.LanguageServer.Experimental.Provider.Handlers.GotoDefinition do
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests.GotoDefinition
+  alias LSP.Requests.GotoDefinition
   alias ElixirLS.LanguageServer.Experimental.Protocol.Responses
   alias ElixirLS.LanguageServer.Experimental.SourceFile
   alias ElixirLS.LanguageServer.Experimental.SourceFile.Conversions
diff --git a/apps/language_server/lib/language_server/experimental/provider/queue.ex b/apps/language_server/lib/language_server/experimental/provider/queue.ex
@@ -2,7 +2,7 @@ defmodule ElixirLS.LanguageServer.Experimental.Provider.Queue do
   defmodule State do
     alias ElixirLS.LanguageServer.Experimental.Provider.Env
     alias ElixirLS.LanguageServer.Experimental
-    alias ElixirLS.LanguageServer.Experimental.Protocol.Requests
+    alias LSP.Requests
     alias ElixirLS.LanguageServer.Experimental.Provider.Handlers
     alias ElixirLS.LanguageServer.Experimental.Provider.Queue
     alias ElixirLS.Utils.WireProtocol
@@ -141,7 +141,7 @@ defmodule ElixirLS.LanguageServer.Experimental.Provider.Queue do
 
   alias ElixirLS.LanguageServer.Experimental.Provider.Env
   alias ElixirLS.LanguageServer.Experimental.Server.Configuration
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests
+  alias LSP.Requests
 
   use GenServer
 
diff --git a/apps/language_server/lib/language_server/experimental/server.ex b/apps/language_server/lib/language_server/experimental/server.ex
@@ -1,7 +1,7 @@
 defmodule ElixirLS.LanguageServer.Experimental.Server do
   alias ElixirLS.LanguageServer.Experimental.Provider
   alias LSP.Notifications
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests
+  alias LSP.Requests
   alias ElixirLS.LanguageServer.Experimental.Protocol.Responses
   alias ElixirLS.LanguageServer.Experimental.Server.State
 
diff --git a/apps/language_server/lib/language_server/experimental/server/configuration.ex b/apps/language_server/lib/language_server/experimental/server/configuration.ex
@@ -5,8 +5,8 @@ defmodule ElixirLS.LanguageServer.Experimental.Server.Configuration do
   alias ElixirLS.LanguageServer.Experimental.Protocol.Id
   alias LSP.Notifications.DidChangeConfiguration
   alias ElixirLS.LanguageServer.Experimental.Protocol.Proto.LspTypes.Registration
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests.RegisterCapability
+  alias LSP.Requests
+  alias LSP.Requests.RegisterCapability
   alias ElixirLS.LanguageServer.Experimental.Server.Configuration.Support
 
   defstruct project: nil,
diff --git a/apps/language_server/lib/language_server/experimental/server/state.ex b/apps/language_server/lib/language_server/experimental/server/state.ex
@@ -9,7 +9,7 @@ defmodule ElixirLS.LanguageServer.Experimental.Server.State do
     DidSave
   }
 
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests.Initialize
+  alias LSP.Requests.Initialize
   alias LSP.Types.TextDocument
   alias ElixirLS.LanguageServer.Experimental.Server.Configuration
   alias ElixirLS.LanguageServer.Experimental.SourceFile
diff --git a/apps/language_server/test/experimental/protocol/requests_test.exs b/apps/language_server/test/experimental/protocol/requests_test.exs
@@ -1,5 +1,5 @@
-defmodule ElixirLS.LanguageServer.Experimental.Protocol.RequestsTest do
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests
+defmodule LSP.RequestsTest do
+  alias LSP.Requests
   import Requests
   use ExUnit.Case
 
diff --git a/apps/language_server/test/experimental/provider/code_action/replace_remote_function_test.exs b/apps/language_server/test/experimental/provider/code_action/replace_remote_function_test.exs
@@ -1,6 +1,6 @@
 defmodule ElixirLS.LanguageServer.Experimental.Provider.CodeAction.ReplaceRemoteFunctionTest do
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests.CodeAction, as: CodeActionRequest
+  alias LSP.Requests
+  alias LSP.Requests.CodeAction, as: CodeActionRequest
   alias LSP.Types.CodeAction
   alias LSP.Types.CodeAction, as: CodeActionReply
   alias LSP.Types.Diagnostic
diff --git a/apps/language_server/test/experimental/provider/code_action/replace_with_underscore_test.exs b/apps/language_server/test/experimental/provider/code_action/replace_with_underscore_test.exs
@@ -1,6 +1,6 @@
 defmodule ElixirLS.LanguageServer.Experimental.Provider.CodeAction.ReplaceWithUnderscoreTest do
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests.CodeAction, as: CodeActionRequest
+  alias LSP.Requests
+  alias LSP.Requests.CodeAction, as: CodeActionRequest
   alias LSP.Types.CodeAction
   alias LSP.Types.CodeAction, as: CodeActionReply
 
diff --git a/apps/language_server/test/experimental/provider/handlers/find_references_test.exs b/apps/language_server/test/experimental/provider/handlers/find_references_test.exs
@@ -1,6 +1,6 @@
 defmodule ElixirLS.Experimental.Provider.Handlers.FindReferencesTest do
   alias ElixirLS.LanguageServer.Build
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests.FindReferences
+  alias LSP.Requests.FindReferences
   alias ElixirLS.LanguageServer.Experimental.Protocol.Responses
   alias LSP.Types
   alias ElixirLS.LanguageServer.Experimental.Provider.Env
diff --git a/apps/language_server/test/experimental/provider/handlers/goto_definition_test.exs b/apps/language_server/test/experimental/provider/handlers/goto_definition_test.exs
@@ -1,5 +1,5 @@
 defmodule ElixirLS.Experimental.Provider.Handlers.GotoDefinitionTest do
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests.GotoDefinition
+  alias LSP.Requests.GotoDefinition
   alias ElixirLS.LanguageServer.Experimental.Protocol.Responses
   alias ElixirLS.LanguageServer.Experimental.Provider.Env
   alias ElixirLS.LanguageServer.Experimental.Provider.Handlers
diff --git a/apps/language_server/test/experimental/provider/queue_test.exs b/apps/language_server/test/experimental/provider/queue_test.exs
@@ -1,5 +1,5 @@
 defmodule ElixirLS.LanguageServer.Experimental.Provider.QueueTest do
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests
+  alias LSP.Requests
   alias ElixirLS.LanguageServer.Experimental.Protocol.Responses
   alias ElixirLS.LanguageServer.Experimental.Provider
   alias ElixirLS.LanguageServer.Experimental.Provider.Env
diff --git a/apps/language_server/test/experimental/server/configuration_test.exs b/apps/language_server/test/experimental/server/configuration_test.exs
@@ -3,7 +3,7 @@ defmodule ElixirLS.Experimental.Server.ConfigurationTest do
   alias ElixirLS.LanguageServer.Experimental.Project
   alias LSP.Notifications.DidChangeConfiguration
   alias ElixirLS.LanguageServer.Experimental.Protocol.Proto.LspTypes.Registration
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests.RegisterCapability
+  alias LSP.Requests.RegisterCapability
   alias ElixirLS.LanguageServer.Experimental.Server.Configuration
   alias ElixirLS.LanguageServer.SourceFile
   alias ElixirLS.LanguageServer.Test.Paths
diff --git a/apps/language_server/test/experimental/server/state_test.exs b/apps/language_server/test/experimental/server/state_test.exs
@@ -1,5 +1,5 @@
 defmodule ElixirLS.LanguageServer.Experimental.Server.StateTest do
-  alias ElixirLS.LanguageServer.Experimental.Protocol.Requests.Initialize
+  alias LSP.Requests.Initialize
   alias LSP.Notifications
   alias LSP.Types.TextDocument
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-defmodule ElixirLS.LanguageServer.Experimental.Protocol.Requests do`
	`1`	`+defmodule LSP.Requests do`
`2`	`2`	`alias ElixirLS.LanguageServer.Experimental.Protocol.LspTypes`
`3`	`3`	`alias ElixirLS.LanguageServer.Experimental.Protocol.Proto`
`4`	`4`	`alias LSP.Types`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ defmodule ElixirLS.LanguageServer.Experimental.Server.State do`
`9`	`9`	`DidSave`
`10`	`10`	`}`
`11`	`11`
`12`		`- alias ElixirLS.LanguageServer.Experimental.Protocol.Requests.Initialize`
	`12`	`+ alias LSP.Requests.Initialize`
`13`	`13`	`alias LSP.Types.TextDocument`
`14`	`14`	`alias ElixirLS.LanguageServer.Experimental.Server.Configuration`
`15`	`15`	`alias ElixirLS.LanguageServer.Experimental.SourceFile`