github-linguist 2.10.11 → 2.10.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 537dd46b5a61f2c1de7196d194831fd46e37caa6
-  data.tar.gz: f5cd8f1e4d4e5d486d147abc669765b7b3d0ea23
+  metadata.gz: 2324e00de537bf3708a60993acc9a72fea4c6159
+  data.tar.gz: 9e2661678cd5e522919a670efd85964122994cc9
 SHA512:
-  metadata.gz: 4354ff6fc7a7c146df4c6d76657dd677e51d674ab6a09a09a5287a1e1a010655a135e4db0243ae680a1a6a24400826aade8d3c8cb22423f9d7d3bc7639dd6177
-  data.tar.gz: 65e0f8f5d339c7a7ecb3f49a7fd80a500d69b2d23857c01fba02a49dce17945b3e3e1ecaf5cff0b289287dc01e4abfd3863e4d4880968609a279b999018eefb3
+  metadata.gz: c21cfe49455341e978b0affa0a21cc9b9cc224739bd7e75cb5585f82a118954941938e8f2df13e11a819b7e4382aab72cca5120cfcfd3b6cc8a4b48d752a89a1
+  data.tar.gz: 988d9d6ce258bdf4598e647a87dd129123b01b4bd5e5099ca4ecf0ed824a237c620dfc4658938c3562ed126cedce7ff0732ee03184ff0972a0564bdde953d893

data/lib/linguist/generated.rb

@@ -62,7 +62,8 @@ module Linguist
         generated_protocol_buffer? ||
         generated_jni_header? ||
         composer_lock? ||
-        node_modules?
+        node_modules? ||
+        vcr_cassette?
     end
 
     # Internal: Is the blob an XCode project file?
@@ -235,5 +236,15 @@ module Linguist
     def composer_lock?
       !!name.match(/composer.lock/)
     end
+
+    # Is the blob a VCR Cassette file?
+    #
+    # Returns true or false
+    def vcr_cassette?
+      return false unless extname == '.yml'
+      return false unless lines.count > 2
+      # VCR Cassettes have "recorded_with: VCR" in the second last line.
+      return lines[-2].include?("recorded_with: VCR")
+    end
   end
 end

data/lib/linguist/heuristics.rb

@@ -19,9 +19,18 @@ module Linguist
         if languages.all? { |l| ["Perl", "Prolog"].include?(l) }
           disambiguate_pl(data, languages)
         end
+        if languages.all? { |l| ["ECL", "Prolog"].include?(l) }
+          disambiguate_ecl(data, languages)
+        end
         if languages.all? { |l| ["TypeScript", "XML"].include?(l) }
           disambiguate_ts(data, languages)
         end
+        if languages.all? { |l| ["Common Lisp", "OpenCL"].include?(l) }
+          disambiguate_cl(data, languages)
+        end
+        if languages.all? { |l| ["Rebol", "R"].include?(l) }
+          disambiguate_r(data, languages)
+        end
       end
     end
 
@@ -43,6 +52,13 @@ module Linguist
       matches
     end
 
+    def self.disambiguate_ecl(data, languages)
+      matches = []
+      matches << Language["Prolog"] if data.include?(":-")
+      matches << Language["ECL"] if data.include?(":=")
+      matches
+    end
+
     def self.disambiguate_ts(data, languages)
       matches = []
       if (data.include?("</translation>"))
@@ -53,6 +69,20 @@ module Linguist
       matches
     end
 
+    def self.disambiguate_cl(data, languages)
+      matches = []
+      matches << Language["Common Lisp"] if data.include?("(defun ")
+      matches << Language["OpenCL"] if /\/\* |\/\/ |^\}/.match(data)
+      matches
+    end
+
+    def self.disambiguate_r(data, languages)
+      matches = []
+      matches << Language["Rebol"] if /\bRebol\b/i.match(data)
+      matches << Language["R"] if data.include?("<-")
+      matches
+    end
+
     def self.active?
       !!ACTIVE
     end

data/lib/linguist/language.rb

@@ -426,6 +426,11 @@ module Linguist
     #
     # Returns the extensions Array
     attr_reader :filenames
+    
+    # Public: Return all possible extensions for language
+    def all_extensions
+      (extensions + [primary_extension]).uniq
+    end
 
     # Public: Get URL escaped name.
     #
@@ -485,7 +490,7 @@ module Linguist
     #
     # Returns html String
     def colorize(text, options = {})
-      lexer.highlight(text, options = {})
+      lexer.highlight(text, options)
     end
 
     # Public: Return name as String representation

data/lib/linguist/languages.yml

@@ -10,7 +10,7 @@
 # ace_mode          - A String name of Ace Mode (if available)
 # wrap              - Boolean wrap to enable line wrapping (default: false)
 # extension         - An Array of associated extensions
-# interpreter       - An Array of associated interpreters
+# interpreters      - An Array of associated interpreters
 # primary_extension - A String for the main extension associated with
 #                     the language. Must be unique. Used when a Language is picked
 #                     from a dropdown and we need to automatically choose an
@@ -53,6 +53,18 @@ ASP:
   - .aspx
   - .axd
 
+ATS:
+  type: programming
+  color: "#1ac620"
+  primary_extension: .dats
+  lexer: OCaml
+  aliases:
+  - ats2
+  extensions:
+  - .atxt
+  - .hats
+  - .sats
+
 ActionScript:
   type: programming
   lexer: ActionScript 3
@@ -74,6 +86,12 @@ Agda:
   color: "#467C91"
   primary_extension: .agda
 
+Alloy:
+  type: programming  # 'modeling' would be more appropiate
+  lexer: Text only
+  color: "#cc5c24"
+  primary_extension: .als
+
 ApacheConf:
   type: markup
   aliases:
@@ -92,6 +110,8 @@ AppleScript:
   primary_extension: .applescript
   extensions:
   - .scpt
+  interpreters:
+  - osascript
 
 Arc:
   type: programming
@@ -115,6 +135,12 @@ AsciiDoc:
   - .adoc
   - .asc
 
+AspectJ:
+  type: programming
+  lexer: AspectJ
+  color: "#1957b0"
+  primary_extension: .aj
+
 Assembly:
   type: programming
   lexer: NASM
@@ -214,6 +240,7 @@ C:
   color: "#555"
   primary_extension: .c
   extensions:
+  - .cats
   - .w
 
 C#:
@@ -239,12 +266,14 @@ C++:
   extensions:
   - .C
   - .c++
+  - .cc
   - .cxx
   - .H
   - .h++
   - .hh
   - .hpp
   - .hxx
+  - .inl
   - .tcc
   - .tpp
 
@@ -284,7 +313,7 @@ COBOL:
 
 CSS:
   ace_mode: css
-  color: "#1f085e"
+  color: "#563d7c"
   primary_extension: .css
 
 Ceylon:
@@ -296,6 +325,14 @@ ChucK:
   lexer: Java
   primary_extension: .ck
 
+Cirru:
+  type: programming
+  color: "#aaaaff"
+  primary_extension: .cirru
+  # ace_mode: cirru
+  # lexer: Cirru
+  lexer: Text only
+
 Clean:
   type: programming
   color: "#3a81ad"
@@ -316,6 +353,7 @@ Clojure:
   - .cljscm
   - .cljx
   - .hic
+  - .cljs.hl
   filenames:
   - riemann.config
 
@@ -333,6 +371,8 @@ CoffeeScript:
   - .iced
   filenames:
   - Cakefile
+  interpreters:
+  - coffee
 
 ColdFusion:
   type: programming
@@ -459,10 +499,25 @@ DCPU-16 ASM:
 Diff:
   primary_extension: .diff
 
+Dogescript:
+  type: programming
+  lexer: Text only
+  color: "#cca760"
+  primary_extension: .djs
+
 Dylan:
   type: programming
   color: "#3ebc27"
   primary_extension: .dylan
+  extensions:
+  - .intr
+  - .lid
+
+E:
+  type: programming
+  color: "#ccce35"
+  lexer: Text only
+  primary_extension: .E
 
 Ecere Projects:
   type: data
@@ -478,6 +533,14 @@ ECL:
   extensions:
   - .eclxml
 
+Eagle:
+  type: markup
+  color: "#3994bc"
+  lexer: XML
+  primary_extension: .sch
+  extensions:
+  - .brd
+
 Eiffel:
   type: programming
   lexer: Text only
@@ -528,6 +591,14 @@ F#:
   - .fsi
   - .fsx
 
+FLUX:
+  type: programming
+  color: "#33CCFF"
+  primary_extension: .fx
+  lexer: Text only
+  extensions:
+  - .flux
+
 FORTRAN:
   type: programming
   lexer: Fortran
@@ -580,6 +651,27 @@ Forth:
   extensions:
   - .4th
 
+Frege:
+  type: programming
+  color: "#00cafe"
+  lexer: Haskell
+  primary_extension: .fr
+
+Game Maker Language:
+  type: programming
+  lexer: JavaScript
+  primary_extension: .gml
+
+GAP:
+  type: programming
+  lexer: Text only
+  primary_extension: .g
+  extensions:
+  - .g
+  - .gap
+  - .gd
+  - .gi
+
 GAS:
   type: programming
   group: Assembly
@@ -594,10 +686,13 @@ GLSL:
   extensions:
   - .fp
   - .frag
+  - .fshader
   - .geom
   - .glslv
+  - .gshader
   - .shader
   - .vert
+  - .vshader
 
 Genshi:
   primary_extension: .kid
