From 366d17747e933036aac43cac4ceb96157e340b1c Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Wed, 1 Jun 2011 12:20:43 -0500
Subject: [PATCH] Disambiguate search terms

---
 lib/linguist/languages.yml |  6 ----
 test/test_language.rb      | 56 +++++++++++++++++++-------------------
 2 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 7cdfccab..ad605fb9 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -96,7 +96,6 @@ CSS:
   - .css
 ChucK:
   :lexer: java
-  :search_term: java
   :ext:
   - .ck
 Clojure:
@@ -194,12 +193,10 @@ Genshi:
   - .kid
 Gentoo Ebuild:
   :lexer: bash
-  :search_term: bash
   :ext:
   - .ebuild
 Gentoo Eclass:
   :lexer: bash
-  :search_term: bash
   :ext:
   - .eclass
 Gettext Catalog:
@@ -269,7 +266,6 @@ Java:
   - .pde
 Groovy:
   :lexer: java
-  :search_term: java
   :ext:
   - .groovy
 JavaScript:
@@ -338,7 +334,6 @@ Myghty:
   - .myt
 Nu:
   :lexer: scheme
-  :search_term: scheme
   :ext:
   - .nu
   - Nukefile
@@ -565,7 +560,6 @@ XQuery:
   - .xquery
 XS:
   :lexer: c
-  :search_term: c
   :ext:
   - .xs
 YAML:
diff --git a/test/test_language.rb b/test/test_language.rb
index 7f4f2539..cf642396 100644
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -139,34 +139,34 @@ class TestLanguage < Test::Unit::TestCase
     assert_equal "max/msp",     Language['Max/MSP'].search_term
     assert_equal "pure-data",   Language['Pure Data'].search_term
 
-    assert_equal "aspx-vb",    Language['ASP'].search_term
-    assert_equal "as3",        Language['ActionScript'].search_term
-    assert_equal "nasm",       Language['Assembly'].search_term
-    assert_equal "bat",        Language['Batchfile'].search_term
-    assert_equal "csharp",     Language['C#'].search_term
-    assert_equal "cpp",        Language['C++'].search_term
-    assert_equal "java",       Language['ChucK'].search_term
-    assert_equal "cfm",        Language['ColdFusion'].search_term
-    assert_equal "dpatch",     Language['Darcs Patch'].search_term
-    assert_equal "emacs-lisp", Language['Emacs Lisp'].search_term
-    assert_equal "ocaml",      Language['F#'].search_term
-    assert_equal "bash",       Language['Gentoo Ebuild'].search_term
-    assert_equal "bash",       Language['Gentoo Eclass'].search_term
-    assert_equal "pot",        Language['Gettext Catalog'].search_term
-    assert_equal "irc",        Language['IRC log'].search_term
-    assert_equal "java",       Language['Groovy'].search_term
-    assert_equal "javascript", Language['JSON'].search_term
-    assert_equal "lhs",        Language['Literate Haskell'].search_term
-    assert_equal "ruby",       Language['Mirah'].search_term
-    assert_equal "scheme",     Language['Nu'].search_term
-    assert_equal "pir",        Language['Parrot Internal Representation'].search_term
-    assert_equal "pytb",       Language['Python traceback'].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
-    assert_equal "c",          Language['XS'].search_term
-    assert_equal "jsp",        Language['Java Server Pages'].search_term
-    assert_equal "rst",        Language['reStructuredText'].search_term
+    assert_equal "aspx-vb",       Language['ASP'].search_term
+    assert_equal "as3",           Language['ActionScript'].search_term
+    assert_equal "nasm",          Language['Assembly'].search_term
+    assert_equal "bat",           Language['Batchfile'].search_term
+    assert_equal "csharp",        Language['C#'].search_term
+    assert_equal "cpp",           Language['C++'].search_term
+    assert_equal "chuck",         Language['ChucK'].search_term
+    assert_equal "cfm",           Language['ColdFusion'].search_term
+    assert_equal "dpatch",        Language['Darcs Patch'].search_term
+    assert_equal "emacs-lisp",    Language['Emacs Lisp'].search_term
+    assert_equal "ocaml",         Language['F#'].search_term
+    assert_equal "gentoo-ebuild", Language['Gentoo Ebuild'].search_term
+    assert_equal "gentoo-eclass", Language['Gentoo Eclass'].search_term
+    assert_equal "pot",           Language['Gettext Catalog'].search_term
+    assert_equal "irc",           Language['IRC log'].search_term
+    assert_equal "groovy",        Language['Groovy'].search_term
+    assert_equal "javascript",    Language['JSON'].search_term
+    assert_equal "lhs",           Language['Literate Haskell'].search_term
+    assert_equal "ruby",          Language['Mirah'].search_term
+    assert_equal "nu",            Language['Nu'].search_term
+    assert_equal "pir",           Language['Parrot Internal Representation'].search_term
+    assert_equal "pytb",          Language['Python traceback'].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
+    assert_equal "xs",            Language['XS'].search_term
+    assert_equal "jsp",           Language['Java Server Pages'].search_term
+    assert_equal "rst",           Language['reStructuredText'].search_term
   end
 
   def test_error_without_name