From 60144c907e165b997b82138298dbf36c640584a9 Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Tue, 15 Jul 2014 11:01:41 -0700 Subject: [PATCH 1/4] Modifying Mirah search terms --- lib/linguist/languages.yml | 2 +- test/test_language.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 120cee58..5996fc8c 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1345,7 +1345,7 @@ MiniD: # Legacy Mirah: type: programming lexer: Ruby - search_term: ruby + search_term: mirah color: "#c7a938" extensions: - .druby diff --git a/test/test_language.rb b/test/test_language.rb index fa92f38c..7c81ceef 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -167,7 +167,7 @@ class TestLanguage < Test::Unit::TestCase assert_equal 'pot', Language['Gettext Catalog'].search_term assert_equal 'irc', Language['IRC log'].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 'bash', Language['Shell'].search_term assert_equal 'vim', Language['VimL'].search_term From a1af3a509c299d96754c217994985653d54925b4 Mon Sep 17 00:00:00 2001 From: Josh Abernathy Date: Tue, 15 Jul 2014 12:06:55 -0700 Subject: [PATCH 2/4] Most Xcode files have a human-readable diff now! --- lib/linguist/generated.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/linguist/generated.rb b/lib/linguist/generated.rb index 761288f0..2074e008 100644 --- a/lib/linguist/generated.rb +++ b/lib/linguist/generated.rb @@ -54,7 +54,7 @@ module Linguist name == 'Gemfile.lock' || minified_files? || compiled_coffeescript? || - xcode_project_file? || + xcode_file? || generated_parser? || generated_net_docfile? || generated_net_designer_file? || @@ -67,14 +67,14 @@ module Linguist generated_by_zephir? 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. # # Returns true of false. - def xcode_project_file? - ['.xib', '.nib', '.storyboard', '.pbxproj', '.xcworkspacedata', '.xcuserstate'].include?(extname) + def xcode_file? + ['.nib', '.pbxproj'].include?(extname) end # Internal: Is the blob minified files? From 5c3385ecd817c824691698f9c6ec392b054848b1 Mon Sep 17 00:00:00 2001 From: Josh Abernathy Date: Tue, 15 Jul 2014 12:08:23 -0700 Subject: [PATCH 3/4] Actually let's keep those. --- lib/linguist/generated.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linguist/generated.rb b/lib/linguist/generated.rb index 2074e008..a0f3a285 100644 --- a/lib/linguist/generated.rb +++ b/lib/linguist/generated.rb @@ -74,7 +74,7 @@ module Linguist # # Returns true of false. def xcode_file? - ['.nib', '.pbxproj'].include?(extname) + ['.nib', '.pbxproj', '.xcworkspacedata', '.xcuserstate'].include?(extname) end # Internal: Is the blob minified files? From 4d7a34c17732d00de2c8202d5333fdfbeafa4a98 Mon Sep 17 00:00:00 2001 From: Josh Abernathy Date: Tue, 15 Jul 2014 12:27:35 -0700 Subject: [PATCH 4/4] pbproj's are cool too. --- lib/linguist/generated.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/linguist/generated.rb b/lib/linguist/generated.rb index a0f3a285..974fc7ae 100644 --- a/lib/linguist/generated.rb +++ b/lib/linguist/generated.rb @@ -74,7 +74,7 @@ module Linguist # # Returns true of false. def xcode_file? - ['.nib', '.pbxproj', '.xcworkspacedata', '.xcuserstate'].include?(extname) + ['.nib', '.xcworkspacedata', '.xcuserstate'].include?(extname) end # Internal: Is the blob minified files? @@ -256,3 +256,4 @@ module Linguist end end end +