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 conflicts from master fixed

Browse Source
This commit is contained in:
Paul Chaignon
2014-06-13 18:50:32 +02:00
parent bd380f44cc 31921838cd
commit b1c2820299
68 changed files with 2685 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/linguist/blob_helper.rb
View File

@@ -112,6 +112,12 @@ module Linguist
end
end
def ruby_encoding
if hash = detect_encoding
hash[:ruby_encoding]
end
end
# Try to guess the encoding
#
# Returns: a Hash, with :encoding, :confidence, :type
@@ -256,10 +262,16 @@ module Linguist
# without changing the encoding of `data`, and
# also--importantly--without having to duplicate many (potentially
# large) strings.
encoded_newlines = ["\r\n", "\r", "\n"].
map { |nl| nl.encode(encoding).force_encoding(data.encoding) }
begin
encoded_newlines = ["\r\n", "\r", "\n"].
map { |nl| nl.encode(ruby_encoding, "ASCII-8BIT").force_encoding(data.encoding) }
data.split(Regexp.union(encoded_newlines), -1)
data.split(Regexp.union(encoded_newlines), -1)
rescue Encoding::ConverterNotFoundError
# The data is not splittable in the detected encoding. Assume it's
# one big line.
[data]
end
else
[]
end

50
lib/linguist/languages.yml
View File

@@ -430,6 +430,14 @@ Common Lisp:
- clisp
- ecl
Component Pascal:
type: programming
lexer: Delphi
color: "#b0ce4e"
extensions:
- .cp
- .cps
Coq:
type: programming
extensions:
@@ -1895,6 +1903,13 @@ SQL:
- .udf
- .viw
STON:
type: data
group: Smalltalk
lexer: JSON
extensions:
- .ston
Sage:
type: programming
lexer: Python
@@ -1987,6 +2002,14 @@ Slash:
extensions:
- .sl
Slim:
group: HTML
type: markup
lexer: Slim
color: "#ff8877"
extensions:
- .slim
Smalltalk:
type: programming
color: "#596706"
@@ -2017,8 +2040,9 @@ Standard ML:
aliases:
- sml
extensions:
- .sml
- .ML
- .fun
- .sml
Stata:
type: programming
@@ -2046,6 +2070,13 @@ SuperCollider:
extensions:
- .scd
Swift:
type: programming
lexer: Swift
color: "#ffac45"
extensions:
- .swift
SystemVerilog:
type: programming
color: "#343761"
@@ -2154,6 +2185,14 @@ UnrealScript:
extensions:
- .uc
VCL:
type: programming
lexer: Perl
ace_mode: perl
color: "#0298c3"
extensions:
- .vcl
VHDL:
type: programming
lexer: vhdl
@@ -2342,6 +2381,14 @@ Zephir:
extensions:
- .zep
Zimpl:
type: programming
lexer: Text only
extensions:
- .zimpl
- .zmpl
- .zpl
eC:
type: programming
search_term: ec
@@ -2372,6 +2419,7 @@ mupad:
nesC:
type: programming
color: "#ffce3b"
lexer: nesC
extensions:
- .nc

813
lib/linguist/samples.json
View File

