puppet-lint-class_alignment-check 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8c9035498fac5688a9587ff1b5eaaf15027974e85ac46c9745419b3cd309319
-  data.tar.gz: c0d6f86ab41d272eb2f2e1883ebd2f9502888a1ba21d592523c8038d1f0dc5a4
+  metadata.gz: 3dc0a012b0d80156eaad90609fb62d8f32d580d6acbc5f28e6981d71137fc301
+  data.tar.gz: 72378622329307ce0c0631caebec4fef365fe137b89581bfd01bae1e8bad9537
 SHA512:
-  metadata.gz: b1bd3766aa9650219858800d4374434fba8fca275fe905d1734917ddcfb17fe1ff64efb33ffdeaa98ca48ff85feff8242fe45127c2460f6cd752e854d5c18952
-  data.tar.gz: 9d1e88aa315c31b44660589c183f6beca1399a84219a6f6f57ad741fb1eae633d4bd7c92e537c3b6b2c73767cbb0a3f70084040540cbb0681030272bdca5bee6
+  metadata.gz: f7750b39ff5ef57ec5fca519a77e1aa0a1b0def9d906814c4c6b2cf096229a8cde51bc75d796e174c4f351e3fe17f4a5baeb79b3649d468e255f88433d3691a2
+  data.tar.gz: 79e3897e36b000f944ebe5d90bbdd671215e2fe94d4a6956a3ddd258fbced0ec4ecd5c8bee7e94b9a69fbc1df88fff411b87872f74babce420f870fc3ac84339

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

@@ -8,8 +8,21 @@ def a_param?(token)
     false
   elsif token&.prev_code_token&.type == :FARROW
     false
-  elsif token&.type == :VARIABLE && !%i[DQPRE DQMID].include?(token.prev_code_token.type)
-    true
+  elsif %i[DQPRE DQMID].include?(token&.prev_code_token&.type)
+    false
+  elsif token&.type == :VARIABLE
+    count = 0
+    while token&.prev_token
+      token = token.prev_token
+      if %i[LPAREN LBRACK LBRACE].include?(token.type)
+        count += 1
+      elsif %i[RPAREN RBRACK RBRACE].include?(token.type)
+        count -= 1
+      elsif %i[DEFINE CLASS].include?(token.type)
+        break
+      end
+    end
+    true if count == 1
   end
 end
 

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

@@ -12,21 +12,16 @@ PuppetLint.new_check(:class_params_newline) do
       tokens = item[:param_tokens]
       next if tokens.nil?
 
-      first_param = tokens.index { |token| a_param?(token) }
-      last_param = tokens.rindex { |token| a_param?(token) }
-      next if first_param.nil?
-      next if last_param.nil?
-
-      # Skip if there's only 1 param
-      next if tokens[first_param] == tokens[last_param]
+      # Skip if line length < 80 chars
+      first_paren = tokens[0]&.prev_token_of(:LPAREN)
+      last_paren = tokens[-1]&.next_token_of(:RPAREN)
+      next if first_paren.nil?
+      next if last_paren.nil?
+      next if first_paren.line == last_paren.line && last_paren.column < 80
 
       tokens.each do |token|
         if token == tokens[-1]
-          rparen = token
-          while rparen&.next_token
-            rparen = rparen.next_token
-            break if rparen.type == :RPAREN
-          end
+          rparen = token.next_token_of(:RPAREN)
 
           last_code_token = token
           while last_code_token&.prev_token
@@ -46,7 +41,6 @@ PuppetLint.new_check(:class_params_newline) do
             newline: true,
             newline_indent: item[:tokens][0].column - 1
           )
-          break
         end
 
         next unless a_param?(token)
@@ -57,6 +51,7 @@ PuppetLint.new_check(:class_params_newline) do
           next
         end
 
