WIP

Author: VeryMilkyJoe

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

@@ -42,6 +42,7 @@ 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
@@ -286,9 +287,11 @@ 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 $ makeCompletionItems completions
+        pure $ J.List $ traceShowId $ makeCompletionItems completions
     | otherwise = pure $ J.List []
    where
     (Position linePos charPos) = VFS.cursorPos prefix

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

@@ -24,6 +24,7 @@ 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,10 +281,14 @@ filePathCompleter :: Completer
 filePathCompleter ctx = do
   let suffix = fromMaybe "" $ completionSuffix ctx
       complInfo = pathCompletionInfoFromCompletionContext ctx
+  traceShowM ("---> COMPLETER", complInfo)
   filePathCompletions <- listFileCompletions complInfo
+  traceShowM ("Completions: ", filePathCompletions) -- ("Completions: ",["MyLib.hs"])
+  traceShowM ("LeftOver", prefixLeftOver complInfo) -- ""
   let scored = Fuzzy.simpleFilter 1000 10 (prefixLeftOver complInfo) (map T.pack filePathCompletions)
+  --[Scored {score = 0, original = "MyLib.hs"}]
   forM
-    scored
+    (traceShowId scored)
     ( \compl' -> do
         let compl = Fuzzy.original compl'
         withSuffix <- addSuffixIfFilePath suffix compl
@@ -329,7 +334,7 @@ directoryCompleter ctx = do
 pathCompletionInfoFromCompletionContext :: CabalCompletionContext -> PathCompletionInfo
 pathCompletionInfoFromCompletionContext ctx = PathCompletionInfo
   { prefixLeftOver = dirNamePrefix
-  , prefixPathInfo = takeDirectory prefix
+  , prefixPathInfo = addTrailingPathSeparator $ takeDirectory prefix
   , cabalFilePathInfo = fp}
   where
     prefix = T.unpack $ completionPrefix ctx

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

@@ -128,21 +128,37 @@ filePathCompletionContextTests =
   testGroup
     "File Path Completion Context Tests"
     [ testCase "empty line" $ do
-      (completionSuffix $ getFilePathCompletionContext "" (simplePosPrefixInfo "   " 0 3)) @?= Just ""
-    , testCase "simple filepath" $ do
-      (completionSuffix $ getFilePathCompletionContext "" (simplePosPrefixInfo "   src/" 0 7)) @?= Just ""
+        let complContext = getFilePathCompletionContext "" (simplePosPrefixInfo "   " 0 3)
+        completionSuffix complContext @?= Just ""
+        completionPrefix complContext @?= ""
+      , testCase "simple filepath" $ do
+          let complContext = getFilePathCompletionContext "" (simplePosPrefixInfo "   src/" 0 7)
+          completionSuffix complContext @?= Just ""
+          completionPrefix complContext @?= "src/"
     , testCase "simple filepath - starting apostrophe" $ do
-      (completionSuffix $ getFilePathCompletionContext "" (simplePosPrefixInfo "   \"src/" 0 7)) @?= Just "\""
+        let complContext = getFilePathCompletionContext "" (simplePosPrefixInfo "   \"src/" 0 8)
+        completionSuffix complContext @?= Just "\""
+        completionPrefix complContext @?= "src/"
     , testCase "simple filepath - starting apostrophe, already closed" $ do
-      (completionSuffix $ getFilePathCompletionContext "" (simplePosPrefixInfo "   \"src/\"" 0 7)) @?= Just ""
+        let complContext = getFilePathCompletionContext "" (simplePosPrefixInfo "   \"src/\"" 0 8)
+        completionSuffix complContext @?= Just ""
+        completionPrefix complContext @?= "src/"
     , testCase "second filepath - starting apostrophe" $ do
-      (completionSuffix $ getFilePathCompletionContext "" (simplePosPrefixInfo "fp.txt \"src/" 0 12)) @?= Just "\""
+        let complContext = getFilePathCompletionContext "" (simplePosPrefixInfo "fp.txt \"src/" 0 12)
+        completionSuffix complContext @?= Just "\""
+        completionPrefix complContext @?= "src/"
     , testCase "middle filepath - starting apostrophe" $ do
-      (completionSuffix $ getFilePathCompletionContext "" (simplePosPrefixInfo "fp.txt \"src/ fp2.txt" 0 12)) @?= Just "\""
+        let complContext = getFilePathCompletionContext "" (simplePosPrefixInfo "fp.txt \"src/ fp2.txt" 0 12)
+        completionSuffix complContext @?= Just "\""
+        completionPrefix complContext @?= "src/"
     , testCase "middle filepath - starting apostrophe, already closed" $ do
-      (completionSuffix $ getFilePathCompletionContext "" (simplePosPrefixInfo "fp.t xt \"src\" fp2.txt" 0 12)) @?= Just ""
+        let complContext = getFilePathCompletionContext "" (simplePosPrefixInfo "fp.t xt \"src\" fp2.txt" 0 12)
+        completionSuffix complContext @?= Just ""
+        completionPrefix complContext @?= "src"
     , testCase "middle filepath - starting apostrophe, already closed" $ do
-      (completionSuffix $ getFilePathCompletionContext "" (simplePosPrefixInfo "\"fp.txt\" \"src fp2.txt" 0 11)) @?= Just "\""
+        let complContext = getFilePathCompletionContext "" (simplePosPrefixInfo "\"fp.txt\" \"src fp2.txt" 0 13)
+        completionSuffix complContext @?= Just "\""
+        completionPrefix complContext @?= "src"
     ]
  where
   simplePosPrefixInfo :: T.Text -> UInt -> UInt -> VFS.PosPrefixInfo
@@ -155,9 +171,10 @@ filePathCompletionContextTests =
       }
 
 pathCompleterTests :: TestTree
