Remove getCompletionPrefix (haskell#552)

* Remove getCompletionPrefix * Format
soulomoon · Apr 8, 2024 · 3a2b2d9 · 3a2b2d9
1 parent c51075f
commit 3a2b2d9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 84 deletions.
diff --git a/lsp/ChangeLog.md b/lsp/ChangeLog.md
@@ -10,6 +10,9 @@
   support for client-initiated progress or not.
 - The server now dynamically registers for `workspace/didChangeConfiguration` 
   notifications, to ensure that newer clients continue to send them.
+- Removed `getCompletionPrefix` from the `VFS` module. This is specific to completing
+  Haskell identifiers and doesn't belong here. It has already been moved to `ghcide`
+  some time ago.
 
 ## 2.3.0.0
 

diff --git a/lsp/src/Language/LSP/VFS.hs b/lsp/src/Language/LSP/VFS.hs
@@ -50,8 +50,6 @@ module Language.LSP.VFS (
 
   -- * manipulating the file contents
   rangeLinesFromVfs,
-  PosPrefixInfo (..),
-  getCompletionPrefix,
 
   -- * for tests
   applyChanges,
@@ -63,19 +61,16 @@ import Colog.Core (LogAction (..), Severity (..), WithSeverity (..), (<&))
 import Control.Lens hiding (parts, (<.>))
 import Control.Monad
 import Control.Monad.State
-import Data.Char (isAlphaNum, isUpper)
 import Data.Foldable (traverse_)
 import Data.Hashable
 import Data.Int (Int32)
 import Data.List
 import Data.Map.Strict qualified as Map
-import Data.Maybe
 import Data.Ord
 import Data.Row
 import Data.Text (Text)
 import Data.Text qualified as T
 import Data.Text.IO qualified as T
-import Data.Text.Lines as Char (Position (..))
 import Data.Text.Prettyprint.Doc hiding (line)
 import Data.Text.Utf16.Lines as Utf16 (Position (..))
 import Data.Text.Utf16.Rope.Mixed (Rope)
@@ -471,64 +466,9 @@ rangeToCodePointRange :: VirtualFile -> J.Range -> Maybe CodePointRange
 rangeToCodePointRange vFile (J.Range b e) =
   CodePointRange <$> positionToCodePointPosition vFile b <*> positionToCodePointPosition vFile e
 
--- ---------------------------------------------------------------------
-
--- TODO:AZ:move this to somewhere sane
-
--- | Describes the line at the current cursor position
-data PosPrefixInfo = PosPrefixInfo
-  { fullLine :: !T.Text
-  -- ^ The full contents of the line the cursor is at
-  , prefixModule :: !T.Text
-  -- ^ If any, the module name that was typed right before the cursor position.
-  --  For example, if the user has typed "Data.Maybe.from", then this property
-  --  will be "Data.Maybe"
-  , prefixText :: !T.Text
-  -- ^ The word right before the cursor position, after removing the module part.
-  -- For example if the user has typed "Data.Maybe.from",
-  -- then this property will be "from"
-  , cursorPos :: !J.Position
-  -- ^ The cursor position
-  }
-  deriving (Show, Eq)
-
-getCompletionPrefix :: (Monad m) => J.Position -> VirtualFile -> m (Maybe PosPrefixInfo)
-getCompletionPrefix pos@(J.Position l c) (VirtualFile _ _ ropetext) =
-  return $ Just $ fromMaybe (PosPrefixInfo "" "" "" pos) $ do
-    -- Maybe monad
-    let lastMaybe [] = Nothing
-        lastMaybe xs = Just $ last xs
-
-    let curRope = fst $ Rope.splitAtLine 1 $ snd $ Rope.splitAtLine (fromIntegral l) ropetext
-    beforePos <- Rope.toText . fst <$> Rope.utf16SplitAt (fromIntegral c) curRope
-    curWord <-
-      if
-        | T.null beforePos -> Just ""
-        | T.last beforePos == ' ' -> Just "" -- don't count abc as the curword in 'abc '
-        | otherwise -> lastMaybe (T.words beforePos)
-
-    let parts =
-          T.split (== '.') $
-            T.takeWhileEnd (\x -> isAlphaNum x || x `elem` ("._'" :: String)) curWord
-    case reverse parts of
-      [] -> Nothing
-      (x : xs) -> do
-        let modParts =
-              dropWhile (not . isUpper . T.head) $
-                reverse $
-                  filter (not . T.null) xs
-            modName = T.intercalate "." modParts
-        -- curRope is already a single line, but it may include an enclosing '\n'
-        let curLine = T.dropWhileEnd (== '\n') $ Rope.toText curRope
-        return $ PosPrefixInfo curLine modName x pos
-
--- ---------------------------------------------------------------------
-
 rangeLinesFromVfs :: VirtualFile -> J.Range -> T.Text
 rangeLinesFromVfs (VirtualFile _ _ ropetext) (J.Range (J.Position lf _cf) (J.Position lt _ct)) = r
  where
   (_, s1) = Rope.splitAtLine (fromIntegral lf) ropetext
   (s2, _) = Rope.splitAtLine (fromIntegral (lt - lf)) s1
   r = Rope.toText s2
-
--- ---------------------------------------------------------------------
diff --git a/lsp/test/VspSpec.hs b/lsp/test/VspSpec.hs
@@ -278,27 +278,3 @@ vspSpec = do
       codePointPositionToPosition vfile (CodePointPosition 2 1) `shouldBe` Nothing
       -- Greater line than max line
       codePointPositionToPosition vfile (CodePointPosition 3 0) `shouldBe` Nothing
-
-    -- ---------------------------------
-
-    it "getCompletionPrefix" $ do
-      let
-        orig =
-          T.unlines
-            [ "{-# ings #-}"
-            , "import Data.List"
-            ]
-      pp4 <- getCompletionPrefix (J.Position 0 4) (vfsFromText orig)
-      pp4 `shouldBe` Just (PosPrefixInfo "{-# ings #-}" "" "" (J.Position 0 4))
-
-      pp5 <- getCompletionPrefix (J.Position 0 5) (vfsFromText orig)
-      pp5 `shouldBe` Just (PosPrefixInfo "{-# ings #-}" "" "i" (J.Position 0 5))
-
-      pp6 <- getCompletionPrefix (J.Position 0 6) (vfsFromText orig)
-      pp6 `shouldBe` Just (PosPrefixInfo "{-# ings #-}" "" "in" (J.Position 0 6))
-
-      pp14 <- getCompletionPrefix (J.Position 1 14) (vfsFromText orig)
-      pp14 `shouldBe` Just (PosPrefixInfo "import Data.List" "Data" "Li" (J.Position 1 14))
-
-      pp00 <- getCompletionPrefix (J.Position 0 0) (vfsFromText orig)
-      pp00 `shouldBe` Just (PosPrefixInfo "{-# ings #-}" "" "" (J.Position 0 0))