Merge pull request #570 from ninech/multi_line_strings

Multi line strings
rodjek · Dec 5, 2016 · 041b430 · 041b430
2 parents 6b11df4 + f7352a3
commit 041b430
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/puppet-lint/lexer.rb b/lib/puppet-lint/lexer.rb
@@ -311,6 +311,11 @@ def new_token(type, value, length, opts = {})
         @line_no += 1
         @column = 1
       end
+      if type == :SSTRING and /(?:\r\n|\r|\n)/.match(value)
+        lines = value.split(/(?:\r\n|\r|\n)/)
+        @line_no += lines.length-1
+        @column = lines.last.length
+      end
 
       token
     end

diff --git a/spec/puppet-lint/lexer_spec.rb b/spec/puppet-lint/lexer_spec.rb
@@ -18,7 +18,7 @@
     end
 
     it 'should calculate the line number for a multi line string' do
-      @lexer.instance_variable_set('@line_no', 2)
+      token = @lexer.new_token(:SSTRING, "test\ntest", 9)
       token = @lexer.new_token(:TEST, 'test', 4)
       expect(token.line).to eq(2)
     end
@@ -37,8 +37,9 @@
     it 'should calculate the column number for a multi line string' do
       @lexer.instance_variable_set('@line_no', 4)
       @lexer.instance_variable_set('@column', "gronk".size)
+      token = @lexer.new_token(:SSTRING, "test\ntest", 9)
       token = @lexer.new_token(:TEST, 'test', 4)
-      expect(token.column).to eq(5)
+      expect(token.column).to eq(4)
     end
   end