KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-12-08 04:18:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dont-explode-on-invalid-shebang

Browse Source 
Conflicts:
	lib/linguist/samples.json
	test/test_tokenizer.rb
This commit is contained in:
Joshua Peek
2012-12-10 09:02:24 -06:00
parent ec3434cf1d 161d076bfd
commit dcc2be0781
9 changed files with 472 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
lib/linguist/languages.yml
View File

@@ -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
@@ -180,8 +190,10 @@ C++:
- cpp
primary_extension: .cpp
extensions:
- .C
- .c++
- .cxx
- .H
- .h++
- .hh
- .hxx
@@ -244,6 +256,7 @@ CoffeeScript:
color: "#244776"
aliases:
- coffee
- coffee-script
primary_extension: .coffee
extensions:
- ._coffee
@@ -392,6 +405,12 @@ Elixir:
- .ex
- .exs
Elm:
type: programming
lexer: Haskell
group: Haskell
primary_extension: .elm
Emacs Lisp:
type: programming
lexer: Scheme
@@ -545,6 +564,8 @@ Groovy Server Pages:
HTML:
type: markup
ace_mode: html
aliases:
- xhtml
primary_extension: .html
extensions:
- .htm
@@ -563,6 +584,8 @@ HTML+ERB:
type: markup
group: HTML
lexer: RHTML
aliases:
- erb
primary_extension: .erb
extensions:
- .erb
@@ -575,16 +598,9 @@ HTML+PHP:
extensions:
- .phtml
HaXe:
type: programming
lexer: haXe
ace_mode: haxe
color: "#346d51"
primary_extension: .hx
extensions:
- .hx
- .hxml
- .mtt
HTTP:
type: data
primary_extension: .http
Haml:
group: HTML
@@ -599,6 +615,15 @@ Haskell:
- .hs
- .hsc
Haxe:
type: programming
lexer: haXe
ace_mode: haxe
color: "#346d51"
primary_extension: .hx
extensions:
- .hxsl
INI:
type: data
extensions:
@@ -723,6 +748,8 @@ Lua:
- .nse
Makefile:
aliases:
- make
extensions:
- .mak
- .mk
@@ -798,6 +825,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"
@@ -843,6 +877,9 @@ ObjDump:
Objective-C:
type: programming
color: "#438eff"
aliases:
- obj-c
- objc
primary_extension: .m
extensions:
- .mm
@@ -850,6 +887,8 @@ Objective-C:
Objective-J:
type: programming
color: "#ff0c5a"
aliases:
- obj-j
primary_extension: .j
extensions:
- .j
@@ -1126,7 +1165,13 @@ Shell:
primary_extension: .sh
filenames:
- .zsh
- bash_logout
- bash_profile
- bashrc
- zlogin
- zlogout
- zshenv
- zprofile
- zshrc
Smalltalk:
@@ -1172,6 +1217,8 @@ Tcsh:
TeX:
type: markup
ace_mode: latex
aliases:
- latex
primary_extension: .tex
extensions:
- .aux
@@ -1261,6 +1308,11 @@ Visual Basic:
XML:
type: markup
ace_mode: xml
aliases:
- rss
- xsd
- xsl
- wsdl
primary_extension: .xml
extensions:
- .glade
@@ -1306,6 +1358,8 @@ XSLT:
YAML:
type: markup
aliases:
- yml
primary_extension: .yml
extensions:
- .yaml

145
lib/linguist/samples.json
View File

