cabal plugin

Author: wz1000

hls-test-utils/src/Test/Hls/Util.hs

@@ -36,6 +36,7 @@ module Test.Hls.Util
     , inspectCodeAction
     , inspectCommand
     , inspectDiagnostic
+    , inspectDiagnosticAny
     , waitForDiagnosticsFrom
     , waitForDiagnosticsFromSource
     , waitForDiagnosticsFromSourceWithTimeout
@@ -247,6 +248,10 @@ inspectDiagnostic :: [Diagnostic] -> [T.Text] -> IO Diagnostic
 inspectDiagnostic diags s = onMatch diags (\ca -> all (`T.isInfixOf` (ca ^. L.message)) s) err
     where err = "expected diagnostic matching '" ++ show s ++ "' but did not find one"
 
+inspectDiagnosticAny :: [Diagnostic] -> [T.Text] -> IO Diagnostic
+inspectDiagnosticAny diags s = onMatch diags (\ca -> any (`T.isInfixOf` (ca ^. L.message)) s) err
+    where err = "expected diagnostic matching one of'" ++ show s ++ "' but did not find one"
+
 expectDiagnostic :: [Diagnostic] -> [T.Text] -> IO ()
 expectDiagnostic diags s = void $ inspectDiagnostic diags s
 

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

@@ -249,10 +249,12 @@ cabalRules recorder plId = do
         let warningDiags = fmap (Diagnostics.warningDiagnostic file) pWarnings
         case pm of
           Left (_cabalVersion, pErrorNE) -> do
-            let regex :: T.Text
+            let regexUnknownCabalBefore310 :: T.Text
                 -- We don't support the cabal version, this should not be an error, as the
                 -- user did not do anything wrong. Instead we cast it to a warning
-                regex = "Unsupported cabal-version [0-9]+.[0-9]*"
+                regexUnknownCabalBefore310 = "Unsupported cabal-version [0-9]+.[0-9]*"
+                regexUnknownCabalVersion :: T.Text
+                regexUnknownCabalVersion = "Unsupported cabal format version in cabal-version field: [0-9]+.[0-9]+"
                 unsupportedCabalHelpText = unlines
                   [ "The used `cabal-version` is not fully supported by this `HLS` binary."
                   , "Either the `cabal-version` is unknown, or too new for this executable."
@@ -267,7 +269,10 @@ cabalRules recorder plId = do
                   NE.toList $
                     NE.map
                       ( \pe@(PError pos text) ->
-                          if text =~ regex
+                          if any (text =~)
+                                [ regexUnknownCabalBefore310
+                                , regexUnknownCabalVersion
+                                ]
                             then Diagnostics.warningDiagnostic file (Syntax.PWarning Syntax.PWTOther pos $
                                   unlines
                                     [ text

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

@@ -110,7 +110,7 @@ pluginTests =
             ,   runCabalTestCaseSession "Publishes Diagnostics on unsupported cabal version as Warning" "" $ do
                 _ <- openDoc "unsupportedVersion.cabal" "cabal"
                 diags <- cabalCaptureKick
-                unknownVersionDiag <- liftIO $ inspectDiagnostic diags ["Unsupported cabal-version 99999.0"]
+                unknownVersionDiag <- liftIO $ inspectDiagnosticAny diags ["Unsupported cabal-version 99999.0", "Unsupported cabal format version in cabal-version field: 99999.0"]
                 liftIO $ do
                     length diags @?= 1
                     unknownVersionDiag ^. L.range @?= Range (Position 0 0) (Position 1 0)