File tree Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -562,7 +562,7 @@ def parse_control_comments
562562 comment_token_types . include? ( token . type )
563563 end
564564 control_comment_tokens = comment_tokens . select do |token |
565- token . value . strip =~ %r{\A lint\ : (ignore\ : [\w \d ]+|endignore)}
565+ token . value . strip =~ %r{\A lint:(ignore:[\w \d ]+|endignore)}
566566 end
567567
568568 stack = [ ]
@@ -572,7 +572,7 @@ def parse_control_comments
572572
573573 comment_words = token . value . strip . split ( %r{\s +} )
574574 comment_words . each_with_index do |word , i |
575- if %r{\A lint\ : (ignore|endignore)} . match? ( word )
575+ if %r{\A lint:(ignore|endignore)} . match? ( word )
576576 comment_data << word
577577 else
578578 # Once we reach the first non-controlcomment word, assume the rest
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ def expand!(vars = {})
2828 vars . each do |var , value |
2929 var = var . to_s
3030 var . gsub! ( %r{[^a-zA-Z0-9_]} , '' )
31- changed = gsub! ( %r{\ %\{ #{ var } \} } , value . to_s )
31+ changed = gsub! ( %r{%\{ #{ var } \} } , value . to_s )
3232 end
3333 break unless changed
3434 end
Original file line number Diff line number Diff line change @@ -300,7 +300,7 @@ def initialize(args)
300300 its ( :exitstatus ) { is_expected . to eq ( 1 ) }
301301
302302 its ( :stdout ) do
303- is_expected . to match ( %r{^(/|[A-Za-z]\ : ).+/spec/fixtures/test/manifests/fail\. pp$} )
303+ is_expected . to match ( %r{^(/|[A-Za-z]:).+/spec/fixtures/test/manifests/fail\. pp$} )
304304 end
305305 end
306306
You can’t perform that action at this time.
0 commit comments