KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:github/linguist into chapel-lang

Browse Source 
Conflicts:
	lib/linguist/samples.json
This commit is contained in:
Thomas Van Doren
2014-08-12 11:10:55 -05:00
parent ad4d273241 41c880afc7
commit e03b3e5ec4
15 changed files with 1337 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/linguist/blob_helper.rb
View File

@@ -1,6 +1,4 @@
require 'linguist/generated'
require 'linguist/language'
require 'charlock_holmes'
require 'escape_utils'
require 'mime/types'

11
lib/linguist/generated.rb
View File

@@ -54,7 +54,7 @@ module Linguist
name == 'Gemfile.lock' ||
minified_files? ||
compiled_coffeescript? ||
xcode_project_file? ||
xcode_file? ||
generated_parser? ||
generated_net_docfile? ||
generated_net_designer_file? ||
@@ -67,14 +67,14 @@ module Linguist
generated_by_zephir?
end
# Internal: Is the blob an XCode project file?
# Internal: Is the blob an Xcode file?
#
# Generated if the file extension is an XCode project
# Generated if the file extension is an Xcode
# file extension.
#
# Returns true of false.
def xcode_project_file?
['.xib', '.nib', '.storyboard', '.pbxproj', '.xcworkspacedata', '.xcuserstate'].include?(extname)
def xcode_file?
['.nib', '.xcworkspacedata', '.xcuserstate'].include?(extname)
end
# Internal: Is the blob minified files?
@@ -256,3 +256,4 @@ module Linguist
end
end
end

2
lib/linguist/language.rb
View File

@@ -9,6 +9,8 @@ end
require 'linguist/classifier'
require 'linguist/heuristics'
require 'linguist/samples'
require 'linguist/file_blob'
require 'linguist/blob_helper'
module Linguist
# Language names that are recognizable by GitHub. Defined languages

24
lib/linguist/languages.yml
View File

@@ -321,7 +321,7 @@ CLIPS:
CMake:
extensions:
- .cmake
- .cmake.in
- .in
filenames:
- CMakeLists.txt
@@ -388,7 +388,7 @@ Clojure:
- .cljscm
- .cljx
- .hic
- .cljs.hl
- .hl
filenames:
- riemann.config
@@ -487,6 +487,12 @@ Cuda:
- .cu
- .cuh
Cycript:
type: programming
lexer: JavaScript
extensions:
- .cy
Cython:
type: programming
group: Python
@@ -865,7 +871,6 @@ HTML:
extensions:
- .html
- .htm
- .html.hl
- .st
- .xhtml
@@ -885,9 +890,7 @@ HTML+ERB:
- erb
extensions:
- .erb
- .erb.deface
- .html.erb
- .html.erb.deface
- .deface
HTML+PHP:
type: markup
@@ -905,17 +908,14 @@ Haml:
type: markup
extensions:
- .haml
- .haml.deface
- .html.haml.deface
- .deface
Handlebars:
type: markup
lexer: Text only
lexer: Handlebars
extensions:
- .handlebars
- .hbs
- .html.handlebars
- .html.hbs
Harbour:
type: programming
@@ -1353,7 +1353,7 @@ MiniD: # Legacy
Mirah:
type: programming
lexer: Ruby
search_term: ruby
search_term: mirah
color: "#c7a938"
extensions:
- .druby

544
lib/linguist/samples.json
View File