@@ -44,6 +44,9 @@
"Ecl": [
".ecl"
],
"Elm": [
".elm"
],
"Emacs Lisp": [
".el"
],
@@ -140,7 +143,8 @@
],
"PHP": [
".module",
".php"
".php",
".script!"
],
"PowerShell": [
".ps1",
@@ -260,8 +264,8 @@
".gemrc"
]
},
"tokens_total": 271188,
"languages_total": 276,
"tokens_total": 271826,
"languages_total": 281,
"tokens": {
"Apex": {
"global": 70,
@@ -9238,6 +9242,123 @@
"a": 1,
"self": 1
},
"Elm": {
"import": 3,
"List": 1,
"(": 119,
"intercalate": 2,
"intersperse": 3,
")": 116,
"Website.Skeleton": 1,
"Website.ColorScheme": 1,
"addFolder": 4,
"folder": 2,
"lst": 6,
"let": 2,
"add": 2,
"x": 13,
"y": 7,
"+": 14,
"in": 2,
"f": 8,
"n": 2,
"xs": 9,
"map": 11,
"elements": 2,
"[": 31,
"]": 31,
"functional": 2,
"reactive": 2,
"-": 11,
"example": 3,
"name": 6,
"loc": 2,
"Text.link": 1,
"toText": 6,
"toLinks": 2,
"title": 2,
"links": 2,
"flow": 4,
"right": 8,
"width": 3,
"text": 4,
"italic": 1,
"bold": 2,
".": 9,
"Text.color": 1,
"accent4": 1,
"insertSpace": 2,
"case": 5,
"of": 7,
"{": 1,
"spacer": 2,
";": 1,
"}": 1,
"subsection": 2,
"w": 7,
"info": 2,
"down": 3,
"words": 2,
"markdown": 1,
"|": 3,
"###": 1,
"Basic": 1,
"Examples": 1,
"Each": 1,
"listed": 1,
"below": 1,
"focuses": 1,
"on": 1,
"a": 5,
"single": 1,
"function": 1,
"or": 1,
"concept.": 1,
"These": 1,
"examples": 1,
"demonstrate": 1,
"all": 1,
"the": 1,
"basic": 1,
"building": 1,
"blocks": 1,
"Elm.": 1,
"content": 2,
"exampleSets": 2,
"plainText": 1,
"main": 3,
"lift": 1,
"skeleton": 1,
"Window.width": 1,
"asText": 1,
"qsort": 4,
"filter": 2,
"<)x)>": 1,
"data": 1,
"Tree": 3,
"Node": 8,
"Empty": 8,
"empty": 2,
"singleton": 2,
"v": 8,
"insert": 4,
"tree": 7,
"left": 7,
"if": 2,
"then": 2,
"else": 2,
"<": 1,
"fromList": 3,
"foldl": 1,
"depth": 5,
"max": 1,
"t1": 2,
"t2": 3,
"display": 4,
"monospace": 1,
"concat": 1,
"show": 2
},
"Emacs Lisp": {
"(": 1,
"print": 1,
@@ -21629,13 +21750,13 @@
"AUTHOR": 1
},
"PHP": {
"<": 9,
"php": 6,
"<": 11,
"php": 8,
"namespace": 28,
"Symfony": 24,
"Component": 24,
"Console": 17,
";": 1380,
";": 1382,
"use": 23,
"Input": 6,
"InputInterface": 4,
@@ -22647,7 +22768,9 @@
"nest": 1,
"isUnique": 1,
"is_bool": 1,
"sql": 1
"sql": 1,
"SHEBANG#!php": 2,
"echo": 2
},
"PowerShell": {
"Write": 2,
@@ -27753,6 +27876,7 @@
"Delphi": 30,
"Diff": 16,
"Ecl": 281,
"Elm": 628,
"Emacs Lisp": 3,
"GAS": 133,
"Gosu": 413,
@@ -27781,7 +27905,7 @@
"Parrot Assembly": 6,
"Parrot Internal Representation": 5,
"Perl": 17113,
"PHP": 20637,
"PHP": 20647,
"PowerShell": 12,
"Prolog": 4040,
"Python": 4020,
@@ -27824,6 +27948,7 @@
"Delphi": 1,
"Diff": 1,
"Ecl": 1,
"Elm": 3,
"Emacs Lisp": 1,
"GAS": 1,
"Gosu": 5,
@@ -27852,7 +27977,7 @@
"Parrot Assembly": 1,
"Parrot Internal Representation": 1,
"Perl": 13,
"PHP": 6,
"PHP": 8,
"PowerShell": 2,
"Prolog": 6,
"Python": 4,
@@ -27881,5 +28006,5 @@
"XSLT": 1,
"YAML": 1
},
"md5": "384f02c0bd223479bf750d4cd36daf71"
"md5": "ef9b9c6f8312a9f029edf9b7df6e9751"
}