code-ruby 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ce2fde0ad82db9c01bd5ba06cfd1b12123819422a8384783678fe02bc083453
-  data.tar.gz: b188d825c3e6cf728b7290fc0a4e7d2ec72d1eb22a3949854b024b47d2c1d04f
+  metadata.gz: e59505a1d473ed64e03853dd3465ce958bb81ee2dfcd2ec38b0280a5ee3dd98a
+  data.tar.gz: e13a2d15ba45209e81213bd7b5a3f1ea58a26cdcb9446f29f9f6b5906aa7e9fe
 SHA512:
-  metadata.gz: 894a43bd0eddb8374bf65e266f08d1a7b99652cdafb48e1cef96e5ed168d006a6dc58b12e7e1cb9f757efad66365e6835f56cc0dedb8d184693d09304a9aafaf
-  data.tar.gz: 20614c5ac0f308334d20e21e2ee69e6ba283e4cb5e4bf0274f0b375fc397fc4b29569ead66ffbacbc2070cb0af66f05ae7bfc78fa2c64529d6015c09fc7ebaa0
+  metadata.gz: 82cf388eb36848ff8f01f122177e436205ccebfd6f4e19488e65e1adecdff267246292da159a99b42cca23f5adefb505483ebe1357b928922ee824ac4c832086
+  data.tar.gz: 3069cb6a421189bad2b0aba4eed4a3d50d5e24128f1fcd6fa6ee12db5110b5a53babf2b310175ba4701b59a5bb3447bb4fd1505282c5f3de44c5e2c3a530fc6d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code-ruby (3.0.9)
+    code-ruby (3.0.10)
       activesupport
       base64
       bigdecimal

data/VERSION

@@ -1 +1 @@
-3.0.9
+3.0.10

data/lib/code/format.rb

@@ -434,7 +434,11 @@ class Code
             "#{expression}#{operator}#{right}"
           else
             candidate = "#{expression} #{operator} #{right}"
-            if expression.include?("\n") || candidate.length > MAX_LINE_LENGTH
+            if multiline_collection_statement?(other[:statement]) &&
+                 right.include?("\n")
+              first_line, *rest = right.lines(chomp: true)
+              [ "#{expression} #{operator} #{first_line}", *rest ].join("\n")
+            elsif expression.include?("\n") || candidate.length > MAX_LINE_LENGTH
               right_lines =
                 if right.include?("\n")
                   right.lines(chomp: true).map(&:lstrip)
@@ -442,7 +446,7 @@ class Code
                   right.split(" #{operator} ")
                 end
               continuation_lines =
-                right_lines.each_with_index.map do |line, index|
+                right_lines.map do |line|
                   content = line.lstrip
                   prefix =
                     (content.start_with?("#{operator} ") ? "" : "#{operator} ")
@@ -594,6 +598,11 @@ class Code
       values.join(", ").length > MAX_INLINE_COLLECTION_LENGTH
     end
 
+    def multiline_collection_statement?(statement)
+      statement.is_a?(Hash) &&
+        (statement.key?(:dictionnary) || statement.key?(:list))
+    end
+
     def multiline_call_arguments?(raw_arguments, arguments)
       return true if arguments.any? { |argument| argument.include?("\n") }
       return true if arguments.size > MAX_INLINE_COLLECTION_ITEMS

data/spec/code/format_spec.rb

@@ -47,6 +47,10 @@ RSpec.describe Code::Format do
       [
         "x = { content: \"you select the funniest tweets for a french \" + \"audience from the provided candidates. pick up to \" + \"{max_selected}. prioritize genuinely funny content\" + \" (jokes, memes, punchlines, absurd). avoid \" + \"politics/news/serious content. output only json.\" }",
         "x = {\n  content: \"you select the funniest tweets for a french \"\n    + \"audience from the provided candidates. pick up to \"\n    + \"{max_selected}. prioritize genuinely funny content\"\n    + \" (jokes, memes, punchlines, absurd). avoid \"\n    + \"politics/news/serious content. output only json.\"\n}"
+      ],
+      [
+        "blocks << { title: \"hello world\", description: \"lorem ipsum dolor es sit\", position: 1 }",
+        "blocks << {\n  title: \"hello world\",\n  description: \"lorem ipsum dolor es sit\",\n  position: 1\n}"
       ]
     ].each do |input, expected|
       it "formats #{input.inspect}" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors:
 - Dorian Marié