Don't rename imported Main module that only imports names

CHANGELOG.md

@@ -355,6 +355,7 @@
   representation, every atom has a type][3671]
 - [main = "Hello World!" is valid Enso sample][3696]
 - [Invalidate module's IR cache if imported module changed][3703]
+- [Don't rename imported Main module that only imports names][3710]
 
 [3227]: https://github.com/enso-org/enso/pull/3227
 [3248]: https://github.com/enso-org/enso/pull/3248
@@ -401,6 +402,7 @@
 [3671]: https://github.com/enso-org/enso/pull/3671
 [3696]: https://github.com/enso-org/enso/pull/3696
 [3696]: https://github.com/enso-org/enso/pull/3703
+[3696]: https://github.com/enso-org/enso/pull/3710
 
 # Enso 2.0.0-alpha.18 (2021-10-12)
 

distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json.enso

@@ -1,4 +1,5 @@
 from Standard.Base import all
+import Standard.Base
 
 import Standard.Base.Data.Json.Internal
 

distribution/lib/Standard/Base/0.0.0-dev/src/Data/Json/Internal.enso

@@ -1,4 +1,5 @@
 from Standard.Base import all hiding Number, Boolean, Array
+import Standard.Base
 
 import Standard.Base.Data.Numbers as Base_Number
 import Standard.Base.Runtime.Ref

distribution/lib/Standard/Base/0.0.0-dev/src/Meta.enso

@@ -1,4 +1,5 @@
 from Standard.Base import all
+import Standard.Base
 
 ## UNSTABLE
    ADVANCED

distribution/lib/Standard/Visualization/0.0.0-dev/src/Helpers.enso

@@ -87,8 +87,8 @@ recover_errors ~body =
    Returns all the columns in the table, including indices.
 
    Index columns are placed before other columns.
-Table.Table.all_columns : Vector
-Table.Table.all_columns self =
+Table.all_columns : Vector
+Table.all_columns self =
     index = self.index.catch_ []
     index_columns = case index of
         Vector.Vector -> index
@@ -103,8 +103,8 @@ Table.Table.all_columns self =
 
    Arguments:
    - text: the case-insensitive name of the searched column.
-Table.Table.lookup_ignore_case : Text -> Column ! Nothing
-Table.Table.lookup_ignore_case self name =
+Table.lookup_ignore_case : Text -> Column ! Nothing
+Table.lookup_ignore_case self name =
     self.all_columns.find <| col->
         col.name.equals_ignore_case name
 

distribution/lib/Standard/Visualization/0.0.0-dev/src/Histogram.enso

@@ -1,6 +1,7 @@
 from Standard.Base import all
 
 from Standard.Table import Table, Column
+import Standard.Table
 import Standard.Visualization.Helpers
 
 ## PRIVATE

distribution/lib/Standard/Visualization/0.0.0-dev/src/Id.enso

@@ -1,4 +1,5 @@
 from Standard.Base import all
+import Standard.Base
 
 ## An ID used by the visualization system to identify different ways of
    displaying data.

distribution/lib/Standard/Visualization/0.0.0-dev/src/Scatter_Plot.enso

@@ -1,6 +1,8 @@
 from Standard.Base import all
 
 from Standard.Table import Table, Column
+import Standard.Table
+
 import Standard.Visualization.Helpers
 from Standard.Base.Data.Index_Sub_Range import Sample
 

engine/runtime/src/main/scala/org/enso/compiler/pass/desugar/Imports.scala

@@ -52,6 +52,7 @@ case object Imports extends IRPass {
                 name = newName.copy(parts = parts :+ mainModuleName),
                 rename = computeRename(
                   i.rename,
+                  i.onlyNames.nonEmpty || i.isAll,
                   parts(1).asInstanceOf[IR.Name.Literal]
                 )
               )
@@ -75,6 +76,7 @@ case object Imports extends IRPass {
                 name = newName.copy(parts = parts :+ mainModuleName),
                 rename = computeRename(
                   ex.rename,
+                  ex.onlyNames.nonEmpty || ex.isAll,
                   parts(1).asInstanceOf[IR.Name.Literal]
                 )
               )
@@ -113,8 +115,10 @@ case object Imports extends IRPass {
 
   private def computeRename(
     originalRename: Option[IR.Name.Literal],
+    onlyNamesOrAll: Boolean,
     qualName: IR.Name.Literal
-  ): Some[IR.Name.Literal] = Some(originalRename.getOrElse(qualName))
+  ): Option[IR.Name.Literal] =
+    originalRename.orElse(Option.unless(onlyNamesOrAll)(qualName))
 
   val currentProjectAlias = "project"
 

engine/runtime/src/test/scala/org/enso/compiler/test/pass/desugar/ImportsTest.scala

@@ -52,32 +52,36 @@ class ImportsTest extends CompilerTest {
         |import Bar.Foo
         |import Bar.Foo as Bar
         |from Bar.Foo import Bar, Baz
-        |from Bar.Foo as Bar import Baz, Spam
+        |from Bar.Foo as Bar import Bar, Spam
+        |from Bar.Foo import all
         |
         |export Bar.Foo
         |export Bar.Foo as Bar
         |from Bar.Foo export Bar, Baz
-        |from Bar.Foo as Bar export all
+        |from Bar.Foo as Bar export Bar, Baz
+        |from Bar.Foo export all
         |
         |import Foo.Bar.Baz
         |export Foo.Bar.Baz
         |""".stripMargin.preprocessModule.analyse
 
     "desugar project name imports correctly" in {
-      ir.imports.take(4).map(_.showCode()) shouldEqual List(
+      ir.imports.take(5).map(_.showCode()) shouldEqual List(
         "import Bar.Foo.Main as Foo",
         "import Bar.Foo.Main as Bar",
-        "from Bar.Foo.Main as Foo import Bar, Baz",
-        "from Bar.Foo.Main as Bar import Baz, Spam"
+        "from Bar.Foo.Main import Bar, Baz",
+        "from Bar.Foo.Main as Bar import Bar, Spam",
+        "from Bar.Foo.Main import all"
       )
     }
 
     "desugar project name exports correctly" in {
-      ir.exports.take(4).map(_.showCode()) shouldEqual List(
+      ir.exports.take(5).map(_.showCode()) shouldEqual List(
         "export Bar.Foo.Main as Foo",
         "export Bar.Foo.Main as Bar",
-        "from Bar.Foo.Main as Foo export Bar, Baz",
-        "from Bar.Foo.Main as Bar export all"
+        "from Bar.Foo.Main export Bar, Baz",
+        "from Bar.Foo.Main as Bar export Bar, Baz",
+        "from Bar.Foo.Main export all"
       )
     }
 

test/Table_Tests/src/Database/Postgres_Spec.enso

@@ -8,6 +8,7 @@ import Standard.Table as Materialized_Table
 from Standard.Table.Data.Aggregate_Column import all hiding First
 
 from Standard.Database import all
+import Standard.Database
 from Standard.Database.Errors import Sql_Error
 from Standard.Database.Data.Sql import Sql_Type
 from Standard.Database.Internal.Postgres.Pgpass import Pgpass_Entry_Data

test/Table_Tests/src/Database/Redshift_Spec.enso

@@ -4,6 +4,7 @@ import Standard.Base.Runtime.Ref
 import Standard.Table as Materialized_Table
 
 from Standard.Database import all
+import Standard.Database
 from Standard.Database.Connection.Connection import Sql_Error
 
 import Standard.Test

test/Table_Tests/src/Database/SQLite_Spec.enso

@@ -4,6 +4,7 @@ import Standard.Base.Runtime.Ref
 import Standard.Table as Materialized_Table
 
 from Standard.Database import all
+import Standard.Database
 from Standard.Database.Errors import Sql_Error_Data
 
 import Standard.Test

test/Tests/src/Semantic/Meta_Spec.enso

@@ -1,4 +1,5 @@
 from Standard.Base import all
+import Standard.Base
 
 import Standard.Base.System.Platform
 
@@ -84,7 +85,7 @@ spec = Test.group "Meta-Value Manipulation" <|
         _ -> Nothing
     Test.specify "should allow to get the source location of a frame" pending=location_pending <|
         src = Meta.get_source_location 0
-        loc = "Meta_Spec.enso:86:15-40"
+        loc = "Meta_Spec.enso:87:15-40"
         src.take (Last loc.length) . should_equal loc
 
     Test.specify "should allow to get qualified type names of values" <|

test/Visualization_Tests/src/Geo_Map_Spec.enso

@@ -1,6 +1,6 @@
 from Standard.Base import all
 
-from Standard.Table import Table
+import Standard.Table
 
 import Standard.Visualization.Geo_Map
 

test/Visualization_Tests/src/Helpers_Spec.enso

@@ -1,6 +1,6 @@
 from Standard.Base import all
 
-from Standard.Table import Table
+import Standard.Table
 
 import Standard.Visualization.Helpers
 

test/Visualization_Tests/src/Histogram_Spec.enso

@@ -1,6 +1,7 @@
 from Standard.Base import all
 
 from Standard.Table import Table, Column
+import Standard.Table
 
 import Standard.Visualization.Histogram
 

test/Visualization_Tests/src/Id_Spec.enso

@@ -1,4 +1,5 @@
 from Standard.Base import all
+import Standard.Base
 
 import Standard.Visualization
 

test/Visualization_Tests/src/Scatter_Plot_Spec.enso

@@ -1,6 +1,7 @@
 from Standard.Base import all
 
 from Standard.Table import Table, Column
+import Standard.Table
 
 import Standard.Visualization.Scatter_Plot
 

test/Visualization_Tests/src/Sql_Spec.enso

@@ -1,6 +1,7 @@
 from Standard.Base import all
 
 from Standard.Database import all
+import Standard.Database
 
 import Standard.Visualization.Sql.Visualization as Visualization
 

test/Visualization_Tests/src/Table_Spec.enso

@@ -1,8 +1,10 @@
 from Standard.Base import all
 
 from Standard.Table import Table, Aggregate_Column
+import Standard.Table
 
-from Standard.Database import all
+from Standard.Database import SQLite_Data
+import Standard.Database
 import Standard.Database.Data.Table as Database_Table
 
 import Standard.Visualization.Table.Visualization as Visualization