Update to Gleam 1.3.1

CHANGELOG.md

@@ -11,3 +11,10 @@
 ### Language Server
 
 ### Bug Fixes
+
+## v1.3.1 - 2024-07-10
+
+### Bug Fixes
+
+- Fixes a bug with import cycle detection when there is more than 2 imports in the cycle
+  ([Ameen Radwan](https://github.com/Acepie))

compiler-core/src/build/package_loader.rs

@@ -286,15 +286,17 @@ where
                     .enumerate()
                     .map(|(i, module)| {
                         // cycles are in order of reference so get next in list or loop back to first
-                        let ind = if i == modules.len() - 1 { 0 } else { i + 1 };
-                        let next = modules.get(ind).expect("next module must exist");
+                        let index_of_imported = if i == 0 { modules.len() - 1 } else { i - 1 };
+                        let imported_module = modules
+                            .get(index_of_imported)
+                            .expect("importing module must exist");
                         let input = dep_location_map.get(module).expect("dependency must exist");
                         let location = match input {
                             Input::New(module) => {
                                 let (_, location) = module
                                     .dependencies
                                     .iter()
-                                    .find(|d| &d.0 == next)
+                                    .find(|d| &d.0 == imported_module)
                                     .expect("import must exist for there to be a cycle");
                                 ImportCycleLocationDetails {
                                     location: *location,
@@ -306,7 +308,7 @@ where
                                 let (_, location) = cached_module
                                     .dependencies
                                     .iter()
-                                    .find(|d| &d.0 == next)
+                                    .find(|d| &d.0 == imported_module)
                                     .expect("import must exist for there to be a cycle");
                                 let src = self
                                     .io

nix/glistix.nix

@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage {
   buildInputs = [ openssl ] ++
     lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
 
-  cargoHash = "sha256-I5oYfY4zcuhDe5WsbWzso+CFafqymOYEmxD4DmV/NOo=";
+  cargoHash = "sha256-rifIMUYfnmVCaS+OaQ3POEaZj00cU3Biaz2ZKj2eFL4=";
 
   meta = with lib; {
     description = "A fork of the Gleam compiler with a Nix backend";

test-package-compiler/cases/import_cycle_multi/src/three.gleam

@@ -0,0 +1 @@
+import one

test-package-compiler/cases/import_cycle_multi/src/two.gleam

@@ -1 +1 @@
-import one
+import three

test-package-compiler/src/snapshots/test_package_compiler__generated_tests__import_cycle_multi.snap

@@ -3,9 +3,14 @@ source: test-package-compiler/src/generated_tests.rs
 expression: "./cases/import_cycle_multi"
 ---
 error: Import cycle
-  ┌─ src/two.gleam:1:1
+  ┌─ src/three.gleam:1:1
   │
 1 │ import one
+  │ ^ Imported here
+  │
+  ┌─ src/two.gleam:1:1
+  │
+1 │ import three
   │ ^ Imported here
   │
   ┌─ src/one.gleam:1:1
@@ -16,6 +21,8 @@ error: Import cycle
 The import statements for these modules form a cycle:
 
     ┌─────┐
+    │     three
+    │     ↓
     │     two
     │     ↓
     │     one