@@ -627,9 +722,20 @@ Glyph:
   lexer: Tcl
   primary_extension: .glf
 
+Gnuplot:
+  type: programming
+  color: "#f0a9f0"
+  lexer: Gnuplot
+  primary_extension: .gp
+  extensions:
+  - .gnu
+  - .gnuplot
+  - .plot
+  - .plt
+
 Go:
   type: programming
-  color: "#a89b4d"
+  color: "#375eab"
   primary_extension: .go
 
 Gosu:
@@ -637,6 +743,16 @@ Gosu:
   color: "#82937f"
   primary_extension: .gs
 
+Grammatical Framework:
+  type: programming
+  lexer: Haskell
+  aliases:
+  - gf
+  wrap: false
+  primary_extension: .gf
+  searchable: true
+  color: "#ff0000"
+
 Groff:
   primary_extension: .man
   extensions:
@@ -653,6 +769,8 @@ Groovy:
   ace_mode: groovy
   color: "#e69f56"
   primary_extension: .groovy
+  interpreters:
+  - groovy
 
 Groovy Server Pages:
   group: Groovy
@@ -670,6 +788,7 @@ HTML:
   extensions:
   - .htm
   - .xhtml
+  - .html.hl
 
 HTML+Django:
   type: markup
@@ -723,7 +842,7 @@ Harbour:
   lexer: Text only
   color: "#0e60e3"
   primary_extension: .hb
- 
+
 Haskell:
   type: programming
   color: "#29b544"
@@ -759,6 +878,10 @@ INI:
   - .prefs
   - .properties
   primary_extension: .ini
+  
+Inno Setup:
+  primary_extension: .iss
+  lexer: Text only
 
 Idris:
   type: programming
@@ -767,6 +890,14 @@ Idris:
   extensions:
   - .lidr
 
+Inform 7:
+  type: programming
+  lexer: Text only
+  wrap: true
+  primary_extension: .ni
+  extensions:
+  - .i7x
+
 Inno Setup:
   primary_extension: .iss
   lexer: Text only
@@ -818,6 +949,19 @@ JSON5:
   lexer: JavaScript
   primary_extension: .json5
 
+JSONLD:
+  type: data
+  group: JavaScript
+  ace_mode: json
+  lexer: JavaScript
+  primary_extension: .jsonld
+
+JSONiq:
+  type: programming
+  ace_mode: jsoniq
+  lexer: XQuery
+  primary_extension: .jq
+
 Jade:
   group: HTML
   type: markup
@@ -840,7 +984,7 @@ Java Server Pages:
 JavaScript:
   type: programming
   ace_mode: javascript
-  color: "#f15501"
+  color: "#f7df1e"
   aliases:
   - js
   - node
@@ -848,6 +992,7 @@ JavaScript:
   extensions:
   - ._js
   - .bones
+  - .es6
   - .jake
   - .jsfl
   - .jsm
@@ -859,6 +1004,8 @@ JavaScript:
   - .ssjs
   filenames:
   - Jakefile
+  interpreters:
+  - node
 
 Julia:
   type: programming
@@ -870,6 +1017,12 @@ KRL:
   type: programming
   color: "#f5c800"
   primary_extension: .krl
+  
+Kit:
+  type: markup
+  lexer: HTML
+  ace_mode: html
+  primary_extension: .kit
 
 Kotlin:
   type: programming
@@ -894,6 +1047,13 @@ Lasso:
   color: "#2584c3"
   primary_extension: .lasso
 
+Latte:
+  type: markup
+  color: "#A8FF97"
+  group: HTML
+  lexer: Smarty
+  primary_extension: .latte
+
 Less:
   type: markup
   group: CSS
@@ -974,6 +1134,12 @@ M:
   extensions:
   - .m
 
+MTML:
+  type: markup
+  lexer: HTML
+  color: "#0095d9"
+  primary_extension: .mtml
+
 Makefile:
   aliases:
   - make
@@ -1005,10 +1171,24 @@ Markdown:
   - .mkdown
   - .ron
 
+Mask:
+  type: markup
+  lexer: SCSS
+  color: "#f97732"
+  ace_mode: scss
+  primary_extension: .mask
+
+Mathematica:
+  type: programming
+  primary_extension: .mathematica
+  lexer: Text only
+
 Matlab:
   type: programming
   color: "#bb92ac"
   primary_extension: .matlab
+  extensions:
+  - .m
 
 Max:
   type: programming
@@ -1031,6 +1211,19 @@ MediaWiki:
   wrap: true
   primary_extension: .mediawiki
 
+Mercury:
+  type: programming
+  # This is the background colour on the web page.
+  color: "#abcdef"
+  # The primary extension is .m, but lingist won't accept duplicates
+  primary_extension: .mercury
+  # Mercury's syntax is not prolog syntax, but they do share the lexer
+  lexer: Prolog
+  ace_mode: prolog
+  extensions:
+  - .m
+  - .moo
+
 MiniD: # Legacy
   searchable: false
   primary_extension: .minid # Dummy extension
