puppet-lint-class_alignment-check 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebf0e96bee2765a17143585f49c445c388612b1563ac6ec54513ee39989013ef
-  data.tar.gz: 95d3539f4c25fd584610774c695394fb43b17ebb3881e0e73976f0a337eb6a57
+  metadata.gz: a097f4f616f220ca1061819f771b0e9553f89d91f2de912b271026d6a1be2640
+  data.tar.gz: 0db8265872341ec18239a51144d2ec7fd288f71488f1b5bf2174726c17bf279d
 SHA512:
-  metadata.gz: 374133ecbc4fa790491148cc2f62bbe630584891a10df2d3cffec9ce289b2b63ab8bdd6fcd43477735f25fe52e246535017af0f59d27b75f60bd9bf3714bff3c
-  data.tar.gz: d98666d602b2d846c5ad815d6f06b1dd15fa29ef7c896f6b507217d14e54f5536202aaef80127fc6b900b4ecd05b5183214641e55e45ae27a45dd7f28b0ba856
+  metadata.gz: a5d927d414770af9512912b5ee24eeedfafbfb1987984f0ad5806e6950c1f9efc56ed542114bb1933eb9920f4fbc9367ef9f9233c2ec6c20ed170857e204010b
+  data.tar.gz: 2dfa0a335795a1d5b21a35b9e68a01fcc19a2ef77efaa50a91c2460e12a7cae7e3fde92d772aa4fbc7f285bafbf5ceb98b62a7c146eb6cd140d9a748cdc02b97

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

@@ -4,16 +4,16 @@
 # https://puppet.com/docs/puppet/7/style_guide.html#style_guide_classes-param-indentation-alignment
 
 def a_param?(token)
-  if token.prev_code_token.type == :EQUALS
+  if token&.prev_code_token&.type == :EQUALS
     false
-  elsif token.prev_code_token.type == :FARROW
+  elsif token&.prev_code_token&.type == :FARROW
     false
-  elsif token.type == :VARIABLE && !%i[DQPRE DQMID].include?(token.prev_code_token.type)
+  elsif token&.type == :VARIABLE && !%i[DQPRE DQMID].include?(token.prev_code_token.type)
     true
   end
 end
 
-def first_param_on_the_line?(token)
+def first_on_the_line?(token, type)
   origin = token
   while token&.prev_token
     token = token.prev_token
@@ -24,7 +24,7 @@ def first_param_on_the_line?(token)
   while token&.next_token
     token = token.next_token
 
-    break if token.type == :VARIABLE
+    break if token.type == type
   end
 
   origin == token
@@ -33,9 +33,9 @@ end
 def the_one?(token, character)
   case character
   when '='
-    true if token.type == :EQUALS
+    true if token.type == :EQUALS && first_on_the_line?(token, :EQUALS)
   when '$'
-    true if token.type == :VARIABLE && a_param?(token) && first_param_on_the_line?(token)
+    true if a_param?(token) && first_on_the_line?(token, :VARIABLE)
   end
 end
 
@@ -148,30 +148,14 @@ end
 # This function is copied & modified from puppet-lint arrow_alignment fix
 # https://github.com/puppetlabs/puppet-lint/blob/020143b705b023946739eb44e7c7d99fcd087527/lib/puppet-lint/plugins/check_whitespace/arrow_alignment.rb#L94
 def fix_for(problem)
-  if problem[:newline]
-    index = tokens.index(problem[:token].prev_code_token.prev_token)
-
-    # insert newline
-    tokens.insert(index, PuppetLint::Lexer::Token.new(:NEWLINE, "\n", 0, 0))
-
-    # indent the parameter to the correct depth
-    problem[:token].prev_code_token.prev_token.type = :INDENT
-    problem[:token].prev_code_token.prev_token.value = ' ' * problem[:newline_indent]
-
-    end_param_idx = tokens.index(problem[:token].prev_code_token)
-    start_param_idx = tokens.index(problem[:token].prev_token_of(%i[INDENT NEWLINE]))
-    param_length = tokens[start_param_idx..end_param_idx].map do |r|
-                     r.to_manifest.length
-                   end.reduce(0) { |sum, x| sum + x } + 1
-    new_ws_len = problem[:arrow_column] - param_length
-  else
-    new_ws_len = if problem[:token].prev_token.type == :WHITESPACE
-                   problem[:token].prev_token.to_manifest.length
-                 else
-                   0
-                 end
-    new_ws_len += (problem[:arrow_column] - problem[:token].column)
-  end
+  raise PuppetLint::NoFix if problem[:newline]
+
+  new_ws_len = if problem[:token].prev_token.type == :WHITESPACE
+                 problem[:token].prev_token.to_manifest.length
+               else
+                 0
+               end
+  new_ws_len += (problem[:arrow_column] - problem[:token].column)
 
   if new_ws_len.negative?
     raise PuppetLint::NoFix if problem[:token].prev_token.type != :INDENT

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

@@ -241,13 +241,12 @@ describe 'class_equals_alignment' do
         END
       end
 
-      it 'should detect 2 problems' do
-        expect(problems).to have(2).problems
+      it 'should detect 1 problem' do
+        expect(problems).to have(1).problems
       end
 
-      it 'should create 2 warnings' do
+      it 'should create 1 warning' do
         expect(problems).to contain_warning(format(msg, 18, 16)).on_line(2).in_column(16)
-        expect(problems).to contain_warning(format(msg, 18, 29)).on_line(2).in_column(29)
       end
     end
   end
@@ -424,23 +423,21 @@ describe 'class_equals_alignment' do
       let(:fixed) do
         <<-END
           class test (
-            $a   = 'foo',
-            $bb  = 'bar',
+            $a   = 'foo', $bb = 'bar',
             $ccc = 'baz',
           ) {}
         END
       end
 
-      it 'should detect 2 problems' do
-        expect(problems).to have(2).problems
+      it 'should detect 1 problem' do
+        expect(problems).to have(1).problems
       end
 
-      it 'should fix 2 problems' do
+      it 'should fix 1 problem' do
         expect(problems).to contain_fixed(format(msg, 18, 16)).on_line(2).in_column(16)
-        expect(problems).to contain_fixed(format(msg, 18, 29)).on_line(2).in_column(29)
       end
 
-      it 'should move the extra param onto its own line and realign' do
+      it 'should not move the extra param onto its own line and realign' do
         expect(manifest).to eq(fixed)
       end
     end
@@ -458,24 +455,21 @@ describe 'class_equals_alignment' do
       let(:fixed) do
         <<-END
           class test (
-            $a     = 'foo',
-            $bbccc = 'bar',
-            $ccc   = 'baz',
+            $a   = 'foo', $bbccc = 'bar',
+            $ccc = 'baz',
           ) {}
         END
       end
 
-      it 'should detect 2 problems' do
-        expect(problems).to have(3).problems
+      it 'should detect 1 problem' do
+        expect(problems).to have(1).problems
       end
 
-      it 'should fix 2 problems' do
-        expect(problems).to contain_fixed(format(msg, 20, 16)).on_line(2).in_column(16)
-        expect(problems).to contain_fixed(format(msg, 20, 32)).on_line(2).in_column(32)
-        expect(problems).to contain_fixed(format(msg, 20, 18)).on_line(3).in_column(18)
+      it 'should fix 1 problem' do
+        expect(problems).to contain_fixed(format(msg, 18, 16)).on_line(2).in_column(16)
       end
 
-      it 'should move the extra param onto its own line and realign' do
+      it 'should not move the extra param onto its own line and realign' do
         expect(manifest).to eq(fixed)
       end
     end

metadata

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