github-linguist 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48454a64d8649b5a804aea5b6c3586c78e7c5fd5
-  data.tar.gz: b0e7bd7939035857f1d4dd88cccb35f52bf001b6
+  metadata.gz: 9ec2a6affd87821c6b5e7a2c5c8361b8e9eaac48
+  data.tar.gz: 5ae6ac96676621df9795f9820694c55c839a0bec
 SHA512:
-  metadata.gz: 0aacfee60a671fec51a9fb237670b20fdbe13df523f5f65993f5eb9861d3770899afab863eec2ab58dd4a1d9530063280962c97f921c0fab8830a75a85fa24d9
-  data.tar.gz: 76a4869a8288a452b1214a1a1975d5e275f57613732f715c2924e9bad0bf0e288eadbf07898369b77ff31f96aa6b9b3a0dce956f29c452fca78507636584fad2
+  metadata.gz: 8f9e2b765abdeb0a6e232c1b0b25c513ba32a2413381b55511a69c20a64ba716ca3fb13e75bfe3159b15d453bed1abb8c04af20e1d8c81fa843b69f69fb67742
+  data.tar.gz: 7399235cf6a420105c29b814075b8647a69c23f705247ff02939b45f84a7f7843aea90aeb3666640bfce228e02bd8da6283386efe1cad264f6180eae389c3965

data/lib/linguist/blob_helper.rb

@@ -321,6 +321,11 @@ module Linguist
       language ? language.lexer : Pygments::Lexer.find_by_name('Text only')
     end
 
+    # Internal: Get the TextMate compatible scope for the blob
+    def tm_scope
+      language && language.tm_scope
+    end
+
     # Public: Highlight syntax of blob
     #
     # options - A Hash of options (defaults to {})

data/lib/linguist/heuristics.rb

@@ -19,6 +19,9 @@ module Linguist
         if languages.all? { |l| ["ECL", "Prolog"].include?(l) }
           result = disambiguate_ecl(data, languages)
         end
+        if languages.all? { |l| ["IDL", "Prolog"].include?(l) }
+          result = disambiguate_pro(data, languages)
+        end
         if languages.all? { |l| ["Common Lisp", "OpenCL"].include?(l) }
           result = disambiguate_cl(data, languages)
         end
@@ -51,6 +54,16 @@ module Linguist
       matches
     end
 
+    def self.disambiguate_pro(data, languages)
+      matches = []
+      if (data.include?(":-"))
+        matches << Language["Prolog"]
+      else
+        matches << Language["IDL"]
+      end
+      matches
+    end
+
     def self.disambiguate_ts(data, languages)
       matches = []
       if (data.include?("</translation>"))

data/lib/linguist/language.rb

@@ -290,6 +290,16 @@ module Linguist
       @lexer = Pygments::Lexer.find_by_name(attributes[:lexer] || name) ||
         raise(ArgumentError, "#{@name} is missing lexer")
 
+      @tm_scope = attributes[:tm_scope] || begin
+        context = case @type
+                  when :data, :markup, :prose
+                    'text'
+                  when :programming, nil
+                    'source'
+                  end
+        "#{context}.#{@name.downcase}"
+      end
+
       @ace_mode = attributes[:ace_mode]
       @wrap = attributes[:wrap] || false
 
@@ -363,6 +373,11 @@ module Linguist
     # Returns the Lexer
     attr_reader :lexer
 
+    # Public: Get the name of a TextMate-compatible scope
+    #
+    # Returns the scope
+    attr_reader :tm_scope
+
     # Public: Get Ace mode
     #
     # Examples
@@ -564,6 +579,7 @@ module Linguist
       :type              => options['type'],
       :aliases           => options['aliases'],
       :lexer             => options['lexer'],
+      :tm_scope          => options['tm_scope'],
       :ace_mode          => options['ace_mode'],
       :wrap              => options['wrap'],
       :group_name        => options['group'],

data/lib/linguist/languages.yml

@@ -83,6 +83,7 @@ ATS:
 ActionScript:
   type: programming
   lexer: ActionScript 3
+  tm_scope: source.actionscript.3
   color: "#e3491a"
   search_term: as3
   aliases:
@@ -282,6 +283,7 @@ C:
 C#:
   type: programming
   ace_mode: csharp
+  tm_scope: source.cs
   search_term: csharp
   color: "#178600"
   aliases:
@@ -411,6 +413,7 @@ Clojure:
 
 CoffeeScript:
   type: programming
+  tm_scope: source.coffee
   ace_mode: coffee
   color: "#244776"
   aliases:
@@ -453,6 +456,7 @@ ColdFusion CFC:
 
 Common Lisp:
   type: programming
+  tm_scope: source.lisp
   color: "#3fb68b"
   aliases:
   - lisp
@@ -648,6 +652,7 @@ Elm:
 Emacs Lisp:
   type: programming
   lexer: Common Lisp
+  tm_scope: source.lisp
   color: "#c065db"
   aliases:
   - elisp
@@ -932,6 +937,7 @@ Groovy Server Pages:
 
 HTML:
   type: markup
+  tm_scope: text.html.basic
   ace_mode: html
   aliases:
   - xhtml
@@ -1158,6 +1164,7 @@ Java Server Pages:
 
 JavaScript:
   type: programming
+  tm_scope: source.js
   ace_mode: javascript
   color: "#f1e05a"
   aliases:
@@ -1569,6 +1576,7 @@ ObjDump:
 
 Objective-C:
   type: programming
+  tm_scope: source.objc
   color: "#438eff"
   aliases:
   - obj-c
@@ -1669,6 +1677,7 @@ PAWN:
 
 PHP:
   type: programming
+  tm_scope: text.html.php
   ace_mode: php
   color: "#4F5D95"
   extensions:
@@ -1820,6 +1829,7 @@ Prolog:
   extensions:
   - .pl
   - .ecl
+  - .pro
   - .prolog
 
 Propeller Spin:
@@ -2089,6 +2099,7 @@ SQF:
 
 SQL:
   type: data
+  tm_scope: source.sql
   ace_mode: sql
   extensions:
   - .sql

data/lib/linguist/samples.json

@@ -95,6 +95,10 @@
     "Cirru": [
       ".cirru"
     ],
+    "Clean": [
+      ".dcl",
+      ".icl"
+    ],
     "Clojure": [
       ".cl2",
       ".clj",
@@ -871,8 +875,8 @@
       "exception.zep.php"
     ]
   },
