yoshiki 11.0.0.pre.11 → 11.0.0.pre.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 624a862271fe20d1e371ee54c2369d19fa1ad88e447ac5a489870f6c59f5c456
-  data.tar.gz: 23b13cb682477e168ae3379fc5b3b8b25122c2a5ce9b11821763f8cae7aa7b7c
+  metadata.gz: 7880f8dd34e18f32da07f286fdabfecfad92b70f420a0cc11f4a69768b84980d
+  data.tar.gz: 6a11267e9a64df75b2708935076400fdb6898ef5872a262ec04edc9ae0971dc8
 SHA512:
-  metadata.gz: 64ad4e0a64799205605bf6a2b3f174d9ed17018920ff5db7321cc56eafc1f8e8c4c71d17fc87f320379e0123355477f33d2805a4c6a1ad3e64be8fe4e131ecbe
-  data.tar.gz: e512b198eb7714d85ff507b6dfa243f10ca386a99e30d1e69aa1d988daa5c0816faf6a2bbda5c10be3c84c6f4fe2f4fb8f18629643d76c657ea5c0d307bf4266
+  metadata.gz: d458f79d7411fc843cf6bd3518f02a251b1d27a4492323739fd430358391b93fc8d04f00103e7068f00016cea41ff3486db707b5c19ece209872485f9f70d7d8
+  data.tar.gz: 328635ca21159c25ed41674d1aac844495168d4ba19306cc28d264d981d292594e578a87d6f037380893d519a21cebf01d2515bf540e8a48353ce41adbe7f438

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yoshiki (11.0.0.pre.11)
+    yoshiki (11.0.0.pre.12)
       rubocop (= 1.89.0)
       rubocop-performance (= 1.26.1)
       rubocop-rake (= 0.7.1)

data/lib/rubocop/cop/yoshiki/style/nested_html_option_keys/rewriter.rb

@@ -18,7 +18,7 @@ module RuboCop
             end
 
             def changed?
-              @forest.direct.any? && replacement != @node.source
+              @forest.mutated? && replacement != @node.source
             end
 
             def replacement
@@ -36,10 +36,19 @@ module RuboCop
               @prefixes     = prefixes
               @direct       = []
               @all_offenses = []
+              @mutated      = false
               @tree         = Tree.new(self)
               @entries      = build(node, mode_for(node), true)
             end
 
+            def mutated?
+              @mutated
+            end
+
+            def mutated!
+              @mutated = true
+            end
+
             def build node, mode, direct
               node.children.each_with_object([]) do |child, entries|
                 push(entries, child, mode, direct)
@@ -129,9 +138,14 @@ module RuboCop
             def insert_path entries, path, pair, direct
               @forest.note_offense(pair, direct)
               slot = ensure_branch(entries, path.first)
-              return if slot && merge_leaf?(slot[:children], path.drop(1), pair)
+              if slot && merge_leaf?(slot[:children], path.drop(1), pair)
+                @forest.mutated!
+                return
+              end
 
               entries.delete(slot) if slot && slot[:children].empty?
+              return if join_leaf?(entries, path, pair)
+
               append(entries, :raw, source: pair.source)
             end
 
@@ -164,11 +178,22 @@ module RuboCop
               first, *rest = path
               return add_leaf?(entries, first, pair) if rest.empty?
 
-              slot = ensure_branch(entries, first) or return false
-              return true if merge_leaf?(slot[:children], rest, pair)
+              slot = ensure_branch(entries, first)
+              if slot
+                return true if merge_leaf?(slot[:children], rest, pair)
 
-              entries.delete(slot) if slot[:children].empty?
-              false
+                entries.delete(slot) if slot[:children].empty?
+              end
+
+              add_leaf?(entries, path.join('_'), pair)
+            end
+
+            def join_leaf? entries, path, pair
+              return false if @forest.prefix?(path.first)
+              return false unless add_leaf?(entries, path.join('_'), pair)
+
+              @forest.mutated!
+              true
             end
 
             def add_leaf? entries, name, pair

data/lib/yoshiki/version.rb

@@ -1,5 +1,5 @@
 module Yoshiki
 
-  VERSION = '11.0.0-11'.freeze
+  VERSION = '11.0.0-12'.freeze
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yoshiki
 version: !ruby/object:Gem::Version
-  version: 11.0.0.pre.11
+  version: 11.0.0.pre.12
 platform: ruby
 authors:
 - BM5k