@@ -95,7 +95,8 @@
".cljs",
".cljscm",
".cljx",
".hic"
".hic",
".hl"
],
"CoffeeScript": [
".coffee"
@@ -121,6 +122,9 @@
".cu",
".cuh"
],
"Cycript": [
".cy"
],
"DM": [
".dm"
],
@@ -212,7 +216,12 @@
".html",
".st"
],
"HTML+ERB": [
".deface",
".erb"
],
"Haml": [
".deface",
".haml"
],
"Handlebars": [
@@ -800,8 +809,8 @@
"exception.zep.php"
]
},
"tokens_total": 640042,
"languages_total": 874,
"tokens_total": 642012,
"languages_total": 879,
"tokens": {
"ABAP": {
"*/**": 1,
@@ -15973,77 +15982,247 @@
"container": 3
},
"Clojure": {
"(": 83,
"defn": 4,
"(": 258,
"defn": 14,
"prime": 2,
"[": 41,
"[": 67,
"n": 9,
"]": 41,
"not": 3,
"-": 14,
"any": 1,
"zero": 1,
"map": 2,
"#": 1,
"]": 67,
"not": 9,
"-": 70,
"any": 3,
"zero": 2,
"map": 3,
"#": 14,
"rem": 2,
"%": 1,
")": 84,
"%": 6,
")": 259,
"range": 3,
";": 8,
";": 353,
"while": 3,
"stops": 1,
"at": 1,
"the": 1,
"at": 2,
"the": 5,
"first": 2,
"collection": 1,
"element": 1,
"that": 1,
"evaluates": 1,
"to": 1,
"false": 2,
"to": 2,
"false": 6,
"like": 1,
"take": 1,
"for": 2,
"x": 6,
"html": 1,
"head": 1,
"meta": 1,
"{": 8,
"charset": 1,
"}": 8,
"link": 1,
"rel": 1,
"href": 1,
"for": 4,
"x": 8,
"html": 2,
"head": 2,
"meta": 3,
"{": 17,
"charset": 2,
"}": 17,
"link": 2,
"rel": 2,
"href": 6,
"script": 1,
"src": 1,
"body": 1,
"body": 2,
"div.nav": 1,
"p": 1,
"into": 2,
"p": 4,
"Copyright": 1,
"c": 1,
"Alan": 1,
"Dipert": 1,
"and": 8,
"Micha": 1,
"Niskin.": 1,
"All": 1,
"rights": 1,
"reserved.": 1,
"The": 1,
"use": 3,
"distribution": 1,
"terms": 2,
"this": 6,
"software": 2,
"are": 2,
"covered": 1,
"by": 4,
"Eclipse": 1,
"Public": 1,
"License": 1,
"http": 2,
"//opensource.org/licenses/eclipse": 1,
"php": 1,
"which": 2,
"can": 1,
"be": 2,
"found": 1,
"in": 4,
"file": 1,
"epl": 1,
"v10.html": 1,
"root": 1,
"of": 2,
"distribution.": 1,
"By": 1,
"using": 1,
"fashion": 1,
"you": 1,
"agreeing": 1,
"bound": 1,
"license.": 1,
"You": 1,
"must": 1,
"remove": 3,
"notice": 1,
"or": 2,
"other": 1,
"from": 1,
"software.": 1,
"page": 2,
"refer": 4,
"clojure": 1,
"exclude": 1,
"nth": 2,
"require": 2,
"tailrecursion.hoplon.reload": 1,
"reload": 2,
"all": 5,
"tailrecursion.hoplon.util": 1,
"name": 1,
"pluralize": 2,
"tailrecursion.hoplon.storage": 1,
"atom": 1,
"local": 3,
"storage": 2,
"utility": 1,
"functions": 2,
"declare": 1,
"route": 11,
"state": 15,
"editing": 13,
"def": 4,
"mapvi": 2,
"comp": 1,
"vec": 2,
"indexed": 1,
"dissocv": 2,
"v": 15,
"i": 20,
"let": 3,
"z": 4,
"dec": 1,
"count": 5,
"cond": 2,
"neg": 1,
"pop": 1,
"pos": 1,
"into": 3,
"subvec": 2,
"inc": 2,
"decorate": 2,
"todo": 10,
"done": 12,
"completed": 12,
"text": 14,
"assoc": 4,
"visible": 2,
"empty": 8,
"persisted": 1,
"cell": 12,
"AKA": 1,
"stem": 1,
"store": 1,
"cells": 2,
"defc": 6,
"loaded": 1,
"nil": 3,
"formula": 1,
"computed": 1,
"filter": 2,
"active": 5,
"plural": 1,
"item": 1,
"todos": 2,
"list": 1,
"transition": 1,
"t": 5,
"destroy": 3,
"swap": 6,
"clear": 2,
"&": 1,
"_": 4,
"new": 5,
"when": 3,
"conj": 1,
"mapv": 1,
"fn": 3,
"reset": 1,
"if": 3,
"lang": 1,
"equiv": 1,
"content": 1,
"title": 1,
"noscript": 1,
"div": 3,
"id": 20,
"section": 2,
"header": 1,
"h1": 1,
"form": 2,
"on": 11,
"submit": 2,
"do": 15,
"val": 4,
"value": 3,
"input": 4,
"type": 8,
"autofocus": 1,
"true": 5,
"placeholder": 1,
"blur": 2,
"toggle": 4,
"attr": 2,
"checked": 2,
"click": 4,
"label": 2,
"ul": 2,
"loop": 2,
"tpl": 1,
"reverse": 1,
"bind": 1,
"ids": 1,
"done#": 3,
"edit#": 3,
"bindings": 1,
"edit": 3,
"show": 2,
"li": 4,
"class": 8,
"dblclick": 1,
"@i": 6,
"button": 2,
"focus": 1,
"@edit": 2,
"change": 1,
"footer": 2,
"span": 2,
"strong": 1,
"a": 7,
"selected": 3,
"array": 3,
"aseq": 8,
"nil": 1,
"type": 2,
"let": 1,
"count": 3,
"a": 3,
"make": 1,
"loop": 1,
"seq": 1,
"i": 4,
"if": 1,
"<": 1,
"do": 1,
"aset": 1,
"recur": 1,
"next": 1,
"inc": 1,
"defprotocol": 1,
"ISound": 4,
"sound": 5,
"deftype": 2,
"Cat": 1,
"_": 3,
"Dog": 1,
"extend": 1,
"default": 1,
@@ -16054,7 +16233,6 @@
"clj": 1,
"ns": 2,
"c2.svg": 2,
"use": 2,
"c2.core": 2,
"only": 4,
"unify": 2,
@@ -16068,39 +16246,30 @@
"cos": 2,
"mean": 2,
"cljs": 3,
"require": 1,
"c2.dom": 1,
"as": 1,
"dom": 1,
"Stub": 1,
"float": 2,
"fn": 2,
"which": 1,
"does": 1,
"exist": 1,
"on": 1,
"runtime": 1,
"def": 1,
"identity": 1,
"xy": 1,
"coordinates": 7,
"cond": 1,
"and": 1,
"vector": 1,
"y": 1,
"deftest": 1,
"function": 1,
"tests": 1,
"is": 7,
"true": 2,
"contains": 1,
"foo": 6,
"bar": 4,
"select": 1,
"keys": 2,
"baz": 4,
"vals": 1,
"filter": 1
"vals": 1
},
"CoffeeScript": {
"CoffeeScript": 1,
@@ -19074,6 +19243,122 @@
"cudaDeviceReset": 1,
"return": 1
},
"Cycript": {
"(": 12,
"function": 2,
"utils": 2,
")": 12,
"{": 8,
"//": 4,
"Load": 1,
"C": 2,
"functions": 3,
"declared": 1,
"in": 2,
"utils.loadFuncs": 1,
"var": 6,
"shouldLoadCFuncs": 2,
"true": 2,
";": 21,
"Expose": 2,
"the": 1,
"to": 4,
"cycript": 2,
"s": 2,
"global": 1,
"scope": 1,
"shouldExposeConsts": 2,
"defined": 1,
"here": 1,
"t": 1,
"be": 2,
"found": 2,
"with": 1,
"dlsym": 1,
"Failed": 1,
"load": 1,
"mach_vm_address_t": 1,
"string": 4,
"@encode": 2,
"infinite": 1,
"*": 1,
"length": 1,
"[": 8,
"object": 1,
"Struct": 1,
"]": 8,
"%": 8,
"@": 3,
"<%@:>": 1,
"0x": 1,
"+": 3,
"-": 2,
"printf": 1,
".3s": 1,
"d": 2,
"c": 5,
"float": 1,
"f": 1,
"n": 1,
"foo": 2,
"barrrr": 1,
"Args": 1,
"needs": 1,
"an": 1,
"array": 1,
"number": 1,
"Function": 1,
"not": 1,
"foobar": 2,
"strdup": 2,
"pipe": 1,
"write": 1,
"close": 2,
"int": 1,
"a": 1,
"short": 1,
"b": 1,
"char": 1,
"uint64_t": 1,
"double": 1,
"e": 1,
"struct": 1,
"}": 9,
"return": 1,
"new": 1,
"Type": 1,
"typeStr": 1,
"Various": 1,
"constants": 1,
"utils.constants": 2,
"VM_PROT_NONE": 1,
"VM_PROT_READ": 1,
"VM_PROT_WRITE": 1,
"VM_PROT_EXECUTE": 1,
"VM_PROT_NO_CHANGE": 1,
"VM_PROT_COPY": 1,
"VM_PROT_WANTS_COPY": 1,
"VM_PROT_IS_MASK": 1,
"c.VM_PROT_DEFAULT": 1,
"c.VM_PROT_READ": 2,
"|": 3,
"c.VM_PROT_WRITE": 2,
"c.VM_PROT_ALL": 1,
"c.VM_PROT_EXECUTE": 1,
"if": 3,
"for": 2,
"k": 3,
"Cycript.all": 2,
"shouldExposeFuncs": 1,
"i": 4,
"<": 1,
"funcsToExpose.length": 1,
"name": 3,
"funcsToExpose": 1,
"utils.loadfuncs": 1,
"shouldExposeCFuncs": 1,
"exports": 1
},
"DM": {
"#define": 4,
"PI": 6,
@@ -26800,8 +27085,139 @@
"with": 1,
"Doxygen": 1
},
"HTML+ERB": {
"<%>": 12,
"if": 3,
"Spree": 4,
"Config": 4,
"enable_fishbowl": 1,
"<div>": 23,
"class=": 24,
"id=": 1,
"<fieldset>": 1,
"<legend>": 1,
"align=": 1,
"<%=>": 12,
"t": 4,
"fishbowl_settings": 1,
"</legend>": 1,
"fishbowl_options": 1,
"each": 1,
"do": 2,
"key": 5,
"label_tag": 2,
"to_s": 2,
"gsub": 1,
"fishbowl_": 1,
"to_sym": 1,
"tag": 2,
"br": 2,
"text_field_tag": 1,
"preferences": 4,
"size": 1,
"class": 2,
"}": 3,
")": 4,
"%": 2,
"</div>": 23,
"end": 5,
"hidden_field_tag": 1,
"fishbowl_always_fetch_current_inventory": 3,
"0": 1,
"check_box_tag": 1,
"1": 1,
"always_fetch_current_inventory": 1,
"location_groups": 2,
"empty": 1,
"fishbowl_location_group": 3,
"location_group": 1,
"select": 1,
"selected": 1,
"[": 2,
"]": 2,
"{": 1,
"</fieldset>": 1,
"<script>": 1,
"type=": 1,
"(": 2,
".select2": 1,
";": 1,
"</script>": 1,
"provide": 1,
"title": 1,
"header": 2,
"present": 1,
"users": 3,
"user_presenter": 1,
"<h1>": 1,
"</h1>": 1,
"will_paginate": 2,
"Name": 1,
"Email": 1,
"Chords": 1,
"Keys": 1,
"Tunings": 1,
"Credits": 1,
"Prem": 1,
"Since": 1,
"No": 1,
"Users": 1,
"else": 1,
"render": 1
},
"Haml": {
"%": 1,
"/": 1,
"replace": 1,
".pull": 1,
"-": 16,
"right": 1,
".btn": 2,
"group": 2,
"link_to": 4,
"page.url": 1,
"target": 1,
"title": 5,
"t": 5,
"(": 10,
")": 10,
"class": 4,
"do": 4,
"%": 7,
"i.icon": 5,
"picture.row": 1,
"black": 1,
"refinery.edit_admin_page_path": 1,
"page.nested_url": 2,
"switch_locale": 1,
"page.translations.first.locale": 1,
"unless": 1,
"page.translated_to_default_locale": 1,
"scope": 4,
"edit.row": 1,
"blue": 1,
"if": 1,
"page.deletable": 1,
"refinery.admin_page_path": 1,
"methode": 1,
"delete": 1,
"data": 1,
"{": 1,
"confirm": 1,
"page_title_with_translations": 1,
"page": 1,
"}": 1,
"trash.row": 1,
"red": 1,
"else": 1,
"button.btn.btn": 1,
"xs.btn": 1,
"default.disabled": 1,
"trash": 1,
"refinery.new_admin_page_path": 1,
"parent_id": 1,
"page.id": 1,
"plus.row": 1,
"green": 1,
"p": 1,
"Hello": 1,
"World": 1
@@ -70558,7 +70974,7 @@
"Ceylon": 50,
"Chapel": 9607,
"Cirru": 244,
"Clojure": 510,
"Clojure": 1899,
"CoffeeScript": 2951,
"Common Lisp": 2186,
"Component Pascal": 825,
@@ -70566,6 +70982,7 @@
"Creole": 134,
"Crystal": 1506,
"Cuda": 290,
"Cycript": 251,
"DM": 169,
"Dart": 74,
"Diff": 16,
@@ -70590,7 +71007,8 @@
"Groovy": 93,
"Groovy Server Pages": 91,
"HTML": 413,
"Haml": 4,
"HTML+ERB": 213,
"Haml": 121,
"Handlebars": 69,
"Haskell": 302,
"Hy": 155,
@@ -70759,7 +71177,7 @@
"Ceylon": 1,
"Chapel": 5,
"Cirru": 9,
"Clojure": 7,
"Clojure": 8,
"CoffeeScript": 9,
"Common Lisp": 3,
"Component Pascal": 2,
@@ -70767,6 +71185,7 @@
"Creole": 1,
"Crystal": 3,
"Cuda": 2,
"Cycript": 1,
"DM": 1,
"Dart": 1,
"Diff": 1,
@@ -70791,7 +71210,8 @@
"Groovy": 5,
"Groovy Server Pages": 4,
"HTML": 2,
"Haml": 1,
"HTML+ERB": 2,
"Haml": 2,
"Handlebars": 2,
"Haskell": 3,
"Hy": 2,
@@ -70934,5 +71354,5 @@
"fish": 3,
"wisp": 1
},
"md5": "e1a3dc40ad721b18cc222fa645d65304"
"md5": "74cf3030ce69bf98dcb208636bb9486d"
}

4
lib/linguist/vendor.yml
View File

@@ -112,6 +112,10 @@
- (^|/)modernizr\-\d\.\d+(\.\d+)?(\.min)?\.js$
- (^|/)modernizr\.custom\.\d+\.js$
# Knockout
- (^|/)knockout-(\d+\.){3}(debug\.)?js$
- knockout-min.js
## Python ##
# django

2
lib/linguist/version.rb
View File

@@ -1,3 +1,3 @@
module Linguist
VERSION = "3.0.3"
VERSION = "3.1.1"
end