Should no related code lens if the module name is correct (#2826)

* Should no code lens if the module name is correct

* Rerun tests

* Rerun tests

* Try remove hls-eval-plugin known-broken in ghc-9.2

* Rerun tests

* Apply more accurate test name

Co-authored-by: Michael Peyton Jones <[email protected]>

Co-authored-by: Michael Peyton Jones <[email protected]>

Author: July541

plugins/hls-module-name-plugin/src/Ide/Plugin/ModuleName.hs

@@ -36,7 +36,7 @@ import           Development.IDE            (GetParsedModule (GetParsedModule),
 import           Development.IDE.GHC.Compat (GenLocated (L), getSessionDynFlags,
                                              hsmodName, importPaths, locA,
                                              pattern RealSrcSpan,
-                                             pm_parsed_source, unLoc)
+                                             pm_parsed_source, unLoc, moduleNameString)
 import           Ide.Types
 import           Language.LSP.Server
 import           Language.LSP.Types         hiding
@@ -140,7 +140,7 @@ codeModuleName :: IdeState -> NormalizedFilePath -> IO (Maybe (Range, T.Text))
 codeModuleName state nfp = runMaybeT $ do
   pm <- MaybeT . runAction "ModuleName.GetParsedModule" state $ use GetParsedModule nfp
   L (locA -> (RealSrcSpan l _)) m <- MaybeT . pure . hsmodName . unLoc $ pm_parsed_source pm
-  pure (realSrcSpanToRange l, T.pack $ show m)
+  pure (realSrcSpanToRange l, T.pack $ moduleNameString m)
 
 -- traceAs :: Show a => String -> a -> a
 -- traceAs lbl a = trace (lbl ++ " = " ++ show a) a

plugins/hls-module-name-plugin/test/Main.hs

@@ -37,6 +37,12 @@ tests =
       [CodeLens { _command = Just c }] <- getCodeLenses doc
       executeCommand c
       void $ skipManyTill anyMessage (message SWorkspaceApplyEdit)
+  , testCase "Should not show code lens if the module name is correct" $
+      runSessionWithServer moduleNamePlugin testDataDir $ do
+          doc <- openDoc "CorrectName.hs" "haskell"
+          lenses <- getCodeLenses doc
+          liftIO $ lenses @?= []
+          closeDoc doc
   ]
 
 goldenWithModuleName :: TestName -> FilePath -> (TextDocumentIdentifier -> Session ()) -> TestTree

plugins/hls-module-name-plugin/test/testdata/CorrectName.hs

@@ -0,0 +1 @@
+module CorrectName where

plugins/hls-module-name-plugin/test/testdata/hie.yaml

@@ -5,3 +5,4 @@ cradle:
       - "TEmptyModule"
       - "TWrongModuleName"
       - "mainlike"
+      - "CorrectName"

test/functional/Progress.hs

@@ -33,7 +33,7 @@ tests =
                 let path = "diagnostics" </> "Foo.hs"
                 _ <- openDoc path "haskell"
                 expectProgressMessages [pack ("Setting up testdata (for " ++ path ++ ")"), "Processing", "Indexing"] []
-        ,  knownBrokenForGhcVersions [GHC92] "No evaluation status with GHC 9.2" $ requiresEvalPlugin $ testCase "eval plugin sends progress reports" $
+        , requiresEvalPlugin $ testCase "eval plugin sends progress reports" $
             runSession hlsCommand progressCaps "plugins/hls-eval-plugin/test/testdata" $ do
               doc <- openDoc "T1.hs" "haskell"
               lspId <- sendRequest STextDocumentCodeLens (CodeLensParams Nothing Nothing doc)