WIP: Tests

Author: batkot

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

@@ -5,8 +5,6 @@ module Ide.Plugin.Cabal.Dependencies (dependencyVersionHints, collectPackageDepe
 
 import           Data.Array                        ((!))
 import           Data.ByteString                   (ByteString)
-import qualified Data.Char                         as Char
-import qualified Data.List                         as List
 import qualified Data.Maybe                        as Maybe
 import qualified Data.Text                         as T
 import qualified Data.Text.Encoding                as Encoding
@@ -21,7 +19,6 @@ import qualified Distribution.Parsec.Position      as Syntax
 import qualified Ide.Plugin.Cabal.Completion.Types as Types
 import           Language.LSP.Protocol.Types       (CodeLens (..), Command (..),
                                                     InlayHint (..),
-                                                    InlayHintLabelPart (InlayHintLabelPart),
                                                     Range (..), type (|?) (..))
 import           Text.Regex.TDFA                   (Regex, makeRegex,
                                                     matchAllText)
@@ -43,16 +40,15 @@ dependencyVersionHints cabalFields = fmap mkHint . collectPackageDependencyVersi
   where
     mkHint :: (Syntax.Position, Version) -> InlayHint
     mkHint (pos, dependencyVersion) =
-      let mkInlayHintLabelPart = InlayHintLabelPart (" (" <> printVersion dependencyVersion <> ")") Nothing Nothing Nothing
-      in  InlayHint { _position = Types.cabalPositionToLSPPosition pos
-                    , _label = InR $ pure mkInlayHintLabelPart
-                    , _kind = Nothing
-                    , _textEdits = Nothing
-                    , _tooltip = Nothing
-                    , _paddingLeft = Nothing
-                    , _paddingRight = Nothing
-                    , _data_ = Nothing
-                    }
+      InlayHint { _position = Types.cabalPositionToLSPPosition pos
+                , _label = InL $ " (" <> printVersion dependencyVersion <> ")"
+                , _kind = Nothing
+                , _textEdits = Nothing
+                , _tooltip = Nothing
+                , _paddingLeft = Nothing
+                , _paddingRight = Nothing
+                , _data_ = Nothing
+                }
 
 collectPackageDependencyVersions :: [Syntax.Field Syntax.Position] -> HscEnv -> [(Syntax.Position, Version)]
 collectPackageDependencyVersions cabalFields hscEnv = cabalFields >>= collectPackageVersions

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

@@ -175,7 +175,6 @@ cabalAddTests =
           , _data_ = Nothing
         }
 
-
     generatePackageYAMLTestSession :: FilePath -> Session ()
     generatePackageYAMLTestSession haskellFile  = do
         hsdoc <- openDoc haskellFile "haskell"

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

@@ -9,7 +9,7 @@ module Main (
 import           CabalAdd                        (cabalAddTests)
 import           Completer                       (completerTests)
 import           Context                         (contextTests)
-import           Control.Lens                    ((^.))
+import           Control.Lens                    ((^.), preview, _Just, view)
 import           Control.Lens.Fold               ((^?))
 import           Control.Monad                   (guard)
 import qualified Data.ByteString                 as BS
@@ -39,6 +39,7 @@ main = do
             , codeActionTests
             , gotoDefinitionTests
             , hoverTests
+            , codeLensTests
             ]
 
 -- ------------------------------------------------------------------------
@@ -259,3 +260,27 @@ hoverOnDependencyTests = testGroup "Hover Dependency"
                 h <- getHover doc pos
                 liftIO $ assertBool ("Found hover `" <> show h <> "`") $ Maybe.isNothing h
                 closeDoc doc
+
+-- ----------------------------------------------------------------------------
+-- Code Lens Tests
+-- ----------------------------------------------------------------------------
+
+codeLensTests :: TestTree
+codeLensTests = testGroup "Code Lens"
+    [ dependencyVersionLenses
+    , dependencyVersionInlayHints
+    ]
+    where
+        dependencyVersionLenses =
+            runCabalTestCaseSession "Code Lens Test" "hover" $ do
+                doc <- openDoc "hover-deps.cabal" "cabal"
+                lenses <- getCodeLenses doc
+                liftIO $ map (preview $ L.command . _Just . L.title) lenses @?= [Just "Refresh..."]
+                closeDoc doc
+        dependencyVersionInlayHints =
+            runCabalTestCaseSession "InlayHints tests" "hover" $ do
+                doc <- openDoc "hover-deps.cabal" "cabal"
+                let range = Range (Position 0 0) (Position 1000 1000)
+                hints <- getInlayHints doc range
+                liftIO $ map (view L.label) hints @?= [InL " (4.19.2.0)"]
+                closeDoc doc