File path completion now creates a correct text edit in cabal files

Author: VeryMilkyJoe

plugins/hls-cabal-plugin/src/Ide/Plugin/Cabal.hs

@@ -21,6 +21,7 @@ import           Data.Hashable
 import           Data.HashMap.Strict                    (HashMap)
 import qualified Data.HashMap.Strict                    as HashMap
 import qualified Data.List.NonEmpty                     as NE
+import qualified Data.Text                              as T
 import qualified Data.Text.Encoding                     as Encoding
 import qualified Data.Text.Utf16.Rope                   as Rope
 import           Data.Typeable
@@ -44,9 +45,6 @@ import qualified Language.LSP.Types                     as LSP
 import qualified Language.LSP.Types.Lens                as JL
 import           Language.LSP.VFS                       (VirtualFile)
 import qualified Language.LSP.VFS                       as VFS
-import Debug.Trace (traceShowId)
-
-
 data Log
   = LogModificationTime NormalizedFilePath FileVersion
   | LogShake Shake.Log
@@ -150,7 +148,8 @@ cabalRules recorder = do
     (t, mCabalSource) <- use_ GetFileContents file
     log' Debug $ LogModificationTime file t
     contents <- case mCabalSource of
-      Just sources -> pure $ Encoding.encodeUtf8 sources
+      Just sources ->
+        pure $ Encoding.encodeUtf8 sources
       Nothing -> do
         liftIO $ BS.readFile $ fromNormalizedFilePath file
 
@@ -286,11 +285,16 @@ completion _ide _ complParams = do
     result (Just pfix) fp cnts
       | Just ctx <- context  = do
         let completer = contextToCompleter "" ctx
-        completions <- completer $ VFS.prefixText $ (traceShowId pfix)
-        genPkgDesc <- readGenericPackageDescription silent fp
-        pure $ J.List $ makeCompletionItems pfix genPkgDesc completions
+        completions <- completer filePathPfix
+        -- genPkgDesc <- readGenericPackageDescription silent fp
+        pure $ J.List $ makeCompletionItems editRange completions
       | otherwise = pure $ J.List []
       where
-        pos = VFS.cursorPos pfix
-        context = getContext pos (Rope.lines $ cnts ^. VFS.file_text)
+        (Position linePos charPos) = VFS.cursorPos pfix
+        context = getContext (Position linePos charPos) (Rope.lines $ cnts ^. VFS.file_text)
+        filePathPfix = getFilePathCursorPrefix pfix
+        editRange =
+          Range
+            (Position linePos (fromIntegral charPos - fromIntegral (T.length filePathPfix)))
+            (Position linePos charPos)
 

plugins/hls-cabal-plugin/src/Ide/Plugin/Cabal/Completions.hs

@@ -84,8 +84,8 @@ contextToCompleter _dir (Stanza s, KeyWord kw) =
 -- | Takes info about the current cursor position, information
 --   about the handled cabal file and a set of possible keywords
 --   and creates completion suggestions that fit the current input from the given list
-makeCompletionItems :: VFS.PosPrefixInfo -> GenericPackageDescription -> [T.Text] -> [CompletionItem]
-makeCompletionItems _pfix _pkgDesc l = map buildCompletion l
+makeCompletionItems :: Range -> [T.Text] -> [CompletionItem]
+makeCompletionItems range l = map (buildCompletion range) l
 
 -- | Takes a position and a list of lines (representing a file)
 --   and returns the context of the current position
@@ -168,11 +168,11 @@ getFilePathCursorPrefix pfixInfo =
     stopConditionChars = apostropheOrSpaceSeparator : [',']
 
 
-buildCompletion :: T.Text -> J.CompletionItem
-buildCompletion label =
+buildCompletion ::Range -> T.Text -> J.CompletionItem
+buildCompletion range label =
   J.CompletionItem label (Just J.CiKeyword) Nothing Nothing
     Nothing Nothing Nothing Nothing Nothing Nothing Nothing
-    Nothing Nothing Nothing Nothing Nothing Nothing
+    Nothing (Just $ CompletionEditText (TextEdit range label)) Nothing Nothing Nothing Nothing
 
 -- ----------------------------------------------------------------
 -- Completor API