KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix groovy regexp warning

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/linguist/blob_helper.rb
View File

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

6
test/test_blob.rb
View File

@@ -335,12 +335,12 @@ class TestBlob < Test::Unit::TestCase
assert_equal Language['Gosu'], blob("hello.gsp").language assert_equal Language['Gosu'], blob("hello.gsp").language
assert_equal Language['Gosu'], blob("Hello.gst").language assert_equal Language['Gosu'], blob("Hello.gst").language
assert_equal Language['Gosu'], blob("hello.vark").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("bar.gsp").language
assert_equal Language['Groovy Server Pages'], blob("hello-resources.gsp").language assert_equal Language['Groovy Server Pages'], blob("hello-resources.gsp").language
assert_equal Language['Groovy Server Pages'], blob("hello-pagedirective.gsp").language assert_equal Language['Groovy Server Pages'], blob("hello-pagedirective.gsp").language
assert_equal Language['Groovy Server Pages'], blob("hello-var.gsp").language assert_equal Language['Groovy Server Pages'], blob("hello-var.gsp").language
end end
def test_lexer def test_lexer