-  "tokens_total": 663251,
-  "languages_total": 927,
+  "tokens_total": 664804,
+  "languages_total": 936,
   "tokens": {
     "ABAP": {
       "*/**": 1,
@@ -15573,20 +15577,19 @@
       "backdrop.fade.in": 1
     },
     "Ceylon": {
-      "doc": 2,
       "by": 1,
+      "(": 5,
+      ")": 5,
       "shared": 5,
       "void": 1,
       "test": 1,
-      "(": 4,
-      ")": 4,
       "{": 3,
       "print": 1,
       ";": 4,
       "}": 3,
       "class": 1,
       "Test": 2,
-      "name": 4,
+      "name": 3,
       "satisfies": 1,
       "Comparable": 1,
       "<Test>": 1,
@@ -16429,6 +16432,219 @@
       "nothing": 1,
       "container": 3
     },
+    "Clean": {
+      "module": 9,
+      "fsieve": 1,
+      "import": 10,
+      "StdClass": 2,
+      ";": 1,
+      "//": 4,
+      "RWS": 1,
+      "StdInt": 2,
+      "StdReal": 1,
+      "NrOfPrimes": 3,
+      "The": 1,
+      "sieve": 1,
+      "algorithm": 1,
+      "generate": 1,
+      "an": 1,
+      "infinite": 1,
+      "list": 3,
+      "of": 3,
+      "all": 1,
+      "primes.": 1,
+      "Primes": 3,
+      "[": 93,
+      "Int": 33,
+      "]": 92,
+      "pr": 6,
+      "where": 12,
+      "Sieve": 8,
+      "-": 66,
+      "g": 10,
+      "i": 14,
+      "prs": 6,
+      "|": 48,
+      "IsPrime": 4,
+      "(": 132,
+      "toInt": 1,
+      "sqrt": 1,
+      "toReal": 1,
+      ")": 134,
+      "+": 14,
+      "Bool": 1,
+      "f": 26,
+      "r": 2,
+      "bd": 3,
+      "True": 1,
+      "rem": 2,
+      "False": 1,
+      "Select": 2,
+      "is": 1,
+      "used": 1,
+      "to": 2,
+      "get": 1,
+      "the": 3,
+      "th": 1,
+      "prime": 1,
+      "from": 1,
+      "primes": 1,
+      "generated": 1,
+      "by": 1,
+      "Primes.": 1,
+      "*/": 1,
+      "Start": 3,
+      "definition": 4,
+      "GenHylo": 2,
+      "StdGeneric": 4,
+      "GenMap": 4,
+      "Fix": 9,
+      "In": 9,
+      ".": 6,
+      "Out": 1,
+      "u": 6,
+      "v": 12,
+      "a": 55,
+      "w": 4,
+      "<=>": 1,
+      "hylo": 1,
+      "b": 7,
+      ".b": 4,
+      ".a": 11,
+      ".f": 1,
+      "gMap": 19,
+      "{": 17,
+      "*": 13,
+      "}": 17,
+      "cata": 4,
+      "ana": 1,
+      "generic": 2,
+      "derive": 4,
+      "c": 2,
+      "UNIT": 2,
+      "PAIR": 4,
+      "EITHER": 3,
+      "CONS": 4,
+      "FIELD": 4,
+      "OBJECT": 4,
+      "implementation": 3,
+      "StdArray": 1,
+      "StdFunc": 1,
+      "_Array": 1,
+      "x": 36,
+      "fx": 2,
+      "fy": 2,
+      "y": 11,
+      "fl": 3,
+      "fr": 3,
+      "LEFT": 2,
+      "RIGHT": 2,
+      "xs": 4,
+      "mapArray": 2,
+      "monadicSemantics": 1,
+      "StdEnv": 4,
+      "Op": 6,
+      "Plus": 2,
+      "Minus": 2,
+      "Times": 2,
+      "Rem": 3,
+      "Equal": 2,
+      "LessThan": 3,
+      "Var": 9,
+      "String": 1,
+      "ExpP": 3,
+      "Exp": 5,
+      "StmP": 3,
+      "Assign": 3,
+      "If": 3,
+      "While": 3,
+      "Seq": 3,
+      "Cont": 4,
+      "Stm": 2,
+      "Env": 3,
+      "Sem": 11,
+      "empty": 2,
+      "rtn": 4,
+      "e.": 4,
+      "e": 16,
+      "infixl": 4,
+      "e2": 2,
+      ".y": 1,
+      "_.": 1,
+      "read": 4,
+      "write": 3,
+      "w.": 1,
+      "if": 5,
+      "class": 1,
+      "sem": 9,
+      "operator": 8,
+      "<": 3,
+      "instance": 14,
+      "phi": 12,
+      "n": 8,
+      "op": 5,
+      "v1.": 1,
+      "return": 1,
+      "o": 6,
+      "v1": 1,
+      "s1": 4,
+      "s2": 4,
+      "stm": 2,
+      "s": 49,
+      "Here": 1,
+      "*finally*": 1,
+      "pays": 1,
+      "off": 1,
+      "D": 1,
+      "int": 2,
+      "var": 6,
+      "o2": 7,
+      "assign": 4,
+      "ifte": 1,
+      "while": 2,
+      "seq": 3,
+      "cont": 1,
+      "pEuclides": 2,
+      "fst": 1,
+      "program": 2,
+      "start": 4,
+      "_": 5,
+      "infixr": 1,
+      "stack": 2,
+      "Stack": 28,
+      "newStack": 3,
+      "push": 3,
+      "pushes": 3,
+      "pop": 4,
+      "popn": 3,
+      "top": 4,
+      "topn": 3,
+      "elements": 3,
+      "count": 3,
+      "abort": 2,
+      "drop": 1,
+      "take": 1,
+      "length": 1,
+      "streams": 2,
+      "zero": 4,
+      "Real": 28,
+      "one": 5,
+      "/": 3,
+      "X": 3,
+      "invert": 5,
+      "pow": 5,
+      "shuffle": 6,
+      "//Infinite": 1,
+      "row": 1,
+      "zeroes": 1,
+      "represented": 1,
+      "as": 1,
+      "ease": 1,
+      "computation": 1,
+      "t": 23,
+      "/s": 2,
+      "s*t": 1
+    },
     "Clojure": {
       "(": 258,
       "defn": 14,
@@ -73901,9 +74117,10 @@
     "C++": 34739,
     "COBOL": 90,
     "CSS": 43867,
-    "Ceylon": 50,
+    "Ceylon": 49,
     "Chapel": 9607,
     "Cirru": 244,
+    "Clean": 1554,
     "Clojure": 1899,
     "CoffeeScript": 2951,
     "ColdFusion": 131,
@@ -74124,6 +74341,7 @@
     "Ceylon": 1,
     "Chapel": 5,
     "Cirru": 9,
+    "Clean": 9,
     "Clojure": 8,
     "CoffeeScript": 9,
     "ColdFusion": 1,
@@ -74316,5 +74534,5 @@
     "fish": 3,
     "wisp": 1
   },
-  "md5": "9cbea8fa53a44c8c68775862cb863af7"
+  "md5": "9bf6bc418e6a2a8064041209da3a0ccd"
 }

data/lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "3.2.1"
+  VERSION = "3.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-linguist
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes