Fix location of scoped modulePathName (#3011)

Closes #2737.

This issues caused the formatter to sometimes insert unwanted line
breaks.

src/Juvix/Compiler/Concrete/Translation/FromParsed/Analysis/Scoping.hs

@@ -612,7 +612,7 @@ checkImportNoPublic ::
 checkImportNoPublic import_@Import {..} = do
   massert (_importPublic == NoPublic)
   smodule <- readScopeModule import_
-  let sname :: S.TopModulePath = smodule ^. scopedModulePath
+  let sname :: S.TopModulePath = set nameConcrete _importModulePath (smodule ^. scopedModulePath)
       sname' :: S.Name = set S.nameConcrete (topModulePathToName _importModulePath) sname
       scopedModule :: ScopedModule = set scopedModuleName sname' smodule
       exportInfoOriginal = scopedModule ^. scopedModuleExportInfo
@@ -638,7 +638,8 @@ checkImportNoPublic import_@Import {..} = do
         _importAsName = qual',
         _importOpen = importOpen',
         _importUsingHiding = usingHiding',
-        ..
+        _importKw,
+        _importPublic
       }
   where
     addModuleToScope :: ScopedModule -> Sem r ()

test/Scope/Positive.hs

@@ -265,5 +265,9 @@ tests =
     posTest
       "Scan name with 'import' prefix"
       $(mkRelDir "issue2929")
+      $(mkRelFile "main.juvix"),
+    posTest
+      "Proper formatting of import module path"
+      $(mkRelDir "issue2737")
       $(mkRelFile "main.juvix")
   ]

tests/positive/issue2737/M.juvix

@@ -0,0 +1,9 @@
+-- 1
+-- 2
+-- 3
+-- 4
+-- 5
+-- 6
+-- 7
+-- 8
+module M;

tests/positive/issue2737/Package.juvix

@@ -0,0 +1,8 @@
+module Package;
+
+import PackageDescription.V2 open;
+
+package : Package :=
+  defaultPackage@?{
+    name := "issue2737"
+  };

tests/positive/issue2737/main.juvix

@@ -0,0 +1,5 @@
+module main;
+
+import M as N;
+
+-- comment at the end