Rename test files

plugins/hls-class-plugin/src/Ide/Plugin/Class/CodeAction.hs

@@ -111,7 +111,11 @@ codeAction recorder state plId (CodeActionParams _ _ docId _ context) = pluginRe
                 $ use GetInstanceBindTypeSigs docPath
             implemented <- findImplementedMethods ast instancePosition
             logWith recorder Info (LogImplementedMethods cls implemented)
-            pure $ concatMap mkAction $ fmap (filter (\(a, _) -> a `notElem` implemented)) $ minDefToMethodGroups range sigs . classMinimalDef $ cls
+            pure
+                $ concatMap mkAction
+                $ fmap (filter (\(bind, _) -> bind `notElem` implemented))
+                $ minDefToMethodGroups range sigs
+                $ classMinimalDef cls
             where
                 range = diag ^. J.range
 

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

@@ -36,7 +36,7 @@ tests recorder = testGroup
   "class"
   [codeActionTests recorder , codeLensTests recorder]
 
--- codeActionTests :: TestTree
+codeActionTests :: Recorder (WithPriority Class.Log) -> TestTree
 codeActionTests recorder = testGroup
   "code actions"
   [ testCase "Produces addMinimalMethodPlaceholders code actions for one instance" $ do
@@ -70,22 +70,22 @@ codeActionTests recorder = testGroup
   , goldenWithClass recorder "Creates a placeholder for other two methods" "T6" "2" $ \(_:_:ghAction:_) -> do
       executeCodeAction ghAction
   , onlyRunForGhcVersions [GHC92] "Only ghc-9.2 enabled GHC2021 implicitly" $
-      goldenWithClass recorder "Don't insert pragma with GHC2021" "T16" "" $ \(_:eqWithSig:_) -> do
+      goldenWithClass recorder "Don't insert pragma with GHC2021" "InsertWithGHC2021Enabled" "" $ \(_:eqWithSig:_) -> do
         executeCodeAction eqWithSig
-  , goldenWithClass recorder "Insert pragma if not exist" "T7" "" $ \(_:eqWithSig:_) -> do
+  , goldenWithClass recorder "Insert pragma if not exist" "InsertWithoutPragma" "" $ \(_:eqWithSig:_) -> do
       executeCodeAction eqWithSig
-  , goldenWithClass recorder "Don't insert pragma if exist" "T8" "" $ \(_:eqWithSig:_) -> do
+  , goldenWithClass recorder "Don't insert pragma if exist" "InsertWithPragma" "" $ \(_:eqWithSig:_) -> do
       executeCodeAction eqWithSig
-  , goldenWithClass recorder "Only insert pragma once" "T9" "" $ \(_:multi:_) -> do
+  , goldenWithClass recorder "Only insert pragma once" "InsertPragmaOnce" "" $ \(_:multi:_) -> do
       executeCodeAction multi
   ]
 
--- codeLensTests :: TestTree
+codeLensTests :: Recorder (WithPriority Class.Log) -> TestTree
 codeLensTests recorder = testGroup
     "code lens"
     [ testCase "Has code lens" $ do
         runSessionWithServer (classPlugin recorder) testDataDir $ do
-            doc <- openDoc "T10.hs" "haskell"
+            doc <- openDoc "CodeLensSimple.hs" "haskell"
             lens <- getCodeLenses doc
             let titles = map (^. J.title) $ mapMaybe (^. J.command) lens
             liftIO $ titles @?=
@@ -97,25 +97,27 @@ codeLensTests recorder = testGroup
             sendConfigurationChanged
                 $ toJSON
                 $ def { Plugin.plugins = [("class", def { plcConfig = "typelensOn" .= False })] }
-            doc <- openDoc "T10.hs" "haskell"
+            doc <- openDoc "CodeLensSimple.hs" "haskell"
             lens <- getCodeLenses doc
             let titles = map (^. J.title) $ mapMaybe (^. J.command) lens
             liftIO $ titles @?= []
-    , goldenCodeLens recorder "Apply code lens" "T10" 1
-    , goldenCodeLens recorder "Apply code lens for local class" "T11" 0
-    , goldenCodeLens recorder "Apply code lens on the same line" "T12" 0
-    , goldenCodeLens recorder "Don't insert pragma while existing" "T13" 0
+    , goldenCodeLens recorder "Apply code lens" "CodeLensSimple" 1
+    , goldenCodeLens recorder "Apply code lens for local class" "LocalClassDefine" 0
+    , goldenCodeLens recorder "Apply code lens on the same line" "Inline" 0
+    , goldenCodeLens recorder "Don't insert pragma while existing" "CodeLensWithPragma" 0
     , onlyRunForGhcVersions [GHC92] "Only ghc-9.2 enabled GHC2021 implicitly" $
-        goldenCodeLens recorder "Don't insert pragma while GHC2021 enabled" "T14" 0
-    , goldenCodeLens recorder "Qualified name" "T15" 0
+        goldenCodeLens recorder "Don't insert pragma while GHC2021 enabled" "CodeLensWithGHC2021" 0
+    , goldenCodeLens recorder "Qualified name" "Qualified" 0
+    , goldenCodeLens recorder "Type family" "TypeFamily" 0
     ]
 
 _CACodeAction :: Prism' (Command |? CodeAction) CodeAction
 _CACodeAction = prism' InR $ \case
   InR action -> Just action
   _          -> Nothing
 
