Skip to content

Commit a4e23fe

Browse files
July541July541
committed
Rename test files
1 parent 558cd9d commit a4e23fe

30 files changed

+91
-59
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,11 @@ codeAction recorder state plId (CodeActionParams _ _ docId _ context) = pluginRe
111111
$ use GetInstanceBindTypeSigs docPath
112112
implemented <- findImplementedMethods ast instancePosition
113113
logWith recorder Info (LogImplementedMethods cls implemented)
114-
pure $ concatMap mkAction $ fmap (filter (\(a, _) -> a `notElem` implemented)) $ minDefToMethodGroups range sigs . classMinimalDef $ cls
114+
pure
115+
$ concatMap mkAction
116+
$ fmap (filter (\(bind, _) -> bind `notElem` implemented))
117+
$ minDefToMethodGroups range sigs
118+
$ classMinimalDef cls
115119
where
116120
range = diag ^. J.range
117121

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

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ tests recorder = testGroup
3636
"class"
3737
[codeActionTests recorder , codeLensTests recorder]
3838

39-
-- codeActionTests :: TestTree
39+
codeActionTests :: Recorder (WithPriority Class.Log) -> TestTree
4040
codeActionTests recorder = testGroup
4141
"code actions"
4242
[ testCase "Produces addMinimalMethodPlaceholders code actions for one instance" $ do
@@ -70,22 +70,22 @@ codeActionTests recorder = testGroup
7070
, goldenWithClass recorder "Creates a placeholder for other two methods" "T6" "2" $ \(_:_:ghAction:_) -> do
7171
executeCodeAction ghAction
7272
, onlyRunForGhcVersions [GHC92] "Only ghc-9.2 enabled GHC2021 implicitly" $
73-
goldenWithClass recorder "Don't insert pragma with GHC2021" "T16" "" $ \(_:eqWithSig:_) -> do
73+
goldenWithClass recorder "Don't insert pragma with GHC2021" "InsertWithGHC2021Enabled" "" $ \(_:eqWithSig:_) -> do
7474
executeCodeAction eqWithSig
75-
, goldenWithClass recorder "Insert pragma if not exist" "T7" "" $ \(_:eqWithSig:_) -> do
75+
, goldenWithClass recorder "Insert pragma if not exist" "InsertWithoutPragma" "" $ \(_:eqWithSig:_) -> do
7676
executeCodeAction eqWithSig
77-
, goldenWithClass recorder "Don't insert pragma if exist" "T8" "" $ \(_:eqWithSig:_) -> do
77+
, goldenWithClass recorder "Don't insert pragma if exist" "InsertWithPragma" "" $ \(_:eqWithSig:_) -> do
7878
executeCodeAction eqWithSig
79-
, goldenWithClass recorder "Only insert pragma once" "T9" "" $ \(_:multi:_) -> do
79+
, goldenWithClass recorder "Only insert pragma once" "InsertPragmaOnce" "" $ \(_:multi:_) -> do
8080
executeCodeAction multi
8181
]
8282

83-
-- codeLensTests :: TestTree
83+
codeLensTests :: Recorder (WithPriority Class.Log) -> TestTree
8484
codeLensTests recorder = testGroup
8585
"code lens"
8686
[ testCase "Has code lens" $ do
8787
runSessionWithServer (classPlugin recorder) testDataDir $ do
88-
doc <- openDoc "T10.hs" "haskell"
88+
doc <- openDoc "CodeLensSimple.hs" "haskell"
8989
lens <- getCodeLenses doc
9090
let titles = map (^. J.title) $ mapMaybe (^. J.command) lens
9191
liftIO $ titles @?=
@@ -97,25 +97,27 @@ codeLensTests recorder = testGroup
9797
sendConfigurationChanged
9898
$ toJSON
9999
$ def { Plugin.plugins = [("class", def { plcConfig = "typelensOn" .= False })] }
100-
doc <- openDoc "T10.hs" "haskell"
100+
doc <- openDoc "CodeLensSimple.hs" "haskell"
101101
lens <- getCodeLenses doc
102102
let titles = map (^. J.title) $ mapMaybe (^. J.command) lens
103103
liftIO $ titles @?= []
104-
, goldenCodeLens recorder "Apply code lens" "T10" 1
105-
, goldenCodeLens recorder "Apply code lens for local class" "T11" 0
106-
, goldenCodeLens recorder "Apply code lens on the same line" "T12" 0
107-
, goldenCodeLens recorder "Don't insert pragma while existing" "T13" 0
104+
, goldenCodeLens recorder "Apply code lens" "CodeLensSimple" 1
105+
, goldenCodeLens recorder "Apply code lens for local class" "LocalClassDefine" 0
106+
, goldenCodeLens recorder "Apply code lens on the same line" "Inline" 0
107+
, goldenCodeLens recorder "Don't insert pragma while existing" "CodeLensWithPragma" 0
108108
, onlyRunForGhcVersions [GHC92] "Only ghc-9.2 enabled GHC2021 implicitly" $
109-
goldenCodeLens recorder "Don't insert pragma while GHC2021 enabled" "T14" 0
110-
, goldenCodeLens recorder "Qualified name" "T15" 0
109+
goldenCodeLens recorder "Don't insert pragma while GHC2021 enabled" "CodeLensWithGHC2021" 0
110+
, goldenCodeLens recorder "Qualified name" "Qualified" 0
111+
, goldenCodeLens recorder "Type family" "TypeFamily" 0
111112
]
112113

