Fix file paths completing correctly in subdirectories

Author: VeryMilkyJoe

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

@@ -42,7 +42,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, traceShow, traceShowM)
 
 data Log
   = LogModificationTime NormalizedFilePath FileVersion
@@ -287,11 +286,9 @@ completion _ide _ complParams = do
   result (Just prefix) fp cnts
     | Just ctx <- context = do
         let completer = contextToCompleter ctx
-        traceShowM ("AHHHHHHHHHHHHH", completionContext)
         completions <- completer completionContext
-        traceShowM ("Final compls", completions)
         -- genPkgDesc <- readGenericPackageDescription silent fp
-        pure $ J.List $ traceShowId $ makeCompletionItems completions
+        pure $ J.List $ makeCompletionItems completions
     | otherwise = pure $ J.List []
    where
     (Position linePos charPos) = VFS.cursorPos prefix

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

@@ -24,7 +24,6 @@ import           System.Directory              (doesDirectoryExist,
                                                 doesFileExist, listDirectory)
 import           System.FilePath
 import qualified Text.Fuzzy.Parallel           as Fuzzy
-import Debug.Trace (traceShowM, traceShowId)
 
 -- | Takes information needed to build possible completion items
 -- and returns the list of possible completion items
@@ -280,31 +279,24 @@ filePathCompleter :: Completer
 filePathCompleter ctx = do
   let suffix = fromMaybe "" $ completionSuffix ctx
       complInfo = pathCompletionInfoFromCompletionContext ctx
-  traceShowM ("---> COMPLETER", complInfo)
   filePathCompletions <- listFileCompletions complInfo
-  traceShowM ("Completions: ", filePathCompletions)
-  traceShowM ("LeftOver", prefixLeftOver complInfo)
   let scored = Fuzzy.simpleFilter 1000 10 (prefixLeftOver complInfo) (map T.pack filePathCompletions)
   forM
-    (traceShowId scored)
+    scored
     ( \compl' -> do
         let compl = Fuzzy.original 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
+        pure $ makeCabalCompletionItem (completionRange ctx) fullFilePath fullFilePath
     )
 
  where
   -- | 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 
+    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
@@ -282,37 +282,37 @@ pathCompleterTests = testGroup "Path Completion Tests"
         testDir <- getTestDir
         completions <- filePathCompleter $ simpleCabalCompletionContext "" testDir
         let insertCompletions = map itemInsert completions
-        sort insertCompletions @?= [".hidden", "dir1/", "dir2/", "textfile.txt"],
+        sort insertCompletions @?= ["./.hidden", "./dir1/", "./dir2/", "./textfile.txt"],
       testCase "Current Directory - alternative writing" $ do
         testDir <- getTestDir
         completions <- filePathCompleter $ simpleCabalCompletionContext "./" testDir
         let insertCompletions = map itemInsert completions
-        sort insertCompletions @?= [".hidden", "dir1/", "dir2/", "textfile.txt"],
+        sort insertCompletions @?= ["./.hidden", "./dir1/", "./dir2/", "./textfile.txt"],
       testCase "Current Directory - hidden file start" $ do
         testDir <- getTestDir
         completions <- filePathCompleter $ simpleCabalCompletionContext "." testDir
         let insertCompletions = map itemInsert completions
-        sort insertCompletions @?= [".hidden", "textfile.txt"],
+        sort insertCompletions @?= ["./.hidden", "./textfile.txt"],
       testCase "Current Directory - incomplete directory path written" $ do
         testDir <- getTestDir
         completions <- filePathCompleter $ simpleCabalCompletionContext "di" testDir
         let insertCompletions = map itemInsert completions
-        sort insertCompletions @?= ["dir1/", "dir2/"],
+        sort insertCompletions @?= ["./dir1/", "./dir2/"],
       testCase "Current Directory - incomplete filepath written" $ do
         testDir <- getTestDir
         completions <- filePathCompleter $ simpleCabalCompletionContext "te" testDir
         let insertCompletions = map itemInsert completions
-        sort insertCompletions @?= ["textfile.txt"],
+        sort insertCompletions @?= ["./textfile.txt"],
       testCase "Subdirectory" $ do
         testDir <- getTestDir
         completions <- filePathCompleter $ simpleCabalCompletionContext "dir1/" testDir
         let insertCompletions = map itemInsert completions
-        sort insertCompletions @?= ["f1.txt", "f2.hs"],
+        sort insertCompletions @?= ["dir1/f1.txt", "dir1/f2.hs"],
       testCase "Subdirectory - incomplete filepath written" $ do
         testDir <- getTestDir
         completions <- filePathCompleter $ simpleCabalCompletionContext "dir2/dir3/MA" testDir
         let insertCompletions = map itemInsert completions
-        sort insertCompletions @?= ["MARKDOWN.md"],
+        sort insertCompletions @?= ["dir2/dir3/MARKDOWN.md"],
       testCase "Nonexistent directory" $ do
         testDir <- getTestDir
         completions <- filePathCompleter $ simpleCabalCompletionContext "dir2/dir4/" testDir