Mark imports as implicit (#5)

* Mark imports as implicit * Fix tests
tfausak · Mar 20, 2024 · 26e519e · 26e519e
1 parent ee35ffa
commit 26e519e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/source/ghc-9.4/Imp/Ghc.hs b/source/ghc-9.4/Imp/Ghc.hs
@@ -13,7 +13,7 @@ newImportDecl moduleName =
   Hs.ImportDecl
     { Hs.ideclExt = Hs.noAnn,
       Hs.ideclSourceSrc = SourceText.NoSourceText,
-      Hs.ideclImplicit = False,
+      Hs.ideclImplicit = True,
       Hs.ideclName = Hs.noLocA moduleName,
       Hs.ideclPkgQual = Plugin.NoRawPkgQual,
       Hs.ideclSource = Plugin.NotBoot,

diff --git a/source/ghc-9.6/Imp/Ghc.hs b/source/ghc-9.6/Imp/Ghc.hs
@@ -15,7 +15,7 @@ newImportDecl moduleName =
         Hs.XImportDeclPass
           { Hs.ideclAnn = Hs.noAnn,
             Hs.ideclSourceText = SourceText.NoSourceText,
-            Hs.ideclImplicit = False
+            Hs.ideclImplicit = True
           },
       Hs.ideclName = Hs.noLocA moduleName,
       Hs.ideclPkgQual = Plugin.NoRawPkgQual,

diff --git a/source/test-suite/Main.hs b/source/test-suite/Main.hs
@@ -32,31 +32,31 @@ main = Hspec.hspec . Hspec.parallel . Hspec.describe "Imp" $ do
     expectImp
       []
       "true = Data.Bool.True"
-      "import qualified Data.Bool\ntrue = Data.Bool.True"
+      "import (implicit) qualified Data.Bool\ntrue = Data.Bool.True"
 
   Hspec.it "inserts an aliased import" $ do
     expectImp
       ["--alias=Data.Bool:Bool"]
       "true = Bool.True"
-      "import qualified Data.Bool as Bool\ntrue = Bool.True"
+      "import (implicit) qualified Data.Bool as Bool\ntrue = Bool.True"
 
   Hspec.it "prefers later aliases over earlier ones" $ do
     expectImp
       ["--alias=Relude.Bool:Bool", "--alias=Data.Bool:Bool"]
       "true = Bool.True"
-      "import qualified Data.Bool as Bool\ntrue = Bool.True"
+      "import (implicit) qualified Data.Bool as Bool\ntrue = Bool.True"
 
   Hspec.it "inserts an import for a qualified type" $ do
     expectImp
       []
       "true = True :: Data.Bool.Bool"
-      "import qualified Data.Bool\ntrue = True :: Data.Bool.Bool"
+      "import (implicit) qualified Data.Bool\ntrue = True :: Data.Bool.Bool"
 
   Hspec.it "inserts multiple imports sorted" $ do
     expectImp
       []
       "true :: Relude.Bool.Bool\ntrue = Data.Bool.True"
-      "import qualified Data.Bool\nimport qualified Relude.Bool\ntrue :: Relude.Bool.Bool\ntrue = Data.Bool.True"
+      "import (implicit) qualified Data.Bool\nimport (implicit) qualified Relude.Bool\ntrue :: Relude.Bool.Bool\ntrue = Data.Bool.True"
 
   Hspec.it "does not re-import an open import" $ do
     expectImp
@@ -80,7 +80,7 @@ main = Hspec.hspec . Hspec.parallel . Hspec.describe "Imp" $ do
     expectImp
       []
       "import qualified Relude.Bool\ntrue :: Relude.Bool.Bool\ntrue = Data.Bool.True"
-      "import qualified Relude.Bool\nimport qualified Data.Bool\ntrue :: Relude.Bool.Bool\ntrue = Data.Bool.True"
+      "import qualified Relude.Bool\nimport (implicit) qualified Data.Bool\ntrue :: Relude.Bool.Bool\ntrue = Data.Bool.True"
 
 expectImp :: (Stack.HasCallStack) => [String] -> String -> String -> Hspec.Expectation
 expectImp arguments input expected = do