fix: Switches from regex-applicative-text to regex-applicative (d…

…ue to version constraints)
haskell · Jul 15, 2023 · 907704c · 907704c
1 parent 56b27a3
commit 907704c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/plugins/hls-refactor-plugin/hls-refactor-plugin.cabal b/plugins/hls-refactor-plugin/hls-refactor-plugin.cabal
@@ -87,7 +87,7 @@ library
     , data-default
     , time
     -- FIXME: Only needed to workaround for qualified imports in GHC 9.4
-    , regex-applicative-text
+    , regex-applicative
     , parser-combinators
   ghc-options: -Wall -Wno-name-shadowing
   default-language: Haskell2010

diff --git a/plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction.hs b/plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction.hs
@@ -69,7 +69,7 @@ import           Development.IDE.Types.Logger                      hiding
 import           Development.IDE.Types.Options
 import           GHC.Exts                                          (fromList)
 import qualified GHC.LanguageExtensions                            as Lang
-import qualified Text.Regex.Applicative.Text                       as RE
+import qualified Text.Regex.Applicative                            as RE
 #if MIN_VERSION_ghc(9,4,0)
 import           GHC.Parser.Annotation                             (TokenLocation (..))
 #endif
@@ -1512,7 +1512,7 @@ suggestNewImport _ _ _ _ _ = []
 -- FIXME: We can delete this after dropping the support for GHC 9.4
 extractQualifiedModuleNameFromMissingName :: T.Text -> Maybe T.Text
 extractQualifiedModuleNameFromMissingName (T.strip -> missing)
-    = missing RE.=~ qualIdentP
+    = T.pack <$> (T.unpack missing RE.=~ qualIdentP)
     where
         {-
         NOTE: Haskell 2010 allows /unicode/ upper & lower letters

diff --git a/stack.yaml b/stack.yaml
@@ -56,7 +56,6 @@ extra-deps:
 - hw-fingertree-0.1.2.1
 - hw-prim-0.6.3.2
 - ansi-terminal-0.11.5
-- regex-applicative-text-0.1.0.1
 
 configure-options:
   ghcide: