puppet-lint-trailing_comma-check 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c9f46f9eb5dcd7e422c2bb43a826240fe03ba9f72ff22308df4ac0033f785b7
-  data.tar.gz: dc033e54cb68f116b8c154c85341ca872c6990ab97cc738d753b6266b7756fe2
+  metadata.gz: 6ac708c60b0d04b2fee14b3c0a02a94b24ee33e4e20859b497e00871c964c8d1
+  data.tar.gz: 642166230b6b41d80b88d3eda8aa9437786477eee943b79f06482f0b5bd45a06
 SHA512:
-  metadata.gz: 4acfb16cb9d12f6a13278e384b12c0768d5082dc987c16edc25805512afc07201433a4ee0dc832f3cb8b0c3a36790233886514e8f969f83400fff8d8915d662a
-  data.tar.gz: 6f0089157a3db72afc963c7f4ce1234d4698c647fd5013ab5f4641c8e5dd90ce735f7e8a9a47faa455544a4e73b3759dde1e6ba28c95f4ae5771011f3eaa9444
+  metadata.gz: cba19b819fa4d2274bdccbea79ba3721041c918bfd769b56044a3a9f785820a6dd8794915690784c1f8e2d3753ab4323b36bdcf71913c1584abdacd58a2a1723
+  data.tar.gz: d08b41b79afa570a7bde19c427cb9dbd42367a5470e60b1374b8ae3c86d8975e79f31911603d567e90297254f2802c4452fceada8058d44364476557b4d88d35

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
+## [3.0.1](https://github.com/voxpupuli/puppet-lint-trailing_comma-check/tree/3.0.1) (2025-12-09)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-lint-trailing_comma-check/compare/3.0.0...3.0.1)
+
+**Fixed bugs:**
+
+- Autofix adds double comma on nested structure [\#44](https://github.com/voxpupuli/puppet-lint-trailing_comma-check/issues/44)
+- Fix bracket matching of nested arrays [\#45](https://github.com/voxpupuli/puppet-lint-trailing_comma-check/pull/45) ([alexjfisher](https://github.com/alexjfisher))
+
 ## [3.0.0](https://github.com/voxpupuli/puppet-lint-trailing_comma-check/tree/3.0.0) (2025-09-25)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-lint-trailing_comma-check/compare/2.0.0...3.0.0)

data/lib/puppet-lint/plugins/check_trailing_comma.rb

@@ -5,10 +5,14 @@ PuppetLint.new_check(:trailing_comma) do
       tokens.each_with_index do |token, token_idx|
         next unless token.type == :LBRACK
 
+        level = 0
         real_idx = 0
         tokens[token_idx + 1..-1].each_with_index do |cur_token, cur_token_idx|
           real_idx = token_idx + 1 + cur_token_idx
-          break if cur_token.type == :RBRACK
+
+          level += 1 if cur_token.type == :LBRACK
+          level -= 1 if cur_token.type == :RBRACK
+          break if level < 0
         end
 
         # Ignore resource references

data/spec/puppet-lint/plugins/check_trailing_comma/check_trailing_comma_spec.rb

@@ -167,6 +167,31 @@ describe 'trailing_comma' do
         expect(problems).to contain_warning(msg).on_line(46).in_column(25)
         expect(problems).to contain_warning(msg).on_line(58).in_column(14)
       end
+
+      context 'with nested arrays' do
+        let(:code) do
+          <<~EOS
+            class { 'myclass':
+              directives => [
+                 {
+                    directives => [
+                      'if net = 0.0.0.0/0 then reject',
+                      'else accept'
+                    ],
+                 },
+              ],
+            }
+          EOS
+        end
+
+        it 'detects 1 problem' do
+          expect(problems).to have(1).problems
+        end
+
+        it 'creates a warning' do
+          expect(problems).to contain_warning(msg).on_line(6).in_column(24)
+        end
+      end
     end
 
     context 'with heredoc' do
@@ -458,6 +483,44 @@ describe 'trailing_comma' do
         EOS
         )
       end
+
+      context 'with nested arrays' do
+        let(:code) do
+          <<~EOS
+            class { 'myclass':
+              directives => [
+                 {
+                    directives => [
+                      'if net = 0.0.0.0/0 then reject',
+                      'else accept'
+                    ],
+                 },
+              ],
+            }
+          EOS
+        end
+
+        it 'detects 1 problem' do
+          expect(problems).to have(1).problems
+        end
+
+        it 'adds single trailing comma' do
+          expect(manifest).to eq(
+            <<~EOS,
+              class { 'myclass':
+                directives => [
+                   {
+                      directives => [
+                        'if net = 0.0.0.0/0 then reject',
+                        'else accept',
+                      ],
+                   },
+                ],
+              }
+            EOS
+          )
+        end
+      end
     end
 
     context 'with heredoc' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-trailing_comma-check
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Vox Pupuli