Switch language service interface to use flat string as file URI

pine-vm · Dec 22, 2024 · 72fea14 · 72fea14
1 parent 3c66f01
commit 72fea14
Show file tree

Hide file tree

Showing 12 changed files with 401 additions and 505 deletions.
diff --git a/implement/example-apps/elm-editor/src/Frontend/Main.elm b/implement/example-apps/elm-editor/src/Frontend/Main.elm
@@ -1395,7 +1395,8 @@ updateToProvideHoverRequest request workspaceStateBefore =
             in
             updateForRequestToLanguageService
                 (LanguageServiceInterface.ProvideHoverRequest
-                    { filePathOpenedInEditor = directoryPath ++ [ fileName ]
+                    { filePathOpenedInEditor =
+                        String.join "/" (List.concat [ directoryPath, [ fileName ] ])
                     , positionLineNumber = request.positionLineNumber
                     , positionColumn = request.positionColumn
                     }
@@ -1421,7 +1422,8 @@ updateToProvideDefinitionRequest request workspaceStateBefore =
             in
             updateForRequestToLanguageService
                 (LanguageServiceInterface.ProvideDefinitionRequest
-                    { filePathOpenedInEditor = directoryPath ++ [ fileName ]
+                    { filePathOpenedInEditor =
+                        String.join "/" (List.concat [ directoryPath, [ fileName ] ])
                     , positionLineNumber = request.positionLineNumber
                     , positionColumn = request.positionColumn
                     }
@@ -1445,7 +1447,8 @@ updateToProvideCompletionItemsRequest request workspaceStateBefore =
             in
             updateForRequestToLanguageService
                 (LanguageServiceInterface.ProvideCompletionItemsRequest
-                    { filePathOpenedInEditor = directoryPath ++ [ fileName ]
+                    { filePathOpenedInEditor =
+                        String.join "/" (List.concat [ directoryPath, [ fileName ] ])
                     , cursorLineNumber = request.cursorLineNumber
                     , cursorColumn = request.cursorColumn
                     }
@@ -4281,7 +4284,7 @@ provideDefinitionInMonacoEditorCmd locationsInFiles =
         monacoLocations =
             List.map
                 (\locationInFile ->
-                    { uri = monacoUriForFilePath locationInFile.filePath
+                    { uri = monacoUriForFilePath [ locationInFile.filePath ]
                     , range = locationInFile.range
                     }
                 )

diff --git a/implement/example-apps/elm-editor/src/LanguageService.elm b/implement/example-apps/elm-editor/src/LanguageService.elm
diff --git a/implement/example-apps/elm-editor/src/LanguageServiceInterface.elm b/implement/example-apps/elm-editor/src/LanguageServiceInterface.elm
@@ -38,12 +38,12 @@ type alias RequestInWorkspace =
 
 
 type Request
-    = AddFileRequest (List String) FileTreeBlobNode
-    | DeleteFileRequest (List String)
+    = AddFileRequest String FileTreeBlobNode
+    | DeleteFileRequest String
     | ProvideHoverRequest ProvideHoverRequestStruct
     | ProvideCompletionItemsRequest ProvideCompletionItemsRequestStruct
     | ProvideDefinitionRequest ProvideDefinitionRequestStruct
-    | TextDocumentSymbolRequest (List String)
+    | TextDocumentSymbolRequest String
     | TextDocumentReferencesRequest ProvideReferencesRequestStruct
     | TextDocumentRenameRequest RenameParams
 
@@ -59,14 +59,14 @@ type Response
 
 
 type alias ProvideHoverRequestStruct =
-    { filePathOpenedInEditor : List String
+    { filePathOpenedInEditor : String
     , positionLineNumber : Int
     , positionColumn : Int
     }
 
 
 type alias ProvideCompletionItemsRequestStruct =
-    { filePathOpenedInEditor : List String
+    { filePathOpenedInEditor : String
     , cursorLineNumber : Int
     , cursorColumn : Int
     }
@@ -81,15 +81,15 @@ type alias ProvideReferencesRequestStruct =
 
 
 type alias RenameParams =
-    { filePath : List String
+    { filePath : String
     , positionLineNumber : Int
     , positionColumn : Int
     , newName : String
     }
 
 
 type alias LocationUnderFilePath =
-    { filePath : List String
+    { filePath : String
     , range : Frontend.MonacoEditor.MonacoRange
     }
 
@@ -130,7 +130,7 @@ type alias WorkspaceEdit =
 
 
 type alias TextDocumentEdit =
-    { filePath : List String
+    { filePath : String
     , edits : List TextEdit
     }