puppet-lint-class_alignment-check 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dc0a012b0d80156eaad90609fb62d8f32d580d6acbc5f28e6981d71137fc301
-  data.tar.gz: 72378622329307ce0c0631caebec4fef365fe137b89581bfd01bae1e8bad9537
+  metadata.gz: d0263490e2b13cd13ec0f9cb4e3d569d4a004aa11b6caa63b51c4c0b4cb2a405
+  data.tar.gz: aadc7259538098f01145ff841be78496c2ed04d9c799eb1a8d6d3a25d7df9ada
 SHA512:
-  metadata.gz: f7750b39ff5ef57ec5fca519a77e1aa0a1b0def9d906814c4c6b2cf096229a8cde51bc75d796e174c4f351e3fe17f4a5baeb79b3649d468e255f88433d3691a2
-  data.tar.gz: 79e3897e36b000f944ebe5d90bbdd671215e2fe94d4a6956a3ddd258fbced0ec4ecd5c8bee7e94b9a69fbc1df88fff411b87872f74babce420f870fc3ac84339
+  metadata.gz: eb63b8f785be3ee853cab31c262c169acaeafd21100833e467c1ee8ae7cb4921aa8b877e42f8fe4a242dbca0b104c51637bbd9d62cdec9a2c1fc85d190451200
+  data.tar.gz: 49b6920703283013416902bfe3d28c0f57746127d2f20f07d21cd57aa29adc3bda5c6c12486c4639ab9a0997d0010007453e663ccf6fa4fd712eb3dda0e7e696

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

@@ -11,18 +11,26 @@ def a_param?(token)
   elsif %i[DQPRE DQMID].include?(token&.prev_code_token&.type)
     false
   elsif token&.type == :VARIABLE
+    # first var in the class
+    if token&.prev_token_of(:CLASS)&.next_token_of(:LPAREN)&.next_token_of(:VARIABLE) == token
+      return true
+    elsif token&.prev_token_of(:DEFINE)&.next_token_of(:LPAREN)&.next_token_of(:VARIABLE) == token
+      return true
+    end
+
     count = 0
     while token&.prev_token
       token = token.prev_token
-      if %i[LPAREN LBRACK LBRACE].include?(token.type)
+      return false if token.type == :EQUALS
+
+      if %i[RPAREN RBRACK RBRACE].include?(token.type)
         count += 1
-      elsif %i[RPAREN RBRACK RBRACE].include?(token.type)
+      elsif %i[LPAREN LBRACK LBRACE].include?(token.type)
         count -= 1
-      elsif %i[DEFINE CLASS].include?(token.type)
-        break
       end
+
+      return true if count.zero? && token.type == :COMMA
     end
-    true if count == 1
   end
 end
 

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

@@ -123,6 +123,8 @@ describe 'class_params_newline' do
           define long_ggg ($foo, $bar=[], $foo, $bar=[], $foo, $bar=[], $foo, $bar=[]) {}
 
           define asdf ($prefix, $pattern, $expire, $port, $prefix, $pattern, $expire, $port) { }
+
+          define asdf ($prefix, $pattern, $expire, $port, $prefix, $pattern=$a and $b, $epe=-$foo, $port=!$foo) { }
         END
       end
 
@@ -212,6 +214,17 @@ describe 'class_params_newline' do
             $expire,
             $port
           ) { }
+
+          define asdf (
+            $prefix,
+            $pattern,
+            $expire,
+            $port,
+            $prefix,
+            $pattern=$a and $b,
+            $epe=-$foo,
+            $port=!$foo
+          ) { }
         END
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-class_alignment-check
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Anh Pham