From 26e78c0c1b2cae7e36a48a3c45380192c3563208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Tue, 4 Dec 2012 15:56:26 +0100 Subject: [PATCH 01/16] =?UTF-8?q?"xhtml"=20=E2=98=9E=20HTML?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/linguist/languages.yml | 2 ++ test/test_language.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 9c754c96..f68ebb1d 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -545,6 +545,8 @@ Groovy Server Pages: HTML: type: markup ace_mode: html + aliases: + - xhtml primary_extension: .html extensions: - .htm diff --git a/test/test_language.rb b/test/test_language.rb index ae0071dd..96130326 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -78,6 +78,7 @@ class TestLanguage < Test::Unit::TestCase assert_equal Language['Emacs Lisp'], Language.find_by_alias('emacs-lisp') assert_equal Language['Gettext Catalog'], Language.find_by_alias('pot') assert_equal Language['HTML'], Language.find_by_alias('html') + assert_equal Language['HTML'], Language.find_by_alias('xhtml') assert_equal Language['HTML+ERB'], Language.find_by_alias('html+erb') assert_equal Language['IRC log'], Language.find_by_alias('irc') assert_equal Language['JSON'], Language.find_by_alias('json') From 9b97d3ac8a708b43e26238d4b0af88c0045fb013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Tue, 4 Dec 2012 15:57:18 +0100 Subject: [PATCH 02/16] =?UTF-8?q?"erb"=20=E2=98=9E=20RHTML?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/linguist/languages.yml | 2 ++ test/test_language.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index f68ebb1d..05b45468 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -565,6 +565,8 @@ HTML+ERB: type: markup group: HTML lexer: RHTML + aliases: + - erb primary_extension: .erb extensions: - .erb diff --git a/test/test_language.rb b/test/test_language.rb index 96130326..15b03851 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -80,6 +80,7 @@ class TestLanguage < Test::Unit::TestCase assert_equal Language['HTML'], Language.find_by_alias('html') assert_equal Language['HTML'], Language.find_by_alias('xhtml') assert_equal Language['HTML+ERB'], Language.find_by_alias('html+erb') + assert_equal Language['HTML+ERB'], Language.find_by_alias('erb') assert_equal Language['IRC log'], Language.find_by_alias('irc') assert_equal Language['JSON'], Language.find_by_alias('json') assert_equal Language['Java Server Pages'], Language.find_by_alias('jsp') From 0a8fad20408cbebcff47971c7b82c95773baebba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Tue, 4 Dec 2012 15:57:41 +0100 Subject: [PATCH 03/16] =?UTF-8?q?"make"=20=E2=98=9E=20Makefile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/linguist/languages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 05b45468..593358ec 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -727,6 +727,8 @@ Lua: - .nse Makefile: + aliases: + - make extensions: - .mak - .mk From 1dfb44cff7e91d94a856e0fbf9a6fb9b5f1e55c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Tue, 4 Dec 2012 15:58:01 +0100 Subject: [PATCH 04/16] =?UTF-8?q?"obj-c/objc"=20=E2=98=9E=20Objective-C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/linguist/languages.yml | 3 +++ test/test_language.rb | 1 + 2 files changed, 4 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 593358ec..ee9a8769 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -849,6 +849,9 @@ ObjDump: Objective-C: type: programming color: "#438eff" + aliases: + - obj-c + - objc primary_extension: .m extensions: - .mm diff --git a/test/test_language.rb b/test/test_language.rb index 15b03851..fb18563a 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -89,6 +89,7 @@ class TestLanguage < Test::Unit::TestCase assert_equal Language['JavaScript'], Language.find_by_alias('js') assert_equal Language['Literate Haskell'], Language.find_by_alias('lhs') assert_equal Language['Literate Haskell'], Language.find_by_alias('literate-haskell') + assert_equal Language['Objective-C'], Language.find_by_alias('objc') assert_equal Language['OpenEdge ABL'], Language.find_by_alias('openedge') assert_equal Language['OpenEdge ABL'], Language.find_by_alias('progress') assert_equal Language['OpenEdge ABL'], Language.find_by_alias('abl') From 2e0b854428f5a3c8fd2e26175d5e7c59d6994895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Tue, 4 Dec 2012 15:58:22 +0100 Subject: [PATCH 05/16] =?UTF-8?q?"obj-j"=20=E2=98=9E=20Objective-J?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/linguist/languages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index ee9a8769..ac0a3e60 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -859,6 +859,8 @@ Objective-C: Objective-J: type: programming color: "#ff0c5a" + aliases: + - obj-j primary_extension: .j extensions: - .j From 50db6d015013921b094b8935fd4b41a2a8026dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Tue, 4 Dec 2012 15:58:43 +0100 Subject: [PATCH 06/16] =?UTF-8?q?"latex"=20=E2=98=9E=20TeX?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/linguist/languages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index ac0a3e60..85b10e5f 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1183,6 +1183,8 @@ Tcsh: TeX: type: markup ace_mode: latex + aliases: + - latex primary_extension: .tex extensions: - .aux From ff5ffd04827753325bc6cc737871dfd9ec82ec1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Tue, 4 Dec 2012 15:59:05 +0100 Subject: [PATCH 07/16] =?UTF-8?q?"rss/xsd/xsl/wsdl"=20=E2=98=9E=20XML?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/linguist/languages.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 85b10e5f..93b8adc5 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1274,6 +1274,11 @@ Visual Basic: XML: type: markup ace_mode: xml + aliases: + - rss + - xsd + - xsl + - wsdl primary_extension: .xml extensions: - .glade From fc8492e8f751d885523f9f1494f9355c3e2e103c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Tue, 4 Dec 2012 15:59:27 +0100 Subject: [PATCH 08/16] =?UTF-8?q?"yml"=20=E2=98=9E=20YAML?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/linguist/languages.yml | 2 ++ test/test_language.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 93b8adc5..b1c2ef0f 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1324,6 +1324,8 @@ XSLT: YAML: type: markup + aliases: + - yml primary_extension: .yml extensions: - .yaml diff --git a/test/test_language.rb b/test/test_language.rb index fb18563a..6173dc23 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -109,6 +109,7 @@ class TestLanguage < Test::Unit::TestCase assert_equal Language['VimL'], Language.find_by_alias('vim') assert_equal Language['VimL'], Language.find_by_alias('viml') assert_equal Language['reStructuredText'], Language.find_by_alias('rst') + assert_equal Language['YAML'], Language.find_by_alias('yml') end def test_groups From d3ebe1844d569436dafc628483f0d65dfdbcb2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Tue, 4 Dec 2012 16:20:06 +0100 Subject: [PATCH 09/16] add HTTP language Useful for `curl -i` dumps. Had to add primary_extension although this data is usually not saved in files, but shown as code blocks. --- lib/linguist/languages.yml | 4 ++++ test/test_language.rb | 1 + 2 files changed, 5 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index b1c2ef0f..b1c722d2 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -579,6 +579,10 @@ HTML+PHP: extensions: - .phtml +HTTP: + type: data + primary_extension: .http + HaXe: type: programming lexer: haXe diff --git a/test/test_language.rb b/test/test_language.rb index 6173dc23..c23a7103 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -26,6 +26,7 @@ class TestLanguage < Test::Unit::TestCase assert_equal Lexer['HTML'], Language['HTML'].lexer assert_equal Lexer['HTML+Django/Jinja'], Language['HTML+Django'].lexer assert_equal Lexer['HTML+PHP'], Language['HTML+PHP'].lexer + assert_equal Lexer['HTTP'], Language['HTTP'].lexer assert_equal Lexer['JSON'], Language['JSON'].lexer assert_equal Lexer['Java'], Language['ChucK'].lexer assert_equal Lexer['Java'], Language['Java'].lexer From acb20d95cab43f8350a97812ba0e5ea62c0a525c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Thu, 6 Dec 2012 23:04:53 +0100 Subject: [PATCH 10/16] =?UTF-8?q?"coffee-script"=20=E2=98=9E=20CoffeeScrip?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/linguist/languages.yml | 1 + test/test_language.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index b1c722d2..13e37fcf 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -244,6 +244,7 @@ CoffeeScript: color: "#244776" aliases: - coffee + - coffee-script primary_extension: .coffee extensions: - ._coffee diff --git a/test/test_language.rb b/test/test_language.rb index c23a7103..8ed8261b 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -69,6 +69,7 @@ class TestLanguage < Test::Unit::TestCase assert_equal Language['C++'], Language.find_by_alias('c++') assert_equal Language['C++'], Language.find_by_alias('cpp') assert_equal Language['CoffeeScript'], Language.find_by_alias('coffee') + assert_equal Language['CoffeeScript'], Language.find_by_alias('coffee-script') assert_equal Language['ColdFusion'], Language.find_by_alias('cfm') assert_equal Language['Common Lisp'], Language.find_by_alias('common-lisp') assert_equal Language['Common Lisp'], Language.find_by_alias('lisp') From 04a2845e91e407f2846269aba19d40cf41fe1574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Thu, 6 Dec 2012 23:19:02 +0100 Subject: [PATCH 11/16] add ApacheConf language Recognizes httpd/apache2.conf and .htaccess files --- lib/linguist/languages.yml | 10 ++++++++++ test/test_language.rb | 3 +++ 2 files changed, 13 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 13e37fcf..c639d4dc 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -63,6 +63,16 @@ Ada: - .adb - .ads +ApacheConf: + type: markup + aliases: + - apache + primary_extension: .conf + filenames: + - .htaccess + - httpd.conf + - apache2.conf + Apex: type: programming lexer: Text only diff --git a/test/test_language.rb b/test/test_language.rb index 8ed8261b..14b39f7e 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -61,6 +61,7 @@ class TestLanguage < Test::Unit::TestCase assert_equal Language['ASP'], Language.find_by_alias('aspx') assert_equal Language['ASP'], Language.find_by_alias('aspx-vb') assert_equal Language['ActionScript'], Language.find_by_alias('as3') + assert_equal Language['ApacheConf'], Language.find_by_alias('apache') assert_equal Language['Assembly'], Language.find_by_alias('nasm') assert_equal Language['Batchfile'], Language.find_by_alias('bat') assert_equal Language['C#'], Language.find_by_alias('c#') @@ -230,6 +231,8 @@ class TestLanguage < Test::Unit::TestCase assert_equal [Language['Ruby']], Language.find_by_filename('foo/bar.rb') assert_equal [Language['Ruby']], Language.find_by_filename('Rakefile') assert_equal [Language['Ruby']], Language.find_by_filename('PKGBUILD.rb') + assert_equal Language['ApacheConf'], Language.find_by_filename('httpd.conf').first + assert_equal [Language['ApacheConf']], Language.find_by_filename('.htaccess') assert_equal ['C', 'C++', 'Objective-C'], Language.find_by_filename('foo.h').map(&:name).sort assert_equal [], Language.find_by_filename('rb') assert_equal [], Language.find_by_filename('.rb') From ae753e6e88d743f47b1f43f1488e39af6baf08ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Thu, 6 Dec 2012 23:25:54 +0100 Subject: [PATCH 12/16] add Nginx language --- lib/linguist/languages.yml | 7 +++++++ test/test_language.rb | 1 + 2 files changed, 8 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index c639d4dc..2567e403 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -819,6 +819,13 @@ Nemerle: color: "#0d3c6e" primary_extension: .n +Nginx: + type: markup + lexer: Nginx configuration file + primary_extension: .conf + filenames: + - nginx.conf + Nimrod: type: programming color: "#37775b" diff --git a/test/test_language.rb b/test/test_language.rb index 14b39f7e..7e5d3ee5 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -233,6 +233,7 @@ class TestLanguage < Test::Unit::TestCase assert_equal [Language['Ruby']], Language.find_by_filename('PKGBUILD.rb') assert_equal Language['ApacheConf'], Language.find_by_filename('httpd.conf').first assert_equal [Language['ApacheConf']], Language.find_by_filename('.htaccess') + assert_equal Language['Nginx'], Language.find_by_filename('nginx.conf').first assert_equal ['C', 'C++', 'Objective-C'], Language.find_by_filename('foo.h').map(&:name).sort assert_equal [], Language.find_by_filename('rb') assert_equal [], Language.find_by_filename('.rb') From 586650f01cc83c2bbf307e7bfe21d3f76883ff71 Mon Sep 17 00:00:00 2001 From: Tobin Fricke Date: Tue, 2 Oct 2012 16:00:03 +0200 Subject: [PATCH 13/16] add .C and .H as file extensions for C++ "C" and "H" are two file extensions recognized by gcc as indicating C++ source code. The full list may be found here: http://gcc.gnu.org/onlinedocs/gcc-4.4.1/gcc/Overall-Options.html#index-file-name-suffix-71 --- lib/linguist/languages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 2567e403..c9cd17e7 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -190,8 +190,10 @@ C++: - cpp primary_extension: .cpp extensions: + - .C - .c++ - .cxx + - .H - .h++ - .hh - .hxx From 50ecb630585ba84245ecec5345874ca4339a70e8 Mon Sep 17 00:00:00 2001 From: Andy Li Date: Mon, 26 Nov 2012 18:37:33 +0800 Subject: [PATCH 14/16] haXe is now "Haxe" According to https://groups.google.com/forum/#!topic/haxelang/O7PB-ZrX4i4/discussion The lexer in Pygments is not renamed yet, so just stay as is at the moment. --- lib/linguist/languages.yml | 20 +++++++++----------- test/test_language.rb | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index c9cd17e7..ba7d1ddb 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -596,17 +596,6 @@ HTTP: type: data primary_extension: .http -HaXe: - type: programming - lexer: haXe - ace_mode: haxe - color: "#346d51" - primary_extension: .hx - extensions: - - .hx - - .hxml - - .mtt - Haml: group: HTML type: markup @@ -620,6 +609,15 @@ Haskell: - .hs - .hsc +Haxe: + type: programming + lexer: haXe + ace_mode: haxe + color: "#346d51" + primary_extension: .hx + extensions: + - .hxsl + INI: type: data extensions: diff --git a/test/test_language.rb b/test/test_language.rb index 7e5d3ee5..d7ade5f3 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -52,7 +52,7 @@ class TestLanguage < Test::Unit::TestCase assert_equal Lexer['Verilog'], Language['Verilog'].lexer assert_equal Lexer['XSLT'], Language['XSLT'].lexer assert_equal Lexer['aspx-vb'], Language['ASP'].lexer - assert_equal Lexer['haXe'], Language['HaXe'].lexer + assert_equal Lexer['haXe'], Language['Haxe'].lexer assert_equal Lexer['reStructuredText'], Language['reStructuredText'].lexer end From 16f8e54ed711dd075c6525eb0ef6587f6aac7407 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Fri, 26 Oct 2012 17:34:49 -0400 Subject: [PATCH 15/16] detect common shell config files --- lib/linguist/languages.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index ba7d1ddb..f934e840 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1159,7 +1159,13 @@ Shell: primary_extension: .sh filenames: - .zsh + - bash_logout + - bash_profile - bashrc + - zlogin + - zlogout + - zshenv + - zprofile - zshrc Smalltalk: From 720914b2903167adb371cd0ee06863e46ec1e210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohnic=CC=81?= Date: Thu, 6 Dec 2012 23:53:20 +0100 Subject: [PATCH 16/16] add filename tests for shell config files --- test/test_language.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/test_language.rb b/test/test_language.rb index d7ade5f3..fe0ad2cf 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -238,6 +238,9 @@ class TestLanguage < Test::Unit::TestCase assert_equal [], Language.find_by_filename('rb') assert_equal [], Language.find_by_filename('.rb') assert_equal [], Language.find_by_filename('.nkt') + assert_equal [Language['Shell']], Language.find_by_filename('.bashrc') + assert_equal [Language['Shell']], Language.find_by_filename('bash_profile') + assert_equal [Language['Shell']], Language.find_by_filename('.zshrc') end def test_find