@@ -1052,6 +1245,7 @@ Monkey:
   primary_extension: .monkey
 
 Moocode:
+  type: programming
   lexer: MOOCode
   primary_extension: .moo
 
@@ -1129,8 +1323,14 @@ Objective-C:
   - obj-c
   - objc
   primary_extension: .m
-  extensions:
-  - .mm
+
+Objective-C++:
+  type: programming
+  color: "#4886FC"
+  aliases:
+  - obj-c++
+  - objc++
+  primary_extension: .mm
 
 Objective-J:
   type: programming
@@ -1184,7 +1384,7 @@ PAWN:
   lexer: C++
   color: "#dbb284"
   primary_extension: .pwn
-  
+
 PHP:
   type: programming
   ace_mode: php
@@ -1307,7 +1507,8 @@ Prolog:
   type: programming
   color: "#74283c"
   primary_extension: .prolog
-  extensions: 
+  extensions:
+  - .ecl
   - .pl
 
 Protocol Buffer:
@@ -1332,6 +1533,12 @@ Pure Data:
   lexer: Text only
   primary_extension: .pd
 
+PureScript:
+  type: programming
+  color: "#f3ce45"
+  lexer: Haskell
+  primary_extension: .purs
+
 Python:
   type: programming
   ace_mode: python
@@ -1372,6 +1579,7 @@ R:
   primary_extension: .r
   extensions:
   - .R
+  - .rsx
   filenames:
   - .Rprofile
   interpreters:
@@ -1434,10 +1642,12 @@ Rebol:
   type: programming
   lexer: REBOL
   color: "#358a5b"
-  primary_extension: .rebol
+  primary_extension: .reb
   extensions:
+  - .r
   - .r2
   - .r3
+  - .rebol
 
 Redcode:
   primary_extension: .cw
@@ -1484,11 +1694,14 @@ Ruby:
   filenames:
   - Appraisals
   - Berksfile
+  - Buildfile
   - Gemfile
+  - Gemfile.lock
   - Guardfile
   - Podfile
   - Thorfile
   - Vagrantfile
+  - buildfile
 
 Rust:
   type: programming
@@ -1506,6 +1719,11 @@ SQL:
   ace_mode: sql
   searchable: false
   primary_extension: .sql
+  extensions:
+  - .prc
+  - .tab
+  - .udf
+  - .viw
 
 Sage:
   type: programming
@@ -1536,6 +1754,7 @@ Scheme:
   color: "#1e4aec"
   primary_extension: .scm
   extensions:
+  - .sld
   - .sls
   - .ss
   interpreters:
@@ -1574,6 +1793,17 @@ Shell:
   filenames:
   - Dockerfile
 
+ShellSession:
+  type: programming
+  lexer: Bash Session
+  primary_extension: .sh-session
+
+Shen:
+  type: programming
+  color: "#120F14"
+  lexer: Text only
+  primary_extension: .shen
+
 Slash:
   type: programming
   color: "#007eff"
@@ -1587,6 +1817,13 @@ Smalltalk:
 Smarty:
   primary_extension: .tpl
 
+SourcePawn:
+  type: programming
+  color: "#f69e1d"
+  aliases:
+  - sourcemod
+  primary_extension: .sp
+
 Squirrel:
   type: programming
   lexer: C++
@@ -1601,6 +1838,19 @@ Standard ML:
   extensions:
   - .fun
 
+Stata:
+  type: programming
+  lexer: Text only
+  extensions:
+  - .ado
+  - .do
+  - .doh
+  - .ihlp
+  - .mata
+  - .matah
+  - .sthlp
+  primary_extension: .do
+
 Stylus:
   type: markup
   group: CSS
@@ -1613,6 +1863,15 @@ SuperCollider:
   lexer: Text only
   primary_extension: .scd
 
+SystemVerilog:
+  type: programming
+  color: "#343761"
+  lexer: systemverilog
+  primary_extension: .sv
+  extensions:
+  - .svh
+  - .vh
+
 TOML:
   type: data
   primary_extension: .toml
@@ -1628,6 +1887,7 @@ Tcl:
   primary_extension: .tcl
   extensions:
   - .adp
+  - .tm
 
 Tcsh:
   type: programming
@@ -1790,6 +2050,7 @@ XML:
   - .kml
   - .launch
   - .mxml
+  - .osm
   - .plist
   - .pluginspec
   - .ps1xml
@@ -1870,6 +2131,12 @@ YAML:
   - .rviz
   - .yaml
 
+Zephir:
+  type: programming
+  lexer: PHP
+  color: "#118f9e"
+  primary_extension: .zep
+
 eC:
   type: programming
   search_term: ec