haml 6.0.11 → 6.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1775ac3d762a6136ef378f69b5522a73b98dfe5ce5a4727c06a061e3d6ceb989
-  data.tar.gz: '06938ad9c4452c051d39dbc1d03bd352fa260a4f3768afb3bcce66f3f3b81b70'
+  metadata.gz: 4dfc2f798a71c0128dbbbd06c47d480b24350032d376f6a36ffc555482e4e749
+  data.tar.gz: 421b21fd205b9ebe320da800acc44df8fb30b446629a29bbd2c46a3c3d0b0387
 SHA512:
-  metadata.gz: ac77e8fd0f76d1bdec1092f34e95b438ce0e85477d7eb5a9a973f8ab1d95327be035eac8b70589cb043d99a7ab5bb9d112136ca21c022d2f157239d99aea62a7
-  data.tar.gz: c76565dda6a32822dfb98a8c808b7dfe8c0b640cc59516bf2c69cb6b51aa1605aafbe506d747a67c26c35f46e09f342bf4493191cd8cfb71f100c146ea74c935
+  metadata.gz: 5c158b9e6862a0a83443a375baf329c84a5eae3928709cfa685fe68a80ed3a6e47279ec9a3be015881de78ca1b85c51d2f47a65b99b58b317da2a6e04d2e5c70
+  data.tar.gz: 2ab0dcc943438c1534132896b754dd671876fef85bf3980a6165181f520f74fe1382365c0b061e49018f2e86c696cf002f597b208de293e50ea292741f1cbbf9

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Haml Changelog
 
+## 6.0.12
+
+* Fix a whitespace removal with `>` and an `if`-`else` statement [#1114](https://github.com/haml/haml/issues/1114)
+
 ## 6.0.11
 
 * Fix a whitespace removal with `>` and an `if` statement [#1114](https://github.com/haml/haml/issues/1114)

data/lib/haml/compiler/children_compiler.rb

@@ -6,6 +6,7 @@ module Haml
     class ChildrenCompiler
       def initialize
         @lineno = 1
+        @multi_flattener = Temple::Filters::MultiFlattener.new
       end
 
       def compile(node, &block)
@@ -89,15 +90,48 @@ module Haml
       end
 
       def rstrip_whitespace!(temple)
+        return if temple.size == 1
+
         case temple[0]
-        when :multi, :block
+        when :multi
           case temple[-1][0]
-          when :multi, :block
-            rstrip_whitespace!(temple[-1])
           when :whitespace
             temple.delete_at(-1)
+          when :multi, :block
+            rstrip_whitespace!(temple[-1])
+          end
+        when :block
+          _block, code, exp = temple
+          if code.start_with?(/\s*if\s/)
+            # Remove [:whitespace] before `end`
+            exp.replace(@multi_flattener.call(exp))
+            rstrip_whitespace!(exp)
+
+            # Remove [:whitespace] before `else` if exists
+            else_index = find_else_index(exp)
+            if else_index
+              whitespace_index = else_index - 1
+              while exp[whitespace_index] == [:newline]
+                whitespace_index -= 1
+              end
+              if exp[whitespace_index] == [:whitespace]
+                exp.delete_at(whitespace_index)
+              end
+            end
+          end
+        end
+      end
+
+      def find_else_index(temple)
+        multi, *args = temple
+        return nil if multi != :multi
+
+        args.each_with_index do |arg, index|
+          if arg[0] == :code && arg[1].match?(/\A\s*else\s*\z/)
+            return index + 1
           end
         end
+        nil
       end
 
       def insert_whitespace?(node)

data/lib/haml/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Haml
-  VERSION = '6.0.11'
+  VERSION = '6.0.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.0.11
+  version: 6.0.12
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-26 00:00:00.000000000 Z
+date: 2022-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple