Fix groovy regexp warning

This commit is contained in:
Joshua Peek
2011-08-30 14:29:18 -05:00
parent 1dfd092c4e
commit 350465d84d
2 changed files with 7 additions and 9 deletions

View File

@@ -434,19 +434,17 @@ module Linguist
end
end
# Internal: Guess language of .gsp files.
#
# Returns a Language.
def guess_gsp_language
if lines.grep(/<%|<%@|\${|<%|<g:|<meta name="layout"|<r:/).any?
Language['Groovy Server Pages']
if lines.grep(/<%|<%@|\$\{|<%|<g:|<meta name="layout"|<r:/).any?
Language['Groovy Server Pages']
else
Language['Gosu']
end
end
# Internal: Guess language from the first line.
#
# Look for leading "<?php"

View File

@@ -336,7 +336,7 @@ class TestBlob < Test::Unit::TestCase
assert_equal Language['Gosu'], blob("Hello.gst").language
assert_equal Language['Gosu'], blob("hello.vark").language
#Groovy Server Pages
# Groovy Server Pages
assert_equal Language['Groovy Server Pages'], blob("bar.gsp").language
assert_equal Language['Groovy Server Pages'], blob("hello-resources.gsp").language
assert_equal Language['Groovy Server Pages'], blob("hello-pagedirective.gsp").language