-pathCompleterTests = testGroup "Path Completer Tests"
+pathCompleterTests = testGroup "Path Completion Tests"
   [ fileCompleterTests
   , directoryCompleterTests
+  , pathCompletionInfoFromCompletionContextTests
   , testGroup "Helper - List File Completion Tests"
     [ testCase "Current Directory" $ do
         testDir <- getTestDir
@@ -190,6 +207,37 @@ pathCompleterTests = testGroup "Path Completer Tests"
     getTestDir = do
       cwd <- getCurrentDirectory
       pure $ cwd </> "test/testdata/filepath-completions/"
+    pathCompletionInfoFromCompletionContextTests :: TestTree
+    pathCompletionInfoFromCompletionContextTests = testGroup "Completion Info to Completion Context Tests"
+      [ testCase "Current Directory" $ do
+          testDir <- getTestDir
+          let complInfo = pathCompletionInfoFromCompletionContext $ simpleCabalCompletionContext "" testDir
+          prefixPathInfo complInfo @?= "./",
+        testCase "Current Directory - partly written next" $ do
+          testDir <- getTestDir
+          let complInfo = pathCompletionInfoFromCompletionContext $ simpleCabalCompletionContext "di" testDir
+          prefixPathInfo complInfo @?= "./"
+          prefixLeftOver complInfo @?= "di",
+        testCase "Current Directory - alternative writing" $ do
+          testDir <- getTestDir
+          let complInfo = pathCompletionInfoFromCompletionContext $ simpleCabalCompletionContext "./" testDir
+          prefixPathInfo complInfo @?= "./",
+        testCase "Subdirectory" $ do
+          testDir <- getTestDir
+          let complInfo = pathCompletionInfoFromCompletionContext $ simpleCabalCompletionContext "dir1/" testDir
+          prefixPathInfo complInfo @?= "dir1/"
+          prefixLeftOver complInfo @?= "",
+        testCase "Subdirectory - partly written next" $ do
+          testDir <- getTestDir
+          let complInfo = pathCompletionInfoFromCompletionContext $ simpleCabalCompletionContext "dir1/d" testDir
+          prefixPathInfo complInfo @?= "dir1/"
+          prefixLeftOver complInfo @?= "d",
+        testCase "Subdirectory - partly written next" $ do
+          testDir <- getTestDir
+          let complInfo = pathCompletionInfoFromCompletionContext $ simpleCabalCompletionContext "dir1/dir2/d" testDir
+          prefixPathInfo complInfo @?= "dir1/dir2/"
+          prefixLeftOver complInfo @?= "d"
+      ]
     directoryCompleterTests :: TestTree
     directoryCompleterTests = testGroup "Directory Completer Tests"
       [ testCase "Current Directory" $ do