puppet-lint-class_alignment-check 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40fcbe1d19cc554f3b3a18fd44e8d252f8d4e7b39d5aea1ae14bb108b84d4ed5
-  data.tar.gz: 8909d0c354b917d2516ee7fd29078a2df9523a73b0e50d010eb6d36fb0fcff70
+  metadata.gz: 4cfe3bc16f68ebdeb6b63a01f2bdefdba07052baa618e1090b25c23ea133a1b6
+  data.tar.gz: b75630c6a6c37634f011ad13fe6147bf3c12753780a5f417ba074bbc1a05aedb
 SHA512:
-  metadata.gz: aa23065a0ab5698aaef52a521279d871c68d594825fdf31cd1820b2e07fa4d7b427c205b2eb3004d79ad54c3a88b18c4ecc1190507ee02610bfa5aaa90e65799
-  data.tar.gz: f606316e9de223a83e1940daf2d5fca115eb6968116fbe7a5983ce43d7538dd368eb2b145becd227f6602260f58b57b5e9110c9cc2dbc6055d2789aa29b2d39c
+  metadata.gz: 465e680a7fc27debc8fbd2243ed8c68deae99d405ba5e82cc42aef2716f9865b198120f756cd815149b1fc43309a784b08e4662d2a49407a70d49b048ea2adf7
+  data.tar.gz: 467601075b7fd04ccee1b490809ff719f3a8129141a9afe03c93f2744b412cba0a8fcc6b2c54aeedc12358586d608ca0653cd6bcfa8929ccca8423192e1f482a

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

@@ -11,18 +11,24 @@ def a_param?(token)
     return true if token&.prev_token_of(:DEFINE)&.next_token_of(:LPAREN)&.next_token_of(:VARIABLE) == token
 
     count = 0
+    saw_a_comma = false
     while token&.prev_token
       token = token.prev_token
-      return false if token.type == :EQUALS
+
+      saw_a_comma = true if token.type == :COMMA
+
+      return false if token.type == :EQUALS && count == 0 && saw_a_comma == false
 
       if %i[RPAREN RBRACK RBRACE].include?(token.type)
-        count += 1
-      elsif %i[LPAREN LBRACK LBRACE].include?(token.type)
         count -= 1
+      elsif %i[LPAREN LBRACK LBRACE].include?(token.type)
+        count += 1
       end
 
-      return true if count.zero? && token.type == :COMMA
+      break if %i[CLASS DEFINE].include?(token.type)
     end
+
+    true if count == 1
   end
 end
 
@@ -81,6 +87,39 @@ def get_prev_code_token(token, character)
   end
 end
 
+def get_param_start_token(token)
+  return nil unless a_param?(token)
+
+  case token&.prev_code_token&.type
+
+  # Integer $db_port
+  when :TYPE
+    token.prev_code_token
+
+  when :CLASSREF
+    token.prev_code_token
+
+  # Variant[Undef, Enum['UNSET'], Stdlib::Port] $db_port
+  when :RBRACK
+    count = 0
+    while token&.prev_code_token
+      token = token.prev_code_token
+      case token.type
+      when :RBRACK
+        count += 1
+      when :LBRACK
+        count -= 1
+      end
+
+      break if count.zero?
+    end
+    token.prev_code_token
+
+  else
+    token
+  end
+end
+
 def get_prev_param_token(token)
   while token&.prev_code_token
     token = token.prev_code_token

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

@@ -37,9 +37,9 @@ PuppetLint.new_check(:class_params_newline) do
 
         next unless a_param?(token)
 
-        if token.prev_code_token.type == :LPAREN
-          next if token.line != token.prev_code_token.line
-        elsif token.line != get_prev_param_token(token).line
+        if get_param_start_token(token)&.prev_code_token.type == :LPAREN
+          next if token.line != get_param_start_token(token).prev_code_token.line
+        elsif token.line != get_prev_param_token(token)&.line
           next
         end
 
@@ -58,29 +58,7 @@ PuppetLint.new_check(:class_params_newline) do
 
   def fix(problem)
     token = problem[:token]
-    if token.type == :VARIABLE
-      case token&.prev_code_token&.type
-      # Integer $db_port
-      when :TYPE
-        token = token.prev_code_token
-
-      # Variant[Undef, Enum['UNSET'], Stdlib::Port] $db_port
-      when :RBRACK
-        count = 0
-        while token&.prev_code_token
-          token = token.prev_code_token
-          case token.type
-          when :RBRACK
-            count += 1
-          when :LBRACK
-            count -= 1
-          end
-
-          break if count.zero?
-        end
-        token = token.prev_code_token
-      end
-    end
+    token = get_param_start_token(token) if token.type == :VARIABLE
 
     last_non_whitespace_token = token.prev_token
     while last_non_whitespace_token&.prev_token

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

@@ -101,7 +101,7 @@ describe 'class_params_newline' do
           class bar ($foo = 1, $bar = $a, $foo = 1, $bar = $a, $foo = 1, $bar = $a,) {}
 
           class aaa ( $foo = 1, $bar = $a,) {}
-          class aaa ( $foo = 1, $bar = $a, $foo = 1, $bar = $a, $foo = 1, $bar = $a,) {}
+          class aaa ( Integer $foo = 1, $bar = $a, $foo = 1, $bar = $a, $foo = 1, $bar = $a,) {}
 
           class bbb ( $foo = 1, $bar = $a, ) {}
           class bbb ( $foo = 1, $bar = $a, $foo = 1, $bar = $a, $foo = 1, $bar = $a, ) {}
@@ -125,6 +125,15 @@ describe 'class_params_newline' do
           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) { }
+
+          class aaa (
+            $aaa = func('bbb', $ccc), $bar = $a, $foo = 1, $bar = $a,
+          ) {}
+
+          class name (
+            Boolean             $foo,
+            Optional[String[1]] $bar,
+          ) { }
         END
       end
 
@@ -152,7 +161,7 @@ describe 'class_params_newline' do
 
           class aaa ( $foo = 1, $bar = $a,) {}
           class aaa (
-            $foo = 1,
+            Integer $foo = 1,
             $bar = $a,
             $foo = 1,
             $bar = $a,
@@ -225,6 +234,18 @@ describe 'class_params_newline' do
             $epe=-$foo,
             $port=!$foo
           ) { }
+
+          class aaa (
+            $aaa = func('bbb', $ccc),
+            $bar = $a,
+            $foo = 1,
+            $bar = $a,
+          ) {}
+
+          class name (
+            Boolean             $foo,
+            Optional[String[1]] $bar,
+          ) { }
         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.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Anh Pham