From 5aee64a8ddaa52e17f225b47db88f1df6128f156 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 31 May 2011 14:32:44 -0500 Subject: [PATCH] Downgrade lexer file to 1.3.1 --- lib/linguist/languages.yml | 3 + lib/linguist/lexers.yml | 234 ++++--------------------------------- test/test_language.rb | 10 +- test/test_lexer.rb | 7 +- 4 files changed, 31 insertions(+), 223 deletions(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 7991e4b0..277cf999 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -64,6 +64,7 @@ Brainfuck: - .b - .bf BlitzMax: + :lexer: Text only :ext: - .bmx C: @@ -177,6 +178,7 @@ F#: - .fsi - .fsx Factor: + :lexer: Text only :ext: - .factor FORTRAN: @@ -557,6 +559,7 @@ XML: - .mxml - .rdf XQuery: + :lexer: Text only :ext: - .xqy - .xq diff --git a/lib/linguist/lexers.yml b/lib/linguist/lexers.yml index ddf54ec2..7540a03f 100644 --- a/lib/linguist/lexers.yml +++ b/lib/linguist/lexers.yml @@ -1,4 +1,5 @@ # AUTOMATICALLY GENERATED BY bin/pygments-lexers +# Pygments version 1.3.1 --- - !ruby/struct:Linguist::Lexer name: JavaScript+Mako @@ -69,13 +70,6 @@ - *.tpl mimetypes: - application/x-smarty -- !ruby/struct:Linguist::Lexer - name: Protocol Buffer - aliases: - - protobuf - filenames: - - *.proto - mimetypes: - !ruby/struct:Linguist::Lexer name: ApacheConf aliases: @@ -182,15 +176,6 @@ filenames: mimetypes: - application/xml+smarty -- !ruby/struct:Linguist::Lexer - name: autohotkey - aliases: - - ahk - filenames: - - *.ahk - - *.ahkl - mimetypes: - - text/x-autohotkey - !ruby/struct:Linguist::Lexer name: Felix aliases: @@ -207,7 +192,6 @@ - cmake filenames: - *.cmake - - CMakeLists.txt mimetypes: - text/x-cmake - !ruby/struct:Linguist::Lexer @@ -250,24 +234,6 @@ filenames: mimetypes: - application/xml+mako -- !ruby/struct:Linguist::Lexer - name: Scaml - aliases: - - scaml - - SCAML - filenames: - - *.scaml - mimetypes: - - text/x-scaml -- !ruby/struct:Linguist::Lexer - name: MAQL - aliases: - - maql - filenames: - - *.maql - mimetypes: - - text/x-gooddata-maql - - application/x-gooddata-maql - !ruby/struct:Linguist::Lexer name: Boo aliases: @@ -325,14 +291,6 @@ - *.lgt mimetypes: - text/x-logtalk -- !ruby/struct:Linguist::Lexer - name: SCSS - aliases: - - scss - filenames: - - *.scss - mimetypes: - - text/x-scss - !ruby/struct:Linguist::Lexer name: BBCode aliases: @@ -371,15 +329,6 @@ filenames: - control mimetypes: -- !ruby/struct:Linguist::Lexer - name: Jade - aliases: - - jade - - JADE - filenames: - - *.jade - mimetypes: - - text/x-jade - !ruby/struct:Linguist::Lexer name: RHTML aliases: @@ -390,13 +339,6 @@ - *.rhtml mimetypes: - text/html+ruby -- !ruby/struct:Linguist::Lexer - name: XML+Velocity - aliases: - - xml+velocity - filenames: - mimetypes: - - application/xml+velocity - !ruby/struct:Linguist::Lexer name: JavaScript+Cheetah aliases: @@ -503,7 +445,6 @@ - lua filenames: - *.lua - - *.wlua mimetypes: - text/x-lua - application/x-lua @@ -643,14 +584,6 @@ - *.asmx - *.axd mimetypes: -- !ruby/struct:Linguist::Lexer - name: Properties - aliases: - - properties - filenames: - - *.properties - mimetypes: - - text/x-java-properties - !ruby/struct:Linguist::Lexer name: Ragel in Ruby Host aliases: @@ -659,15 +592,6 @@ filenames: - *.rl mimetypes: -- !ruby/struct:Linguist::Lexer - name: BlitzMax - aliases: - - blitzmax - - bmax - filenames: - - *.bmx - mimetypes: - - text/x-bmx - !ruby/struct:Linguist::Lexer name: HTML+Genshi aliases: @@ -695,6 +619,7 @@ filenames: - *.ini - *.cfg + - *.properties mimetypes: - text/x-ini - !ruby/struct:Linguist::Lexer @@ -730,14 +655,6 @@ filenames: mimetypes: - text/css+smarty -- !ruby/struct:Linguist::Lexer - name: Text only - aliases: - - text - filenames: - - *.txt - mimetypes: - - text/plain - !ruby/struct:Linguist::Lexer name: ANTLR With C# Target aliases: @@ -778,12 +695,13 @@ - *.applescript mimetypes: - !ruby/struct:Linguist::Lexer - name: HTML+Smarty + name: Text only aliases: - - html+smarty + - text filenames: + - *.txt mimetypes: - - text/html+smarty + - text/plain - !ruby/struct:Linguist::Lexer name: Literate Haskell aliases: @@ -932,14 +850,6 @@ - ragel filenames: mimetypes: -- !ruby/struct:Linguist::Lexer - name: Scalate Server Page - aliases: - - ssp - filenames: - - *.ssp - mimetypes: - - application/x-ssp - !ruby/struct:Linguist::Lexer name: XML+Evoque aliases: @@ -989,13 +899,6 @@ filenames: mimetypes: - text/x-lighttpd-conf -- !ruby/struct:Linguist::Lexer - name: HTML+Velocity - aliases: - - html+velocity - filenames: - mimetypes: - - text/html+velocity - !ruby/struct:Linguist::Lexer name: Ragel in D Host aliases: @@ -1093,7 +996,6 @@ - dylan filenames: - *.dylan - - *.dyl mimetypes: - text/x-dylan - !ruby/struct:Linguist::Lexer @@ -1159,14 +1061,6 @@ mimetypes: - text/x-rst - text/prs.fallenstein.rst -- !ruby/struct:Linguist::Lexer - name: Velocity - aliases: - - velocity - filenames: - - *.vm - - *.fhtml - mimetypes: - !ruby/struct:Linguist::Lexer name: IRC logs aliases: @@ -1232,6 +1126,7 @@ - makefile - Makefile.* - GNUmakefile + - basemake mimetypes: - text/x-makefile - !ruby/struct:Linguist::Lexer @@ -1298,7 +1193,6 @@ aliases: - rb - ruby - - duby filenames: - *.rb - *.rbw @@ -1306,18 +1200,16 @@ - *.rake - *.gemspec - *.rbx - - *.duby mimetypes: - text/x-ruby - application/x-ruby - !ruby/struct:Linguist::Lexer - name: Python 3.0 Traceback + name: HTML+Smarty aliases: - - py3tb + - html+smarty filenames: - - *.py3tb mimetypes: - - text/x-python3-traceback + - text/html+smarty - !ruby/struct:Linguist::Lexer name: POVRay aliases: @@ -1382,19 +1274,6 @@ - matlabsession filenames: mimetypes: -- !ruby/struct:Linguist::Lexer - name: Mason - aliases: - - mason - filenames: - - *.m - - *.mhtml - - *.mc - - *.mi - - autohandler - - dhandler - mimetypes: - - application/x-mason - !ruby/struct:Linguist::Lexer name: HTML+PHP aliases: @@ -1408,23 +1287,13 @@ - application/x-httpd-php4 - application/x-httpd-php5 - !ruby/struct:Linguist::Lexer - name: PostScript + name: Python 3.0 Traceback aliases: - - postscript + - py3tb filenames: - - *.ps - - *.eps + - *.py3tb mimetypes: - - application/postscript -- !ruby/struct:Linguist::Lexer - name: verilog - aliases: - - v - filenames: - - *.v - - *.sv - mimetypes: - - text/x-verilog + - text/x-python3-traceback - !ruby/struct:Linguist::Lexer name: ANTLR With Java Target aliases: @@ -1433,16 +1302,6 @@ - *.G - *.g mimetypes: -- !ruby/struct:Linguist::Lexer - name: Tcl - aliases: - - tcl - filenames: - - *.tcl - mimetypes: - - text/x-tcl - - text/x-script.tcl - - application/x-tcl - !ruby/struct:Linguist::Lexer name: JavaScript+Ruby aliases: @@ -1475,15 +1334,6 @@ - *.cxx-objdump mimetypes: - text/x-cpp-objdump -- !ruby/struct:Linguist::Lexer - name: Ioke - aliases: - - ioke - - ik - filenames: - - *.ik - mimetypes: - - text/x-iokesrc - !ruby/struct:Linguist::Lexer name: Python 3 aliases: @@ -1589,20 +1439,15 @@ mimetypes: - application/x-myghty - !ruby/struct:Linguist::Lexer - name: Duel + name: Tcl aliases: - - duel - - Duel Engine - - Duel View - - JBST - - jbst - - JsonML+BST + - tcl filenames: - - *.duel - - *.jbst + - *.tcl mimetypes: - - text/x-duel - - text/x-jbst + - text/x-tcl + - text/x-script.tcl + - application/x-tcl - !ruby/struct:Linguist::Lexer name: MOOCode aliases: @@ -1666,14 +1511,6 @@ mimetypes: - application/x-cheetah - application/x-spitfire -- !ruby/struct:Linguist::Lexer - name: GoodData-CL - aliases: - - gooddata-cl - filenames: - - *.gdc - mimetypes: - - text/x-gooddata-cl - !ruby/struct:Linguist::Lexer name: Objective-C aliases: @@ -1693,7 +1530,6 @@ filenames: - *.js mimetypes: - - application/javascript - application/x-javascript - text/x-javascript - text/javascript @@ -1734,17 +1570,6 @@ - *.G - *.g mimetypes: -- !ruby/struct:Linguist::Lexer - name: Hybris - aliases: - - hybris - - hy - filenames: - - *.hy - - *.hyb - mimetypes: - - text/x-hybris - - application/x-hybris - !ruby/struct:Linguist::Lexer name: JavaScript+PHP aliases: @@ -1755,25 +1580,6 @@ - application/x-javascript+php - text/x-javascript+php - text/javascript+php -- !ruby/struct:Linguist::Lexer - name: Factor - aliases: - - factor - filenames: - - *.factor - mimetypes: - - text/x-factor -- !ruby/struct:Linguist::Lexer - name: XQuery - aliases: - - xquery - - xqy - filenames: - - *.xqy - - *.xquery - mimetypes: - - text/xquery - - application/xquery - !ruby/struct:Linguist::Lexer name: Ragel in Objective C Host aliases: diff --git a/test/test_language.rb b/test/test_language.rb index 84705f59..c3e0a499 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -180,13 +180,13 @@ class TestLanguage < Test::Unit::TestCase assert_equal Lexer['ActionScript 3'], Language['ActionScript'].lexer assert_equal Lexer['Ada'], Language['Ada'].lexer assert_equal Lexer['AppleScript'], Language['AppleScript'].lexer - assert_equal Lexer['Text only'] , Language['Arc'].lexer + # assert_equal Lexer['Arc'] , Language['Arc'].lexer assert_equal Lexer['NASM'], Language['Assembly'].lexer assert_equal Lexer['Batchfile'], Language['Batchfile'].lexer assert_equal Lexer['Befunge'], Language['Befunge'].lexer assert_equal Lexer['Boo'], Language['Boo'].lexer assert_equal Lexer['Brainfuck'], Language['Brainfuck'].lexer - assert_equal Lexer['BlitzMax'], Language['BlitzMax'].lexer + # assert_equal Lexer['BlitzMax'], Language['BlitzMax'].lexer assert_equal Lexer['C'], Language['C'].lexer assert_equal Lexer['C#'], Language['C#'].lexer assert_equal Lexer['C++'], Language['C++'].lexer @@ -204,11 +204,11 @@ class TestLanguage < Test::Unit::TestCase assert_equal Lexer['Diff'], Language['Diff'].lexer assert_equal Lexer['D-ObjDump'], Language['d-objdump'].lexer assert_equal Lexer['Dylan'], Language['Dylan'].lexer - assert_equal Lexer['Text only'], Language['Eiffel'].lexer + # assert_equal Lexer['Eiffel'], Language['Eiffel'].lexer assert_equal Lexer['Scheme'], Language['Emacs Lisp'].lexer assert_equal Lexer['Erlang'], Language['Erlang'].lexer assert_equal Lexer['OCaml'], Language['F#'].lexer - assert_equal Lexer['Factor'], Language['Factor'].lexer + # assert_equal Lexer['Factor'], Language['Factor'].lexer assert_equal Lexer['Fortran'], Language['FORTRAN'].lexer assert_equal Lexer['GAS'], Language['GAS'].lexer assert_equal Lexer['Genshi'], Language['Genshi'].lexer @@ -283,7 +283,7 @@ class TestLanguage < Test::Unit::TestCase assert_equal Lexer['VimL'], Language['VimL'].lexer assert_equal Lexer['Text only'], Language['Visual Basic'].lexer assert_equal Lexer['XML'], Language['XML'].lexer - assert_equal Lexer['XQuery'], Language['XQuery'].lexer + # assert_equal Lexer['XQuery'], Language['XQuery'].lexer assert_equal Lexer['C'], Language['XS'].lexer assert_equal Lexer['YAML'], Language['YAML'].lexer assert_equal Lexer['Java Server Page'], Language['Java Server Pages'].lexer diff --git a/test/test_lexer.rb b/test/test_lexer.rb index bf8ce798..72ddaf43 100644 --- a/test/test_lexer.rb +++ b/test/test_lexer.rb @@ -21,7 +21,6 @@ class TestLexer < Test::Unit::TestCase def test_find_by_alias assert_equal Lexer['Ruby'], Lexer.find_by_alias('rb') assert_equal Lexer['Ruby'], Lexer.find_by_alias('ruby') - assert_equal Lexer['Ruby'], Lexer.find_by_alias('duby') end def test_find_all_by_alias @@ -40,9 +39,9 @@ class TestLexer < Test::Unit::TestCase end def test_aliases - assert_equal ['rb', 'ruby', 'duby'], Lexer['Ruby'].aliases - assert_equal ['python', 'py'], Lexer['Python'].aliases - assert_equal ['perl', 'pl'], Lexer['Perl'].aliases + assert_equal ['rb', 'ruby'], Lexer['Ruby'].aliases + assert_equal ['python', 'py'], Lexer['Python'].aliases + assert_equal ['perl', 'pl'], Lexer['Perl'].aliases end def test_eql