@@ -235,6 +235,10 @@
"UnrealScript": [
".uc"
],
"Component Pascal": [
".cp",
".cps"
],
"PogoScript": [
".pogo"
],
@@ -312,6 +316,9 @@
"XSLT": [
".xslt"
],
"Zimpl": [
".zmpl"
],
"Groovy": [
".gradle",
".grt",
@@ -416,6 +423,9 @@
".oxh",
".oxo"
],
"STON": [
".ston"
],
"Scilab": [
".sce",
".sci",
@@ -479,6 +489,9 @@
"Haskell": [
".hs"
],
"Slim": [
".slim"
],
"Zephir": [
".zep"
],
@@ -486,6 +499,9 @@
".eliom",
".ml"
],
"VCL": [
".vcl"
],
"Smalltalk": [
".st"
],
@@ -508,6 +524,9 @@
"Bluespec": [
".bsv"
],
"Swift": [
".swift"
],
"SourcePawn": [
".sp"
],
@@ -635,6 +654,7 @@
".h"
],
"Standard ML": [
".ML",
".fun",
".sig",
".sml"
@@ -722,8 +742,8 @@
"Rakefile"
]
},
"tokens_total": 611474,
"languages_total": 755,
"tokens_total": 614434,
"languages_total": 812,
"tokens": {
"Stylus": {
"border": 6,
@@ -29184,6 +29204,181 @@
"log": 1,
"defaultproperties": 1
},
"Component Pascal": {
"MODULE": 2,
"ObxControls": 1,
";": 123,
"IMPORT": 2,
"Dialog": 1,
"Ports": 1,
"Properties": 1,
"Views": 1,
"CONST": 1,
"beginner": 5,
"advanced": 3,
"expert": 1,
"guru": 2,
"TYPE": 1,
"View": 6,
"POINTER": 2,
"TO": 2,
"RECORD": 2,
"(": 91,
"Views.View": 2,
")": 94,
"size": 1,
"INTEGER": 10,
"END": 31,
"VAR": 9,
"data*": 1,
"class*": 1,
"list*": 1,
"Dialog.List": 1,
"width*": 1,
"predef": 12,
"ARRAY": 2,
"OF": 2,
"PROCEDURE": 12,
"SetList": 4,
"BEGIN": 13,
"IF": 11,
"data.class": 5,
"THEN": 12,
"data.list.SetLen": 3,
"data.list.SetItem": 11,
"ELSIF": 1,
"ELSE": 3,
"v": 6,
"CopyFromSimpleView": 2,
"source": 2,
"v.size": 10,
".size": 1,
"Restore": 2,
"f": 1,
"Views.Frame": 1,
"l": 1,
"t": 1,
"r": 7,
"b": 1,
"[": 13,
"]": 13,
"f.DrawRect": 1,
"Ports.fill": 1,
"Ports.red": 1,
"HandlePropMsg": 2,
"msg": 2,
"Views.PropMessage": 1,
"WITH": 1,
"Properties.SizePref": 1,
"DO": 4,
"msg.w": 1,
"msg.h": 1,
"ClassNotify*": 1,
"op": 4,
"from": 2,
"to": 5,
"Dialog.changed": 2,
"OR": 4,
"&": 8,
"data.list.index": 3,
"data.width": 4,
"Dialog.Update": 2,
"data": 2,
"Dialog.UpdateList": 1,
"data.list": 1,
"ClassNotify": 1,
"ListNotify*": 1,
"ListNotify": 1,
"ListGuard*": 1,
"par": 2,
"Dialog.Par": 2,
"par.disabled": 1,
"ListGuard": 1,
"WidthGuard*": 1,
"par.readOnly": 1,
"#": 3,
"WidthGuard": 1,
"Open*": 1,
"NEW": 2,
"*": 1,
"Ports.mm": 1,
"Views.OpenAux": 1,
"Open": 1,
"ObxControls.": 1,
"ObxFact": 1,
"Stores": 1,
"Models": 1,
"TextModels": 1,
"TextControllers": 1,
"Integers": 1,
"Read": 3,
"TextModels.Reader": 2,
"x": 15,
"Integers.Integer": 3,
"i": 17,
"len": 5,
"beg": 11,
"ch": 14,
"CHAR": 3,
"buf": 5,
"r.ReadChar": 5,
"WHILE": 3,
"r.eot": 4,
"<=>": 1,
"ReadChar": 1,
"ASSERT": 1,
"eot": 1,
"<": 8,
"r.Pos": 2,
"-": 1,
"REPEAT": 3,
"INC": 4,
"UNTIL": 3,
"+": 1,
"r.SetPos": 2,
"X": 1,
"Integers.ConvertFromString": 1,
"Write": 3,
"w": 4,
"TextModels.Writer": 2,
"Integers.Sign": 2,
"w.WriteChar": 3,
"Integers.Digits10Of": 1,
"DEC": 1,
"Integers.ThisDigit10": 1,
"Compute*": 1,
"end": 6,
"n": 3,
"s": 3,
"Stores.Operation": 1,
"attr": 3,
"TextModels.Attributes": 1,
"c": 3,
"TextControllers.Controller": 1,
"TextControllers.Focus": 1,
"NIL": 3,
"c.HasSelection": 1,
"c.GetSelection": 1,
"c.text.NewReader": 1,
"r.ReadPrev": 2,
"r.attr": 1,
"Integers.Compare": 1,
"Integers.Long": 3,
"MAX": 1,
"LONGINT": 1,
"SHORT": 1,
"Integers.Short": 1,
"Integers.Product": 1,
"Models.BeginScript": 1,
"c.text": 2,
"c.text.Delete": 1,
"c.text.NewWriter": 1,
"w.SetPos": 1,
"w.SetAttr": 1,
"Models.EndScript": 1,
"Compute": 1,
"ObxFact.": 1
},
"PogoScript": {
"httpism": 1,
"require": 3,
@@ -33285,6 +33480,47 @@
"</xsl:template>": 1,
"</xsl:stylesheet>": 1
},
"Zimpl": {
"#": 2,
"param": 1,
"columns": 2,
";": 7,
"set": 3,
"I": 3,
"{": 2,
"..": 1,
"}": 2,
"IxI": 6,
"*": 2,
"TABU": 4,
"[": 8,
"<i,j>": 3,
"in": 5,
"]": 8,
"<m,n>": 2,
"with": 1,
"(": 6,
"m": 4,
"i": 8,
"or": 3,
"n": 4,
"j": 8,
")": 6,
"and": 1,
"abs": 2,
"-": 3,
"var": 1,
"x": 4,
"binary": 1,
"maximize": 1,
"queens": 1,
"sum": 2,
"subto": 1,
"c1": 1,
"forall": 1,
"do": 1,
"card": 2
},
"Groovy": {
"SHEBANG#!groovy": 2,
"println": 3,
@@ -41438,6 +41674,56 @@
"*AV": 1,
"|": 1
},
"STON": {
"{": 15,
"[": 11,
"]": 11,
"}": 15,
"#a": 1,
"#b": 1,
"TestDomainObject": 1,
"#created": 1,
"DateAndTime": 2,
"#modified": 1,
"#integer": 1,
"#float": 1,
"#description": 1,
"#color": 1,
"#green": 1,
"#tags": 1,
"#two": 1,
"#beta": 1,
"#medium": 1,
"#bytes": 1,
"ByteArray": 1,
"#boolean": 1,
"false": 1,
"Rectangle": 1,
"#origin": 1,
"Point": 2,
"-": 2,
"#corner": 1,
"ZnResponse": 1,
"#headers": 2,
"ZnHeaders": 1,
"ZnMultiValueDictionary": 1,
"#entity": 1,
"ZnStringEntity": 1,
"#contentType": 1,
"ZnMimeType": 1,
"#main": 1,
"#sub": 1,
"#parameters": 1,
"#contentLength": 1,
"#string": 1,
"#encoder": 1,
"ZnUTF8Encoder": 1,
"#statusLine": 1,
"ZnStatusLine": 1,
"#version": 1,
"#code": 1,
"#reason": 1
},
"Scilab": {
"disp": 1,
"(": 7,
@@ -44292,6 +44578,70 @@
"+": 2,
"fromMaybe": 1
},
"Slim": {
"doctype": 1,
"html": 2,
"head": 1,
"title": 1,
"Slim": 2,
"Examples": 1,
"meta": 2,
"name": 2,
"content": 2,
"author": 2,
"javascript": 1,
"alert": 1,
"(": 1,
")": 1,
"body": 1,
"h1": 1,
"Markup": 1,
"examples": 1,
"#content": 1,
"p": 2,
"This": 1,
"example": 1,
"shows": 1,
"you": 2,
"how": 1,
"a": 1,
"basic": 1,
"file": 1,
"looks": 1,
"like.": 1,
"yield": 1,
"-": 3,
"unless": 1,
"items.empty": 1,
"table": 1,
"for": 1,
"item": 1,
"in": 1,
"items": 2,
"do": 1,
"tr": 1,
"td.name": 1,
"item.name": 1,
"td.price": 1,
"item.price": 1,
"else": 1,
"|": 2,
"No": 1,
"found.": 1,
"Please": 1,
"add": 1,
"some": 1,
"inventory.": 1,
"Thank": 1,
"div": 1,
"id": 1,
"render": 1,
"Copyright": 1,
"#": 2,
"{": 2,
"year": 1,
"}": 2
},
"Zephir": {
"namespace": 3,
"Test": 2,
@@ -44555,6 +44905,87 @@
"get_state": 1,
"lazy_from_val": 1
},
"VCL": {
"sub": 23,
"vcl_recv": 2,
"{": 50,
"if": 14,
"(": 50,
"req.request": 18,
"&&": 14,
")": 50,
"return": 33,
"pipe": 4,
";": 48,
"}": 50,
"pass": 9,
"req.http.Authorization": 2,
"||": 4,
"req.http.Cookie": 2,
"lookup": 2,
"vcl_pipe": 2,
"vcl_pass": 2,
"vcl_hash": 2,
"set": 10,
"req.hash": 3,
"+": 17,
"req.url": 2,
"req.http.host": 4,
"else": 3,
"server.ip": 2,
"hash": 2,
"vcl_hit": 2,
"obj.cacheable": 2,
"deliver": 8,
"vcl_miss": 2,
"fetch": 3,
"vcl_fetch": 2,
"obj.http.Set": 1,
"-": 21,
"Cookie": 2,
"obj.prefetch": 1,
"s": 3,
"vcl_deliver": 2,
"vcl_discard": 1,
"discard": 2,
"vcl_prefetch": 1,
"vcl_timeout": 1,
"vcl_error": 2,
"obj.http.Content": 2,
"Type": 2,
"synthetic": 2,
"utf": 2,
"//W3C//DTD": 2,
"XHTML": 2,
"Strict//EN": 2,
"http": 3,
"//www.w3.org/TR/xhtml1/DTD/xhtml1": 2,
"strict.dtd": 2,
"obj.status": 4,
"obj.response": 6,
"req.xid": 2,
"//www.varnish": 1,
"cache.org/": 1,
"req.restarts": 1,
"req.http.x": 1,
"forwarded": 1,
"for": 1,
"req.http.X": 3,
"Forwarded": 3,
"For": 3,
"client.ip": 2,
"hash_data": 3,
"beresp.ttl": 2,
"<": 1,
"beresp.http.Set": 1,
"beresp.http.Vary": 1,
"hit_for_pass": 1,
"obj.http.Retry": 1,
"After": 1,
"vcl_init": 1,
"ok": 2,
"vcl_fini": 1
},
"Smalltalk": {
"tests": 2,
"testSimpleChainMatches": 1,
@@ -45093,6 +45524,260 @@
"show": 1,
"time": 1
},
"Swift": {
"var": 42,
"n": 5,
"while": 2,
"<": 4,
"{": 77,
"*": 7,
"}": 77,
"m": 5,
"do": 1,
"let": 43,
"optionalSquare": 2,
"Square": 7,
"(": 89,
"sideLength": 17,
"name": 21,
")": 89,
".sideLength": 1,
"enum": 4,
"Suit": 2,
"case": 21,
"Spades": 1,
"Hearts": 1,
"Diamonds": 1,
"Clubs": 1,
"func": 24,
"simpleDescription": 14,
"-": 21,
"String": 27,
"switch": 4,
"self": 3,
".Spades": 2,
"return": 30,
".Hearts": 1,
".Diamonds": 1,
".Clubs": 1,
"hearts": 1,
"Suit.Hearts": 1,
"heartsDescription": 1,
"hearts.simpleDescription": 1,
"interestingNumbers": 2,
"[": 18,
"]": 18,
"largest": 4,
"for": 10,
"kind": 1,
"numbers": 6,
"in": 11,
"number": 13,
"if": 6,
"greet": 2,
"day": 1,
"apples": 1,
"oranges": 1,
"appleSummary": 1,
"fruitSummary": 1,
"struct": 2,
"Card": 2,
"rank": 2,
"Rank": 2,
"suit": 2,
"threeOfSpades": 1,
".Three": 1,
"threeOfSpadesDescription": 1,
"threeOfSpades.simpleDescription": 1,
"anyCommonElements": 2,
"<T,>": 1,
"U": 4,
"where": 2,
"T": 5,
"Sequence": 2,
"GeneratorType": 3,
"Element": 3,
"Equatable": 1,
"lhs": 2,
"rhs": 2,
"Bool": 4,
"lhsItem": 2,
"rhsItem": 2,
"true": 2,
"false": 2,
"Int": 19,
"Ace": 1,
"Two": 1,
"Three": 1,
"Four": 1,
"Five": 1,
"Six": 1,
"Seven": 1,
"Eight": 1,
"Nine": 1,
"Ten": 1,
"Jack": 1,
"Queen": 1,
"King": 1,
".Ace": 1,
".Jack": 1,
".Queen": 1,
".King": 1,
"default": 2,
"self.toRaw": 1,
"ace": 1,
"Rank.Ace": 1,
"aceRawValue": 1,
"ace.toRaw": 1,
"sort": 1,
"returnFifteen": 2,
"y": 3,
"add": 2,
"+": 15,
"class": 7,
"Shape": 2,
"numberOfSides": 4,
"emptyArray": 1,
"emptyDictionary": 1,
"Dictionary": 1,
"<String,>": 1,
"Float": 1,
"println": 1,
"extension": 1,
"ExampleProtocol": 5,
"mutating": 3,
"adjust": 4,
"EquilateralTriangle": 4,
"NamedShape": 3,
"Double": 11,
"init": 4,
"self.sideLength": 2,
"super.init": 2,
"perimeter": 1,
"get": 2,
"set": 1,
"newValue": 1,
"/": 1,
"override": 2,
"triangle": 3,
"triangle.perimeter": 2,
"triangle.sideLength": 2,
"OptionalValue": 2,
"<T>": 1,
"None": 1,
"Some": 1,
"possibleInteger": 2,
"<Int>": 1,
".None": 1,
".Some": 1,
"SimpleClass": 2,
"anotherProperty": 1,
"a": 2,
"a.adjust": 1,
"aDescription": 1,
"a.simpleDescription": 1,
"SimpleStructure": 2,
"b": 1,
"b.adjust": 1,
"bDescription": 1,
"b.simpleDescription": 1,
"Counter": 2,
"count": 2,
"incrementBy": 1,
"amount": 2,
"numberOfTimes": 2,
"times": 4,
"counter": 1,
"counter.incrementBy": 1,
"getGasPrices": 2,
"myVariable": 2,
"myConstant": 1,
"convertedRank": 1,
"Rank.fromRaw": 1,
"threeDescription": 1,
"convertedRank.simpleDescription": 1,
"protocolValue": 1,
"protocolValue.simpleDescription": 1,
"sumOf": 3,
"Int...": 1,
"sum": 3,
"individualScores": 2,
"teamScore": 4,
"score": 2,
"else": 1,
"vegetable": 2,
"vegetableComment": 4,
"x": 1,
"x.hasSuffix": 1,
"optionalString": 2,
"nil": 1,
"optionalName": 2,
"greeting": 2,
"label": 2,
"width": 2,
"widthLabel": 1,
"shape": 1,
"shape.numberOfSides": 1,
"shapeDescription": 1,
"shape.simpleDescription": 1,
"self.name": 1,
"shoppingList": 3,
"occupations": 2,
"numbers.map": 2,
"result": 5,
"area": 1,
"test": 1,
"test.area": 1,
"test.simpleDescription": 1,
"makeIncrementer": 2,
"addOne": 2,
"increment": 2,
"repeat": 2,
"<ItemType>": 1,
"item": 4,
"ItemType": 3,
"i": 6,
"ServerResponse": 1,
"Result": 1,
"Error": 1,
"success": 2,
"ServerResponse.Result": 1,
"failure": 1,
"ServerResponse.Error": 1,
".Result": 1,
"sunrise": 1,
"sunset": 1,
"serverResponse": 2,
".Error": 1,
"error": 1,
"//": 1,
"Went": 1,
"shopping": 1,
"and": 1,
"bought": 1,
"everything.": 1,
"TriangleAndSquare": 2,
"willSet": 2,
"square.sideLength": 1,
"newValue.sideLength": 2,
"square": 2,
"size": 4,
"triangleAndSquare": 1,
"triangleAndSquare.square.sideLength": 1,
"triangleAndSquare.triangle.sideLength": 2,
"triangleAndSquare.square": 1,
"protocol": 1,
"firstForLoop": 3,
"secondForLoop": 3,
";": 2,
"implicitInteger": 1,
"implicitDouble": 1,
"explicitDouble": 1,
"hasAnyMatches": 2,
"list": 2,
"condition": 2,
"lessThanTen": 2
},
"SourcePawn": {
"//#define": 1,
"DEBUG": 2,
@@ -64610,59 +65295,59 @@
"git_pool_swap": 1
},
"Standard ML": {
"structure": 10,
"LazyBase": 2,
"LAZY_BASE": 3,
"struct": 9,
"type": 5,
"a": 74,
"exception": 1,
"Undefined": 3,
"fun": 51,
"delay": 3,
"f": 37,
"force": 9,
"(": 822,
")": 826,
"val": 143,
"undefined": 1,
"fn": 124,
"raise": 5,
"end": 52,
"LazyMemoBase": 2,
"datatype": 28,
"|": 225,
"Done": 1,
"of": 90,
"lazy": 12,
"unit": 6,
"-": 19,
"let": 43,
"open": 8,
"B": 1,
"inject": 3,
"x": 59,
"isUndefined": 2,
"ignore": 2,
";": 20,
"false": 31,
"handle": 3,
"true": 35,
"toString": 3,
"if": 50,
"then": 50,
"else": 50,
"eqBy": 3,
"p": 6,
"y": 44,
"eq": 2,
"op": 1,
"compare": 7,
"Ops": 2,
"map": 2,
"Lazy": 1,
"LazyFn": 2,
"LazyMemo": 1,
"structure": 15,
"LazyBase": 4,
"LAZY_BASE": 5,
"struct": 13,
"type": 6,
"a": 78,
"exception": 2,
"Undefined": 6,
"fun": 60,
"delay": 6,
"f": 46,
"force": 18,
"(": 840,
")": 845,
"val": 147,
"undefined": 2,
"fn": 127,
"raise": 6,
"end": 55,
"LazyMemoBase": 4,
"datatype": 29,
"|": 226,
"Done": 2,
"of": 91,
"lazy": 13,
"unit": 7,
"-": 20,
"let": 44,
"open": 9,
"B": 2,
"inject": 5,
"x": 74,
"isUndefined": 4,
"ignore": 3,
";": 21,
"false": 32,
"handle": 4,
"true": 36,
"toString": 4,
"if": 51,
"then": 51,
"else": 51,
"eqBy": 5,
"p": 10,
"y": 50,
"eq": 3,
"op": 2,
"compare": 8,
"Ops": 3,
"map": 3,
"Lazy": 2,
"LazyFn": 4,
"LazyMemo": 2,
"functor": 2,
"Main": 1,
"S": 2,
@@ -66377,6 +67062,7 @@
"Org": 358,
"Liquid": 633,
"UnrealScript": 2873,
"Component Pascal": 825,
"PogoScript": 250,
"Creole": 134,
"Processing": 74,
@@ -66398,6 +67084,7 @@
"Literate Agda": 478,
"Lua": 724,
"XSLT": 44,
"Zimpl": 123,
"Groovy": 93,
"Ioke": 2,
"Jade": 3,
@@ -66426,6 +67113,7 @@
"RDoc": 279,
"AppleScript": 1862,
"Ox": 1006,
"STON": 100,
"Scilab": 69,
"Dart": 74,
"Nu": 116,
@@ -66446,15 +67134,18 @@
"ECL": 281,
"Makefile": 50,
"Haskell": 302,
"Slim": 77,
"Zephir": 1026,
"INI": 27,
"OCaml": 382,
"VCL": 545,
"Smalltalk": 423,
"Parrot Assembly": 6,
"Protocol Buffer": 63,
"SQL": 1485,
"Nemerle": 17,
"Bluespec": 1298,
"Swift": 1128,
"SourcePawn": 2080,
"Propeller Spin": 13519,
"Cirru": 244,
@@ -66493,7 +67184,7 @@
"PAWN": 3263,
"Ruby": 3862,
"C": 59053,
"Standard ML": 6405,
"Standard ML": 6567,
"Logos": 93,
"Omgrofl": 57,
"Opa": 28,
@@ -66562,6 +67253,7 @@
"Org": 1,
"Liquid": 2,
"UnrealScript": 2,
"Component Pascal": 2,
"PogoScript": 1,
"Creole": 1,
"Processing": 1,
@@ -66583,6 +67275,7 @@
"Literate Agda": 1,
"Lua": 3,
"XSLT": 1,
"Zimpl": 1,
"Groovy": 5,
"Ioke": 1,
"Jade": 1,
@@ -66611,6 +67304,7 @@
"RDoc": 1,
"AppleScript": 7,
"Ox": 3,
"STON": 7,
"Scilab": 3,
"Dart": 1,
"Nu": 2,
@@ -66631,15 +67325,18 @@
"ECL": 1,
"Makefile": 2,
"Haskell": 3,
"Slim": 1,
"Zephir": 2,
"INI": 2,
"OCaml": 2,
"VCL": 2,
"Smalltalk": 3,
"Parrot Assembly": 1,
"Protocol Buffer": 1,
"SQL": 5,
"Nemerle": 1,
"Bluespec": 2,
"Swift": 43,
"SourcePawn": 1,
"Propeller Spin": 10,
"Cirru": 9,
@@ -66678,12 +67375,12 @@
"PAWN": 1,
"Ruby": 17,
"C": 29,
"Standard ML": 4,
"Standard ML": 5,
"Logos": 1,
"Omgrofl": 1,
"Opa": 2,
"Python": 9,
"Handlebars": 2
},
"md5": "85749fdea0f92c3c66d8ba4a1ae8f2fe"
"md5": "3fc25c40c0a47403ae658430346b2559"
}

8
lib/linguist/vendor.yml
View File

@@ -168,6 +168,9 @@
- (^|/)extjs/src/
- (^|/)extjs/welcome/
# Html5shiv
- (^|/)html5shiv(\.min)?\.js$
# Samples folders
- ^[Ss]amples/
@@ -196,3 +199,8 @@
# Mercury --use-subdirs
- Mercury/
# R packages
- ^vignettes/
- ^inst/extdata/

2
lib/linguist/version.rb
View File

@@ -1,3 +1,3 @@
module Linguist
VERSION = "2.11.1"
VERSION = "2.12.0"
end