aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2012-05-07 19:44:14 -0700
committerJoshua Peek <josh@joshpeek.com>2012-05-07 19:44:14 -0700
commitaa7c8497b17433f1cb238425e54dc716f8406ea4 (patch)
tree1dbb03b99cacf99256d17aecedbc1b321e9cce7f
parenta9e1f3822f854893988b9bb2329b45bb122bd639 (diff)
parent17adccc844b2996f75b492a0b4053d90d3df3bee (diff)
Merge pull request #151 from aseemk/streamlinejs-support
Add ._js & ._coffee extensions for Streamline.js.
-rw-r--r--lib/linguist/languages.yml4
-rw-r--r--test/test_language.rb7
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 51cb8aa..5293f1c 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -235,8 +235,9 @@ CoffeeScript:
color: "#244776"
aliases:
- coffee
+ primary_extension: .coffee
extensions:
- - .coffee
+ - ._coffee
filenames:
- Cakefile
@@ -644,6 +645,7 @@ JavaScript:
- node
primary_extension: .js
extensions:
+ - ._js
- .bones
- .jake
- .js
diff --git a/test/test_language.rb b/test/test_language.rb
index b3f996d..ed82a82 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -254,6 +254,11 @@ class TestLanguage < Test::Unit::TestCase
assert_equal Language['PHP'], Language.find_by_extension('php5')
assert_equal Language['PowerShell'], Language.find_by_extension('psm1')
assert_equal Language['PowerShell'], Language.find_by_extension('ps1')
+
+ # Aliases for Streamline.js ( https://github.com/Sage/streamlinejs )
+ assert_equal Language['JavaScript'], Language.find_by_extension('_js')
+ assert_equal Language['CoffeeScript'], Language.find_by_extension('_coffee')
+
assert_nil Language.find_by_extension('.nkt')
end
@@ -345,6 +350,8 @@ class TestLanguage < Test::Unit::TestCase
assert_equal '.pl', Language['Perl'].primary_extension
assert_equal '.py', Language['Python'].primary_extension
assert_equal '.rb', Language['Ruby'].primary_extension
+ assert_equal '.js', Language['JavaScript'].primary_extension
+ assert_equal '.coffee', Language['CoffeeScript'].primary_extension
# This is a nasty requirement, but theres some code in GitHub that
# expects this. Really want to drop this.