Currently range is not being set correctly for inserts

Author: VeryMilkyJoe

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

@@ -201,15 +201,12 @@ getFilePathCompletionContext dir prefixInfo =
   CabalCompletionContext
     { completionPrefix = filepathPrefix
     , completionSuffix = Just suffix
-    , completionRange = editRange
+    , completionRange = Range completionStart completionEnd
     , completionCabalFilePath = dir
     }
  where
-  (Position linePos charPos) = VFS.cursorPos prefixInfo
-  editRange =
-    Range
-      (Position linePos (fromIntegral charPos - fromIntegral (T.length filepathPrefix)))
-      (Position linePos charPos)
+  completionEnd = VFS.cursorPos prefixInfo
+  completionStart = Position (_line completionEnd) (_character completionEnd - (fromIntegral $ T.length filepathPrefix))
   filepathPrefix = T.takeWhileEnd (not . (`elem` stopConditionChars)) prevLineText
   (prevLineText, endLineText) = T.splitAt cursorColumn $ VFS.fullLine prefixInfo
   suffix = if (apostropheOrSpaceSeparator == '\"') && even (T.count "\"" endLineText) then "\"" else ""
@@ -246,15 +243,15 @@ buildCompletion completionItem =
 -- Completor API
 -- ----------------------------------------------------------------
 
-{- | Returns a CabalCompletionItem with the given range
-  and text to be inserted with no suffix to be written
+{- | Returns a CabalCompletionItem with the given starting position
+  and text to be inserted where the displayed text is the same as the inserted text
   after the inserted text
 -}
 makeSimpleCabalCompletionItem :: Range -> T.Text -> CabalCompletionItem
 makeSimpleCabalCompletionItem r txt = CabalCompletionItem txt Nothing r
 
-{- | Returns a CabalCompletionItem with the given range,
-  text to be inserted and suffix to be written after the inserted text
+{- | Returns a CabalCompletionItem with the given starting position,
+  text to be inserted and text to be displayed in completionsuggestion
 -}
 makeCabalCompletionItem :: Range -> T.Text -> T.Text -> CabalCompletionItem
 makeCabalCompletionItem r insertTxt displayTxt = CabalCompletionItem insertTxt (Just displayTxt) r
@@ -271,7 +268,9 @@ noopCompleter _ = pure []
 constantCompleter :: [T.Text] -> Completer
 constantCompleter completions ctxInfo = do
   let scored = Fuzzy.simpleFilter 1000 10 (completionPrefix ctxInfo) completions
-  pure $ map (makeSimpleCabalCompletionItem (completionRange ctxInfo) . Fuzzy.original) scored
+  let range = completionRange ctxInfo
+  pure $ map (makeSimpleCabalCompletionItem range . Fuzzy.original) scored
+
 
 {- | Completer to be used when a file path can be
   completed for the field, takes the file path of the directory to start from,
@@ -283,24 +282,29 @@ filePathCompleter ctx = do
       complInfo = pathCompletionInfoFromCompletionContext ctx
   traceShowM ("---> COMPLETER", complInfo)
   filePathCompletions <- listFileCompletions complInfo
-  traceShowM ("Completions: ", filePathCompletions) -- ("Completions: ",["MyLib.hs"])
-  traceShowM ("LeftOver", prefixLeftOver complInfo) -- ""
+  traceShowM ("Completions: ", filePathCompletions)
+  traceShowM ("LeftOver", prefixLeftOver complInfo)
   let scored = Fuzzy.simpleFilter 1000 10 (prefixLeftOver complInfo) (map T.pack filePathCompletions)
-  --[Scored {score = 0, original = "MyLib.hs"}]
   forM
     (traceShowId scored)
     ( \compl' -> do
         let compl = Fuzzy.original compl'
-        withSuffix <- addSuffixIfFilePath suffix compl
-        pure $ makeCabalCompletionItem (completionRange ctx) (T.pack (prefixPathInfo complInfo) <> "/" <> withSuffix) (T.pack (prefixPathInfo complInfo) <> "/" <> compl)
+        fullFilePath <- makeFullFilePath suffix compl complInfo
+        let charCursorPos = _character $ _end (completionRange ctx)
+        let newEndChar =  charCursorPos + ((fromIntegral $ T.length compl) - (fromIntegral (T.length $ prefixLeftOver complInfo)))
+        let actualRange = Range (_start (completionRange ctx)) (Position (_line $ _end (completionRange ctx)) newEndChar) 
+        pure $ makeCabalCompletionItem actualRange fullFilePath fullFilePath
     )
 
  where
-  addSuffixIfFilePath :: T.Text -> T.Text -> IO T.Text
-  addSuffixIfFilePath suffix' completion' = do
-    isFilePath <- doesFileExist $ T.unpack completion'
-    let completion = if isFilePath then T.append completion' suffix' else completion'
-    pure completion
+  -- | Takes a suffix and a text and returns filepath with the suffix
+  makeFullFilePath :: T.Text -> T.Text -> PathCompletionInfo -> IO T.Text
+  makeFullFilePath suffix' completion' complInfo = do
+    let fullPath' =  prefixPathInfo complInfo </> T.unpack completion'
+    traceShowM ("full path" ,fullPath')
+    isFilePath <- doesFileExist fullPath'
+    let fullPath = if isFilePath then fullPath' ++ T.unpack suffix' else fullPath'
+    pure $ T.pack fullPath 
 
 listFileCompletions :: PathCompletionInfo -> IO [FilePath]
 listFileCompletions complInfo = do

plugins/hls-cabal-plugin/test/Main.hs

@@ -200,7 +200,7 @@ pathCompleterTests = testGroup "Path Completion Tests"
       CabalCompletionContext
       { completionPrefix = prefix
       , completionSuffix = Nothing
-      , completionRange = Range (Position 0 0) (Position 0 0)
+      , completionRange = Range (Position 0 0) (Position 0 0) 
       , completionCabalFilePath = fp </> "test.cabal"
       }
     getTestDir :: IO FilePath