klenod-build 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7873fce94ba35f8420b6aa896bca1866896d5c9f038102f0d13522fb1fa9a16
-  data.tar.gz: 715c13a86148ae750ed6151f05e4fbcb32d1d73bf21d139d1b21d42f7bb405f4
+  metadata.gz: ac47aee2306ee0d732be8f5959e27c168022a6b6d9cc8f6fec350e8cde16e38d
+  data.tar.gz: a3af1863c0c21df86885135fdd7c29d8b6a48b3997eb125fe00b0f02c72c5a64
 SHA512:
-  metadata.gz: 29157efe18cfdd5982f05ef742f07bb56ee64f54c820b152569be703b76a97dc76f71c166b67ff57e8b5124bed59f16ecbcf39415118dba3672a304854d4fbfa
-  data.tar.gz: 0a0b9e45f353aa70004c01ed9f78d1fe6ef667c7eb4faa5e7c64d038087ed82501c7f77755ed5e67dd26504ac122ee14a7c5414164b36c5933afae86df89df37
+  metadata.gz: 17abab231fe71a6022e15a5ed712273ce59b4234e0593211ea9fb4614cfa089dc0fa8c4930a058a0034e2703c13a979cc3b0e23437b1e930f465c0361fdff419
+  data.tar.gz: e5305dbcc39bc6ae1bfb14369060806b333d3e091ff562d4030136e514149ee658fdd964abf5372693575227f8a69ed7364e08551510a14b924c4b85005581f2

data/lib/klenod/build/plugins/haml_plugin/parser.rb

@@ -40,13 +40,28 @@ module Klenod
           # `video` plus a `.id` class. Extend that form to ordinary Ruby
           # member and index expressions while leaving all other attributes on
           # Haml's native parsing path.
+          #
+          # Haml also continues a parenthesized list onto following lines only
+          # after the first attribute, so `%a(` followed by a line break is an
+          # invalid attribute list. Join the lines of an unclosed list first so
+          # both forms work across lines.
           def parse_new_attributes(text)
-            balanced, rest = ::Haml::Util.balance(text, "(", ")")
-            pairs = balanced && extended_attribute_pairs(balanced[1...-1])
-            return super unless pairs&.any? { |_name, value| value.match?(/[.\[]/) }
+            joined_lines = 0
+            until (close_index = attribute_list_close_index(text)) || @next_line.eod?
+              text = "#{text} #{@next_line.text}"
+              joined_lines += 1
+              next_line
+            end
+
+            pairs = close_index && extended_attribute_pairs(text[1...close_index])
+            rest = close_index && text[(close_index + 1)..]
+            unless pairs&.any? { |_name, value| value.match?(/[.\[]/) }
+              attributes, rest, last_line = super
+              return [attributes, rest, last_line + joined_lines]
+            end
 
             dynamic = pairs.reduce("{") { |source, (name, value)| "#{source}#{::Haml::Util.inspect_obj(name)} => #{value}," } << "}"
-            [[{}, dynamic], rest, @line.index + 1]
+            [[{}, dynamic], rest, @line.index + 1 + joined_lines]
           end
 
           def annotate_tag_nodes(root)
@@ -132,6 +147,36 @@ module Klenod
             pairs
           end
 
+          # Returns the index of the `)` that closes the list opened at index 0,
+          # ignoring brackets inside quoted values.
+          def attribute_list_close_index(source)
+            depth = 0
+            quote = nil
+            escaped = false
+
+            source.each_char.with_index do |character, index|
+              if quote
+                if escaped
+                  escaped = false
+                elsif character == "\\"
+                  escaped = true
+                elsif character == quote
+                  quote = nil
+                end
+              else
+                case character
+                when "'", '"' then quote = character
+                when "(", "[", "{" then depth += 1
+                when ")", "]", "}"
+                  depth -= 1
+                  return index if depth.zero?
+                end
+              end
+            end
+
+            nil
+          end
+
           def attribute_boundary?(remaining_source)
             attribute_sequence?(remaining_source)
           end

data/lib/klenod/build/version.rb

@@ -2,6 +2,6 @@
 
 module Klenod
   module Build
-    VERSION = "0.0.22"
+    VERSION = "0.0.23"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klenod-build
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Andrés Alin
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.22
+        version: 0.0.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.22
+        version: 0.0.23
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement