Merge pull request #2169 from quicksilver/commentblocks

Fix check_indent false positives on comment blocks
quicksilver · Jan 23, 2016 · 2691bbd · 2691bbd
2 parents 088e17f + dc228c1
commit 2691bbd
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Quicksilver/Tools/travis/check_indent.rb b/Quicksilver/Tools/travis/check_indent.rb
@@ -5,10 +5,16 @@
 
 changed_lines = `git diff $TRAVIS_COMMIT_RANGE -- *.[mh]`.split("\n").select { |l| l.start_with? "+" }
 
+comment_block = false
+
 changed_lines.each do |line|
-	if /^\+ /.match(line) then
+	if /^\+ /.match(line) and not comment_block then
 		puts "Invalid line #{line}"
 		exit 1
+	elsif /^\+\s*?\/\*\*/.match(line) then
+		comment_block = true
+	elsif /^\+\s*?\*\*\//.match(line) then
+		comment_block = false
 	end
 end