Merge pull request #9 from jiuka/comments

Reset not only whitespaces but comments too.
voxpupuli · Jan 7, 2017 · f335866 · f335866
2 parents e0892d8 + 365127b
commit f335866
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/lib/puppet-lint/plugins/check_strict_indent.rb b/lib/puppet-lint/plugins/check_strict_indent.rb
@@ -57,7 +57,7 @@ def check
 
       # reset prev_token to last non-whitespace token on previous line
       prev_token = token.prev_token
-      while not prev_token.nil? and prev_token.type == :WHITESPACE
+      while not prev_token.nil? and (prev_token.type == :WHITESPACE or prev_token.type == :COMMENT)
         prev_token = prev_token.prev_token
       end
 

diff --git a/spec/puppet-lint/plugins/check_strict_indent_spec.rb b/spec/puppet-lint/plugins/check_strict_indent_spec.rb
@@ -41,6 +41,24 @@
     end
   end
 
+  context 'comment after resource title.' do
+    let(:code) {
+      <<-EOF.gsub(/^ {8}/, '')
+        class (
+        ) {
+          file {
+            'this': #comment
+              ensure  => 'present',
+          }
+        }
+      EOF
+    }
+
+    it 'should detect 0 problems' do
+      expect(problems).to have(0).problems
+    end
+  end
+
   context 'invalid array indent' do
     let(:code) {
       <<-EOF.gsub(/^ {8}/, '')