+        # binding.break
         notify(
           :warning,
           message: "`#{token.to_manifest}` should be in a new line (expected in line #{token.line + 1}, but found it in line #{token.line})",
@@ -72,26 +67,37 @@ PuppetLint.new_check(:class_params_newline) do
 
   def fix(problem)
     token = problem[:token]
-    case token&.prev_code_token&.type
-    when :TYPE
-      token = token.prev_code_token
-    when :RBRACK
-      count = 0
-      while token&.prev_code_token
+    if token.type == :VARIABLE
+      # Integer $db_port
+      if token&.prev_code_token&.type == :TYPE
         token = token.prev_code_token
-        case token.type
-        when :RBRACK
-          count += 1
-        when :LBRACK
-          count -= 1
-        end
 
-        break if count.zero?
+      # Variant[Undef, Enum['UNSET'], Stdlib::Port] $db_port
+      elsif token&.prev_code_token&.type == :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
-      token = token.prev_code_token
     end
 
-    index = tokens.index(token.prev_code_token.next_token)
+    last_non_whitespace_token = token.prev_token
+    while last_non_whitespace_token&.prev_token
+      break unless %i[WHITESPACE INDENT NEWLINE].include?(last_non_whitespace_token.type)
+
+      last_non_whitespace_token = last_non_whitespace_token.prev_token
+    end
+
+    index = tokens.index(last_non_whitespace_token) + 1
     tokens.insert(index, PuppetLint::Lexer::Token.new(:NEWLINE, "\n", 0, 0))
 
     # When there's no space at the beginning of the param

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

@@ -95,44 +95,123 @@ describe 'class_params_newline' do
       let(:code) do
         <<-END
           class foo ($foo = 1, $bar = $a) {}
+          class foo ($foo = 1, $bar = $a, $foo = 1, $bar = $a, $foo = 1, $bar = $a) {}
 
           class bar ($foo = 1, $bar = $a,) {}
+          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 bbb ( $foo = 1, $bar = $a, ) {}
+          class bbb ( $foo = 1, $bar = $a, $foo = 1, $bar = $a, $foo = 1, $bar = $a, ) {}
 
           class ccc ($foo = 1) {}
 
           class ddd {}
+
+          class eee (
+            $foo = 1,
+            $workers = max($::processorcount, 1),
+            $database_path = $aaa,) inherits sap_zabbix::params { }
+          { }
+
+          class fff ($foo, $bar=[], $foo, $bar=[], $foo, $bar=[], $listen_ips = [$::ipaddress]) {}
+
+          define ggg ($foo, $bar=[]) {}
+
+          define long_ggg ($foo, $bar=[], $foo, $bar=[], $foo, $bar=[], $foo, $bar=[]) {}
+
+          define asdf ($prefix, $pattern, $expire, $port, $prefix, $pattern, $expire, $port) { }
         END
       end
 
       let(:fixed) do
         <<-END
+          class foo ($foo = 1, $bar = $a) {}
           class foo (
+            $foo = 1,
+            $bar = $a,
+            $foo = 1,
+            $bar = $a,
             $foo = 1,
             $bar = $a
           ) {}
 
+          class bar ($foo = 1, $bar = $a,) {}
           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 bbb ( $foo = 1, $bar = $a, ) {}
           class bbb (
             $foo = 1,
             $bar = $a,
+            $foo = 1,
+            $bar = $a,
+            $foo = 1,
+            $bar = $a,
           ) {}
 
           class ccc ($foo = 1) {}
 
           class ddd {}
+
+          class eee (
+            $foo = 1,
+            $workers = max($::processorcount, 1),
+            $database_path = $aaa,
+          ) inherits sap_zabbix::params { }
+          { }
+
+          class fff (
+            $foo,
+            $bar=[],
+            $foo,
+            $bar=[],
+            $foo,
+            $bar=[],
+            $listen_ips = [$::ipaddress]
+          ) {}
+
+          define ggg ($foo, $bar=[]) {}
+
+          define long_ggg (
+            $foo,
+            $bar=[],
+            $foo,
+            $bar=[],
+            $foo,
+            $bar=[],
+            $foo,
+            $bar=[]
+          ) {}
+
+          define asdf (
+            $prefix,
+            $pattern,
+            $expire,
+            $port,
+            $prefix,
+            $pattern,
+            $expire,
+            $port
+          ) { }
         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.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Anh Pham