113114
_CACodeAction :: Prism' (Command |? CodeAction) CodeAction
114115
_CACodeAction = prism' InR $ \case
115116
InR action -> Just action
116117
_ -> Nothing
117118

118-
-- goldenCodeLens :: TestName -> FilePath -> Int -> TestTree
119+
120+
goldenCodeLens :: Recorder (WithPriority Class.Log) -> TestName -> FilePath -> Int -> TestTree
119121
goldenCodeLens recorder title path idx =
120122
goldenWithHaskellDoc (classPlugin recorder) title testDataDir path "expected" "hs" $ \doc -> do
121123
lens <- getCodeLenses doc

‎plugins/hls-class-plugin/test/testdata/T10.expected.hs renamed to ‎plugins/hls-class-plugin/test/testdata/CodeLensSimple.expected.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{-# LANGUAGE InstanceSigs #-}
2-
module T10 where
2+
module CodeLensSimple where
33

44
data A
55
instance Eq A where

‎plugins/hls-class-plugin/test/testdata/T10.hs renamed to ‎plugins/hls-class-plugin/test/testdata/CodeLensSimple.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module T10 where
1+
module CodeLensSimple where
22

33
data A
44
instance Eq A where

‎plugins/hls-class-plugin/test/testdata/T14.expected.hs renamed to ‎plugins/hls-class-plugin/test/testdata/CodeLensWithGHC2021.expected.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{-# LANGUAGE GHC2021 #-}
2-
module T14 where
2+
module CodeLensWithGHC2021 where
33

44
data A
55
instance Eq A where

‎plugins/hls-class-plugin/test/testdata/T14.hs renamed to ‎plugins/hls-class-plugin/test/testdata/CodeLensWithGHC2021.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{-# LANGUAGE GHC2021 #-}
2-
module T14 where
2+
module CodeLensWithGHC2021 where
33

44
data A
55
instance Eq A where

‎plugins/hls-class-plugin/test/testdata/T13.expected.hs renamed to ‎plugins/hls-class-plugin/test/testdata/CodeLensWithPragma.expected.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{-# LANGUAGE InstanceSigs #-}
2-
module T13 where
2+
module CodeLensWithPragma where
33

44
data A
55
instance Eq A where

‎plugins/hls-class-plugin/test/testdata/T13.hs renamed to ‎plugins/hls-class-plugin/test/testdata/CodeLensWithPragma.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{-# LANGUAGE InstanceSigs #-}
2-
module T13 where
2+
module CodeLensWithPragma where
33

44
data A
55
instance Eq A where

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{-# LANGUAGE InstanceSigs #-}
2+
module Inline where
3+
4+
data A
5+
instance Eq A where (==) :: A -> A -> Bool
6+
(==) = _

‎plugins/hls-class-plugin/test/testdata/T12.hs renamed to ‎plugins/hls-class-plugin/test/testdata/Inline.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module T12 where
1+
module Inline where
22

33
data A
44
instance Eq A where (==) = _

0 commit comments

Comments
 (0)