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

Merge branch 'master' into cut-release-v3.0.4

Browse Source
This commit is contained in:
Arfon Smith
2014-07-15 12:34:06 -07:00
parent 2913a87cc4 feb82e34d6
commit 90ff1b5896
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/linguist/generated.rb
View File

@@ -54,7 +54,7 @@ module Linguist
name == 'Gemfile.lock' || name == 'Gemfile.lock' ||
minified_files? || minified_files? ||
compiled_coffeescript? || compiled_coffeescript? ||
xcode_project_file? || xcode_file? ||
generated_parser? || generated_parser? ||
generated_net_docfile? || generated_net_docfile? ||
generated_net_designer_file? || generated_net_designer_file? ||
@@ -67,14 +67,14 @@ module Linguist
generated_by_zephir? generated_by_zephir?
end end
# Internal: Is the blob an XCode project file? # Internal: Is the blob an Xcode file?
# #
# Generated if the file extension is an XCode project # Generated if the file extension is an Xcode
# file extension. # file extension.
# #
# Returns true of false. # Returns true of false.
def xcode_project_file? def xcode_file?
['.xib', '.nib', '.storyboard', '.pbxproj', '.xcworkspacedata', '.xcuserstate'].include?(extname) ['.nib', '.xcworkspacedata', '.xcuserstate'].include?(extname)
end end
# Internal: Is the blob minified files? # Internal: Is the blob minified files?
@@ -256,3 +256,4 @@ module Linguist
end end
end end
end end

2
lib/linguist/languages.yml
View File

@@ -1345,7 +1345,7 @@ MiniD: # Legacy
Mirah: Mirah:
type: programming type: programming
lexer: Ruby lexer: Ruby
search_term: ruby search_term: mirah
color: "#c7a938" color: "#c7a938"
extensions: extensions:
- .druby - .druby

2
test/test_language.rb
View File

@@ -167,7 +167,7 @@ class TestLanguage < Test::Unit::TestCase
assert_equal 'pot', Language['Gettext Catalog'].search_term assert_equal 'pot', Language['Gettext Catalog'].search_term
assert_equal 'irc', Language['IRC log'].search_term assert_equal 'irc', Language['IRC log'].search_term
assert_equal 'lhs', Language['Literate Haskell'].search_term assert_equal 'lhs', Language['Literate Haskell'].search_term
assert_equal 'ruby', Language['Mirah'].search_term assert_equal 'mirah', Language['Mirah'].search_term
assert_equal 'raw', Language['Raw token data'].search_term assert_equal 'raw', Language['Raw token data'].search_term
assert_equal 'bash', Language['Shell'].search_term assert_equal 'bash', Language['Shell'].search_term
assert_equal 'vim', Language['VimL'].search_term assert_equal 'vim', Language['VimL'].search_term