--- goldenCodeLens :: TestName -> FilePath -> Int -> TestTree
+
+goldenCodeLens :: Recorder (WithPriority Class.Log) -> TestName -> FilePath -> Int -> TestTree
 goldenCodeLens recorder title path idx =
     goldenWithHaskellDoc (classPlugin recorder) title testDataDir path "expected" "hs" $ \doc -> do
         lens <- getCodeLenses doc

plugins/hls-class-plugin/test/testdata/T10.expected.hs → plugins/hls-class-plugin/test/testdata/CodeLensSimple.expected.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE InstanceSigs #-}
-module T10 where
+module CodeLensSimple where
 
 data A
 instance Eq A where

plugins/hls-class-plugin/test/testdata/T10.hs → plugins/hls-class-plugin/test/testdata/CodeLensSimple.hs

@@ -1,4 +1,4 @@
-module T10 where
+module CodeLensSimple where
 
 data A
 instance Eq A where

plugins/hls-class-plugin/test/testdata/T14.expected.hs → plugins/hls-class-plugin/test/testdata/CodeLensWithGHC2021.expected.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE GHC2021 #-}
-module T14 where
+module CodeLensWithGHC2021 where
 
 data A
 instance Eq A where

plugins/hls-class-plugin/test/testdata/T14.hs → plugins/hls-class-plugin/test/testdata/CodeLensWithGHC2021.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE GHC2021 #-}
-module T14 where
+module CodeLensWithGHC2021 where
 
 data A
 instance Eq A where

plugins/hls-class-plugin/test/testdata/T13.expected.hs → plugins/hls-class-plugin/test/testdata/CodeLensWithPragma.expected.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE InstanceSigs #-}
-module T13 where
+module CodeLensWithPragma where
 
 data A
 instance Eq A where

plugins/hls-class-plugin/test/testdata/T13.hs → plugins/hls-class-plugin/test/testdata/CodeLensWithPragma.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE InstanceSigs #-}
-module T13 where
+module CodeLensWithPragma where
 
 data A
 instance Eq A where

plugins/hls-class-plugin/test/testdata/Inline.expected.hs

