refactor

Author: lucalabs-de

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

@@ -58,7 +58,10 @@ import Ide.Plugin.Cabal.Completion.Types
   ( ParseCabalCommonSections (ParseCabalCommonSections),
     ParseCabalFields (..),
     ParseCabalFile (..),
-    ParsePlanJson (..), BuildDependencyVersionMapping (..), Versioned(..),
+    ParsePlanJson (..), 
+    BuildDependencyVersionMapping (..), 
+    Positioned(..),
+    SimpleDependency(..)
   )
 import Ide.Plugin.Cabal.Completion.Types qualified as Types
 import Ide.Plugin.Cabal.Definition (gotoDefinition)
@@ -76,7 +79,6 @@ import Language.LSP.Protocol.Message qualified as LSP
 import Language.LSP.Protocol.Types
 import Language.LSP.VFS qualified as VFS
 import Text.Regex.TDFA
-import Debug.Trace
 import System.FilePath ((</>))
 
 data Log
@@ -449,15 +451,15 @@ lens state _plId clp = do
       planDeps <- runActionE "cabal.cabal-lens" state $ useE BuildDependencyVersionMapping planJson
 
       let lenses = Maybe.mapMaybe 
-           (\p@(PositionedDependency _ name) -> getCodeLens . Versioned p <$> Map.lookup name planDeps) 
-           positionedDeps
+            (\(Positioned pos name) -> getCodeLens . Positioned pos . Dependency name <$> Map.lookup name planDeps) 
+            positionedDeps
 
       pure $ InL lenses
     else
       pure $ InL []
   where
-    getCodeLens :: Versioned PositionedDependency -> CodeLens
-    getCodeLens (Versioned (PositionedDependency pos _) v) = 
+    getCodeLens :: Positioned SimpleDependency -> CodeLens
+    getCodeLens (Positioned pos (Dependency _ v)) = 
       let cPos = Types.cabalPositionToLSPPosition pos in CodeLens 
           { _range = Range cPos cPos
           , _command = Just $ mkActionlessCommand v 
@@ -490,16 +492,16 @@ hint state _plId clp =
     let planJson = toNormalizedFilePath $ rfp </> planJsonPath
     planDeps <- runActionE "cabal.cabal-lens" state $ useE BuildDependencyVersionMapping planJson
 
-    let hints = Maybe.mapMaybe 
-          (\p@(PositionedDependency _ name) -> getInlayHint . Versioned p <$> Map.lookup name planDeps) 
+    let lenses = Maybe.mapMaybe 
+          (\(Positioned pos name) -> getInlayHint . Positioned pos . Dependency name <$> Map.lookup name planDeps) 
           positionedDeps
 
-    pure $ InL hints
+    pure $ InL lenses
   else 
     pure $ InL []
   where     
-    getInlayHint :: Versioned PositionedDependency -> InlayHint
-    getInlayHint (Versioned (PositionedDependency pos _) v) = InlayHint 
+    getInlayHint :: Positioned SimpleDependency -> InlayHint
+    getInlayHint (Positioned pos (Dependency _ v)) = InlayHint 
           { _position = Types.cabalPositionToLSPPosition pos
           , _label = InL v
           , _kind = Nothing

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

@@ -184,10 +184,9 @@ data Apostrophe = Surrounded | LeftSide
 type PkgName = T.Text
 type PkgVersion = T.Text
 
-data PositionedDependency = PositionedDependency Syntax.Position PkgName
-    deriving Show
-    
-data Versioned a = Versioned a PkgVersion
+data SimpleDependency = Dependency PkgName PkgVersion
+
+data Positioned a = Positioned Syntax.Position a
 
 data DependencyInstances = DependencyInstances 
     { installPlan :: [DependencyInstance] }

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

@@ -3,7 +3,6 @@
 module Ide.Plugin.Cabal.Dependencies (
     DependencyInstance(..),
     DependencyInstances(..),
-    PositionedDependency(..),
     parseDeps,
     planJsonPath
 ) where
@@ -24,7 +23,7 @@ planJsonPath :: FilePath
 planJsonPath = "dist-newstyle" </> "cache" </> "plan" <.> "json" -- hard coded for now
 
 -- | Parses a Field that may contain dependencies
-parseDeps :: Syntax.Field Syntax.Position -> [PositionedDependency]
+parseDeps :: Syntax.Field Syntax.Position -> [Positioned PkgName]
 parseDeps (Syntax.Field (Syntax.Name _ "build-depends") fls) = concatMap mkPosDeps fls
 parseDeps (Syntax.Section _ _ fls) = concatMap parseDeps fls 
 parseDeps _ = []
@@ -35,8 +34,8 @@ packageRegex = "[a-zA-Z0-9_-]+"
 
 -- | Parses a single FieldLine of Cabal dependencies. Returns a list since a single line may
 -- contain multiple dependencies.
-mkPosDeps :: Syntax.FieldLine Syntax.Position -> [PositionedDependency]
-mkPosDeps (Syntax.FieldLine pos dep) = map (PositionedDependency pos) $ getPackageNames dep
+mkPosDeps :: Syntax.FieldLine Syntax.Position -> [Positioned PkgName]
+mkPosDeps (Syntax.FieldLine pos dep) = map (\n -> Positioned pos n) $ getPackageNames dep
     where 
         getPackageNames :: ByteString -> [T.Text]
         getPackageNames dep = getAllTextMatches (Encoding.decodeUtf8Lenient dep =~ packageRegex)