puppet-lint-manifest_whitespace-check 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b3bc8cb98f4459ad929e160c0759c73e76fc6253c54061b4edea16370f8b38d
-  data.tar.gz: ddc62ccbc2c3537f6057c73d498a035dc4007f416a8b435140a207aa8c0380f5
+  metadata.gz: bd465f6f8f5fe07dc5de6b9a9c3eb36e8f99e5c647e3d48a6001cd0f32749cf9
+  data.tar.gz: e0bb7d7f3ee60d7bfed54e28ee24b78dae5a8477b870e41b33902bb86b3a5407
 SHA512:
-  metadata.gz: 59189f5b0b1922bfd04ef96b64f53662b5740ef3a20d8a34f44045fa90d194a4c94e41ca6440ada5b0ecb8b8ec3bb27631b85c02e61f59b4844a708665e417a2
-  data.tar.gz: 3547dfb1ab41289ef4ad92168bbc02a12b0ae717b9e97146c0fc2cb13314a972cc1d1c191c0d4feaf73ac7604deb7b272ac90616693f980d1be224a2d498ec26
+  metadata.gz: 85069ac6a3e3c7a349eea0e102a35f737204b210d35caf451e71ccd04da54bc241061947be20a93dc2adfc4a0ca91bc429243c27b7d4c50cc2fe072971dfecfd
+  data.tar.gz: a7bde6a55568780469a5576c2353d77108c86e5e6ca84a448992fb9549dd89530f140ca2a1aae1f268145c25321b3acc8467706215a16fd90093043016691459

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

@@ -8,9 +8,9 @@ PuppetLint.new_check(:manifest_whitespace_opening_brace_before) do
 
       next unless prev_token && prev_code_token
 
-      next if %i[COLON].include?(prev_code_token.type)
+      next if %i[COMMENT COLON].include?(prev_code_token.type)
 
-      if %i[COMMENT COMMA LPAREN LBRACK LBRACE].include?(prev_code_token.type)
+      if %i[LPAREN LBRACK LBRACE].include?(prev_code_token.type)
         next if tokens.index(prev_code_token) == tokens.index(brace_token) - 1
         next if tokens[tokens.index(prev_code_token)..tokens.index(brace_token)].collect(&:type).include?(:NEWLINE)
 
@@ -35,13 +35,16 @@ PuppetLint.new_check(:manifest_whitespace_opening_brace_before) do
     prev_code_token = prev_non_space_token(token)
 
     while prev_code_token != prev_token
-      raise PuppetLint::NoFix unless %i[WHITESPACE INDENT NEWLINE].include?(prev_token.type)
+      if !%i[LPAREN LBRACK LBRACE].include?(prev_code_token.type) &&
+         %i[WHITESPACE INDENT NEWLINE].include?(prev_token.type)
+        raise PuppetLint::NoFix
+      end
 
       remove_token(prev_token)
       prev_token = prev_token.prev_token
     end
 
-    add_token(tokens.index(token), new_single_space)
+    add_token(tokens.index(token), new_single_space) unless %i[LPAREN LBRACK LBRACE].include?(prev_code_token.type)
   end
 end
 
@@ -51,7 +54,7 @@ PuppetLint.new_check(:manifest_whitespace_opening_brace_after) do
       next_token = brace_token.next_token
 
       next unless next_token && !is_single_space(next_token)
-      next if %i[RBRACE].include?(next_token.type)
+      next if %i[RBRACE LBRACK LBRACE].include?(next_token.type)
 
       if next_token.type == :NEWLINE
         next_token = next_token.next_token

data/spec/puppet-lint/plugins/manifest_whitespace_opening_brace_spec.rb

@@ -19,6 +19,23 @@ describe 'manifest_whitespace_opening_brace_before' do
     end
   end
 
+  context 'inside, inline with function' do
+    let(:code) do
+      <<~EOF
+        $sssd_config = {
+        ▏ 'sssd' => merge($config, {
+        ▏ ▏ ▏ 'domains'  => $domains,
+        ▏ ▏ ▏ 'services' => 'nss,pam',
+        ▏ }),
+        }
+      EOF
+    end
+
+    it 'should detect no problems' do
+      expect(problems).to be_empty
+    end
+  end
+
   context 'inside interpolation' do
     let(:code) do
       <<~EOF

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-manifest_whitespace-check
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jo Vandeginste
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2022-10-10 00:00:00.000000000 Z
@@ -151,7 +151,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.7
-signing_key:
+signing_key: 
 specification_version: 4
 summary: A puppet-lint check to validate whitespace in manifests
 test_files: []