Merge branch 'release/1.14' into master

crystal-lang · Jan 8, 2025 · 576a14c · 576a14c
2 parents 3421975 + db6128a
commit 576a14c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Changelog
 
+## [1.14.1] (2025-01-08)
+
+[1.14.1]: https://github.com/crystal-lang/crystal/releases/1.14.1
+
+### Bugfixes
+
+#### tools
+
+- *(formatter)* Handle trailing comma with multiple parameters on the same line ([#15097], thanks @Blacksmoke16)
+
+[#15097]: https://github.com/crystal-lang/crystal/pull/15097
+
+### Infrastructure
+
+- Changelog for 1.14.1 ([#15323], thanks @straight-shoota)
+- *(ci)* Update XCode 15.3.0 in circleci ([#15327], thanks @straight-shoota)
+
+[#15323]: https://github.com/crystal-lang/crystal/pull/15323
+[#15327]: https://github.com/crystal-lang/crystal/pull/15327
+
 ## [1.14.0] (2024-10-09)
 
 [1.14.0]: https://github.com/crystal-lang/crystal/releases/1.14.0

diff --git a/spec/compiler/formatter/formatter_spec.cr b/spec/compiler/formatter/formatter_spec.cr
@@ -755,6 +755,13 @@ describe Crystal::Formatter do
     end
     CRYSTAL
 
+  assert_format <<-CRYSTAL
+    def foo(
+      a, b,
+    )
+    end
+    CRYSTAL
+
   assert_format <<-CRYSTAL
     macro foo(
       a,