Merge pull request #45 from alexjfisher/issue44

Fix bracket matching of nested arrays

Author: bastelfreak

lib/puppet-lint/plugins/check_trailing_comma.rb

@@ -5,10 +5,14 @@ def array_indexes
       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

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

@@ -167,6 +167,31 @@ class { '::apache':
         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 @@ class { '::apache':
         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