@@ -0,0 +1,6 @@
+{-# LANGUAGE InstanceSigs #-}
+module Inline where
+
+data A
+instance Eq A where (==) :: A -> A -> Bool
+                    (==) = _

plugins/hls-class-plugin/test/testdata/T12.hs → plugins/hls-class-plugin/test/testdata/Inline.hs

@@ -1,4 +1,4 @@
-module T12 where
+module Inline where
 
 data A
 instance Eq A where (==) = _

plugins/hls-class-plugin/test/testdata/T9.expected.hs → plugins/hls-class-plugin/test/testdata/InsertPragmaOnce.expected.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE InstanceSigs #-}
-module T9 where
+module InsertPragmaOnce where
 
 data A aaa
 instance Applicative A where

plugins/hls-class-plugin/test/testdata/T9.hs → plugins/hls-class-plugin/test/testdata/InsertPragmaOnce.hs

@@ -1,4 +1,4 @@
-module T9 where
+module InsertPragmaOnce where
 
 data A aaa
 instance Applicative A

plugins/hls-class-plugin/test/testdata/T12.expected.hs → plugins/hls-class-plugin/test/testdata/InsertWithGHC2021Enabled.expected.hs

@@ -1,5 +1,5 @@
-{-# LANGUAGE InstanceSigs #-}
-module T12 where
+{-# LANGUAGE GHC2021#-}
+module InsertWithGHC2021Enabled where
 
 data A
 instance Eq A where

plugins/hls-class-plugin/test/testdata/T16.hs → plugins/hls-class-plugin/test/testdata/InsertWithGHC2021Enabled.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE GHC2021#-}
-module T16 where
+module InsertWithGHC2021Enabled where
 
 data A
 instance Eq A

plugins/hls-class-plugin/test/testdata/T7.expected.hs → plugins/hls-class-plugin/test/testdata/InsertWithPragma.expected.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE InstanceSigs #-}
-module T7 where
+module InsertWithPragma where
 
 data A
 instance Eq A where

plugins/hls-class-plugin/test/testdata/T8.hs → plugins/hls-class-plugin/test/testdata/InsertWithPragma.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE InstanceSigs #-}
-module T8 where
+module InsertWithPragma where
 
 data A
 instance Eq A

plugins/hls-class-plugin/test/testdata/T8.expected.hs → plugins/hls-class-plugin/test/testdata/InsertWithoutPragma.expected.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE InstanceSigs #-}
-module T8 where
+module InsertWithoutPragma where
 
 data A
 instance Eq A where

plugins/hls-class-plugin/test/testdata/InsertWithoutPragma.hs

@@ -0,0 +1,4 @@
+module InsertWithoutPragma where
+
+data A
+instance Eq A

plugins/hls-class-plugin/test/testdata/T11.expected.hs → plugins/hls-class-plugin/test/testdata/LocalClassDefine.expected.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE InstanceSigs #-}
-module T11 where
+module LocalClassDefine where
 
 data A
 class F a where

plugins/hls-class-plugin/test/testdata/T11.hs → plugins/hls-class-plugin/test/testdata/LocalClassDefine.hs

@@ -1,4 +1,4 @@
-module T11 where
+module LocalClassDefine where
 
 data A
 class F a where

plugins/hls-class-plugin/test/testdata/Qualified.expected.hs

@@ -0,0 +1,10 @@
+{-# LANGUAGE InstanceSigs #-}
+module Qualified where
+import qualified QualifiedA
+
+class F a where
+    f :: a
+
+instance F QualifiedA.A where
+  f :: QualifiedA.A
+  f = undefined

plugins/hls-class-plugin/test/testdata/Qualified.hs

@@ -0,0 +1,8 @@
+module Qualified where
+import qualified QualifiedA
+
+class F a where
+    f :: a
+
+instance F QualifiedA.A where
+  f = undefined

plugins/hls-class-plugin/test/testdata/QualifiedA.hs

@@ -0,0 +1,3 @@
+module QualifiedA where
+
+data A

plugins/hls-class-plugin/test/testdata/TypeFamily.expected.hs

@@ -0,0 +1,11 @@
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE InstanceSigs #-}
+module TypeFamily where
+
+class F a where
+  type Elem a
+  f :: Elem a -> a
+
+instance Eq a => F [a] where
+  f :: Eq a => Elem [a] -> [a]
+  f = _

plugins/hls-class-plugin/test/testdata/TypeFamily.hs

@@ -0,0 +1,9 @@
+{-# LANGUAGE TypeFamilies #-}
+module TypeFamily where
+
+class F a where
+  type Elem a
+  f :: Elem a -> a
+
+instance Eq a => F [a] where
+  f = _

plugins/hls-class-plugin/test/testdata/hie.yaml

@@ -1,3 +1,3 @@
 cradle:
   direct:
-    arguments: [-XHaskell2010, T15A]
+    arguments: [-XHaskell2010, QualifiedA]