Merge branch 'master' into 817

Conflicts:
	lib/linguist/samples.json

lib/linguist/languages.yml

@@ -10,6 +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
+# 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
@@ -22,7 +23,7 @@
 # Any additions or modifications (even trivial) should have corresponding
 # test change in `test/test_blob.rb`.
 #
-# Please keep this list alphabetized.
+# Please keep this list alphabetized. Capitalization comes before lower case.
 
 ABAP:
   type: programming
@@ -52,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
@@ -89,6 +102,10 @@ AppleScript:
   aliases:
   - osascript
   primary_extension: .applescript
+  extensions:
+  - .scpt
+  interpreters:
+  - osascript
 
 Arc:
   type: programming
@@ -102,6 +119,22 @@ Arduino:
   lexer: C++
   primary_extension: .ino
 
+AsciiDoc:
+  type: prose
+  lexer: Text only
+  ace_mode: asciidoc
+  wrap: true
+  primary_extension: .asciidoc
+  extensions:
+  - .adoc
+  - .asc
+
+AspectJ:
+  type: programming
+  lexer: AspectJ
+  color: "#1957b0"
+  primary_extension: .aj
+
 Assembly:
   type: programming
   lexer: NASM
@@ -141,6 +174,11 @@ Awk:
   - .gawk
   - .mawk
   - .nawk
+  interpreters:
+  - awk
+  - gawk
+  - mawk
+  - nawk
 
 Batchfile:
   type: programming
@@ -196,6 +234,7 @@ C:
   color: "#555"
   primary_extension: .c
   extensions:
+  - .cats
   - .w
 
 C#:
@@ -207,6 +246,7 @@ C#:
   - csharp
   primary_extension: .cs
   extensions:
+  - .cshtml
   - .csx
 
 C++:
@@ -220,6 +260,7 @@ C++:
   extensions:
   - .C
   - .c++
+  - .cc
   - .cxx
   - .H
   - .h++
@@ -265,7 +306,7 @@ COBOL:
 
 CSS:
   ace_mode: css
-  color: "#1f085e"
+  color: "#563d7c"
   primary_extension: .css
 
 Ceylon:
@@ -277,6 +318,16 @@ ChucK:
   lexer: Java
   primary_extension: .ck
 
+Cirru:
+  type: programming
+  color: "#aaaaff"
+  primary_extension: .cirru
+  # ace_mode: cirru
+  # lexer: Cirru
+  lexer: Text only
+  extensions:
+  - .cr
+
 Clean:
   type: programming
   color: "#3a81ad"
@@ -297,6 +348,7 @@ Clojure:
   - .cljscm
   - .cljx
   - .hic
+  - .cljs.hl
   filenames:
   - riemann.config
 
@@ -314,6 +366,8 @@ CoffeeScript:
   - .iced
   filenames:
   - Cakefile
+  interpreters:
+  - coffee
 
 ColdFusion:
   type: programming
@@ -339,6 +393,12 @@ Common Lisp:
   - .lsp
   - .ny
   - .podsl
+  interpreters:
+  - lisp
+  - sbcl
+  - ccl
+  - clisp
+  - ecl
 
 Coq:
   type: programming
@@ -352,6 +412,18 @@ Cpp-ObjDump:
   - .c++objdump
   - .cxx-objdump
 
+Creole:
+  type: prose
+  lexer: Text only
+  wrap: true
+  primary_extension: .creole
+
+Crystal:
+  type: programming
+  lexer: Ruby
+  primary_extension: .cr
+  ace_mode: ruby
+
 Cucumber:
   lexer: Gherkin
   primary_extension: .feature
@@ -432,6 +504,9 @@ Dylan:
   type: programming
   color: "#3ebc27"
   primary_extension: .dylan
+  extensions:
+  - .intr
+  - .lid
 
 Ecere Projects:
   type: data
@@ -497,6 +572,14 @@ F#:
   - .fsi
   - .fsx
 
+FLUX:
+  type: programming
+  color: "#33CCFF"
+  primary_extension: .fx
+  lexer: Text only
+  extensions:
+  - .flux
+
 FORTRAN:
   type: programming
   lexer: Fortran
@@ -535,7 +618,7 @@ Fancy:
   - .fancypack
   filenames:
   - Fakefile
-
+  
 Fantom:
   type: programming
   color: "#dbded5"
@@ -549,6 +632,11 @@ Forth:
   extensions:
   - .4th
 
+Game Maker Language:
+  type: programming
+  lexer: JavaScript
+  primary_extension: .gml
+
 GAS:
   type: programming
   group: Assembly
@@ -596,6 +684,17 @@ 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"
@@ -622,6 +721,8 @@ Groovy:
   ace_mode: groovy
   color: "#e69f56"
   primary_extension: .groovy
+  interpreters:
+  - groovy
 
 Groovy Server Pages:
   group: Groovy
@@ -639,6 +740,7 @@ HTML:
   extensions:
   - .htm
   - .xhtml
+  - .html.hl
 
 HTML+Django:
   type: markup
@@ -687,6 +789,12 @@ Handlebars:
   - .html.handlebars
   - .html.hbs
 
+Harbour:
+  type: programming
+  lexer: Text only
+  color: "#0e60e3"
+  primary_extension: .hb
+
 Haskell:
   type: programming
   color: "#29b544"
@@ -702,6 +810,19 @@ Haxe:
   extensions:
   - .hxsl
 
+Hy:
+  type: programming
+  lexer: Clojure
+  ace_mode: clojure
+  color: "#7891b1"
+  primary_extension: .hy
+
+IDL:
+  type: programming
+  lexer: Text only
+  color: "#e3592c"
+  primary_extension: .pro
+
 INI:
   type: data
   extensions:
@@ -760,8 +881,21 @@ JSON:
   - .sublime-settings
   - .sublime-workspace
   filenames:
+  - .jshintrc
   - composer.lock
 
+JSON5:
+  type: data
+  lexer: JavaScript
+  primary_extension: .json5
+
+JSONLD:
+  type: data
+  group: JavaScript
+  ace_mode: json
+  lexer: JavaScript
+  primary_extension: .jsonld
+
 Jade:
   group: HTML
   type: markup
@@ -784,7 +918,7 @@ Java Server Pages:
 JavaScript:
   type: programming
   ace_mode: javascript
-  color: "#f15501"
+  color: "#f7df1e"
   aliases:
   - js
   - node
@@ -792,16 +926,20 @@ JavaScript:
   extensions:
   - ._js
   - .bones
+  - .es6
   - .jake
   - .jsfl
   - .jsm
   - .jss
   - .jsx
+  - .njs
   - .pac
   - .sjs
   - .ssjs
   filenames:
   - Jakefile
+  interpreters:
+  - node
 
 Julia:
   type: programming
@@ -890,10 +1028,6 @@ LiveScript:
 Logos:
   type: programming
   primary_extension: .xm
-  extensions:
-  - .x
-  - .xi
-  - .xmi
 
 Logtalk:
   type: programming
@@ -909,6 +1043,8 @@ Lua:
   extensions:
   - .nse
   - .rbxs
+  interpreters:
+  - lua
 
 M:
   type: programming
@@ -930,6 +1066,8 @@ Makefile:
   - makefile
   - Makefile
   - GNUmakefile
+  interpreters:
+  - make
 
 Mako:
   primary_extension: .mako
@@ -937,7 +1075,7 @@ Mako:
   - .mao
 
 Markdown:
-  type: markup
+  type: prose
   lexer: Text only
   ace_mode: markdown
   wrap: true
@@ -948,6 +1086,18 @@ 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"
@@ -968,6 +1118,12 @@ Max:
   - .mxt
   - .pat
 
+MediaWiki:
+  type: prose
+  lexer: Text only
+  wrap: true
+  primary_extension: .mediawiki
+
 MiniD: # Legacy
   searchable: false
   primary_extension: .minid # Dummy extension
@@ -1049,6 +1205,7 @@ OCaml:
   primary_extension: .ml
   extensions:
   - .eliomi
+  - .ml4
   - .mli
   - .mll
   - .mly
@@ -1103,12 +1260,24 @@ OpenEdge ABL:
   - abl
   primary_extension: .p
 
+Org:
+  type: prose
+  lexer: Text only
+  wrap: true
+  primary_extension: .org
+
 Oxygene:
   type: programming
   lexer: Text only
   color: "#5a63a3"
   primary_extension: .oxygene
 
+PAWN:
+  type: programming
+  lexer: C++
+  color: "#dbb284"
+  primary_extension: .pwn
+
 PHP:
   type: programming
   ace_mode: php
@@ -1162,13 +1331,27 @@ Perl:
   primary_extension: .pl
   extensions:
   - .PL
-  - .nqp
   - .perl
   - .ph
   - .plx
-  - .pm6
+  - .pm
   - .pod
   - .psgi
+  interpreters:
+  - perl
+
+Perl6:
+  type: programming
+  color: "#0298c3"
+  primary_extension: .p6
+  extensions:
+  - .6pl
+  - .6pm
+  - .nqp
+  - .p6l
+  - .p6m
+  - .pl6
+  - .pm6
 
 Pike:
   type: programming
@@ -1178,12 +1361,25 @@ Pike:
   extensions:
   - .pmod
 
+Pod:
+  type: prose
+  lexer: Text only
+  ace_mode: perl
+  wrap: true
+  primary_extension: .pod
+
 PogoScript:
   type: programming
   color: "#d80074"
   lexer: Text only
   primary_extension: .pogo
 
+PostScript:
+  type: markup
+  primary_extension: .ps
+  extensions:
+  - .eps
+
 PowerShell:
   type: programming
   ace_mode: powershell
@@ -1205,7 +1401,8 @@ Prolog:
   color: "#74283c"
   primary_extension: .prolog
   extensions:
-  - .pro
+  - .ecl
+  - .pl
 
 Protocol Buffer:
   type: markup
@@ -1236,12 +1433,17 @@ Python:
   primary_extension: .py
   extensions:
   - .gyp
+  - .lmi
   - .pyt
   - .pyw
   - .wsgi
   - .xpy
   filenames:
   - wscript
+  - SConstruct
+  - SConscript
+  interpreters:
+  - python
 
 Python traceback:
   type: data
@@ -1259,11 +1461,23 @@ R:
   type: programming
   color: "#198ce7"
   lexer: S
+  aliases:
+  - R
   primary_extension: .r
   extensions:
   - .R
+  - .rsx
   filenames:
   - .Rprofile
+  interpreters:
+  - Rscript
+
+RDoc:
+  type: prose
+  lexer: Text only
+  ace_mode: rdoc
+  wrap: true
+  primary_extension: .rdoc
 
 REALbasic:
   type: programming
@@ -1281,6 +1495,15 @@ RHTML:
   group: HTML
   primary_extension: .rhtml
 
+RMarkdown:
+  type: prose
+  lexer: Text only
+  wrap: true
+  ace_mode: markdown
+  primary_extension: .rmd
+  extensions:
+  - .Rmd
+
 Racket:
   type: programming
   lexer: Racket
@@ -1351,10 +1574,13 @@ Ruby:
   - .ru
   - .thor
   - .watchr
+  interpreters:
+  - ruby
   filenames:
   - Appraisals
   - Berksfile
   - Gemfile
+  - Gemfile.lock
   - Guardfile
   - Podfile
   - Thorfile
@@ -1393,6 +1619,8 @@ Scala:
   ace_mode: scala
   color: "#7dd3b0"
   primary_extension: .scala
+  extensions:
+  - .sc
 
 Scaml:
   group: HTML
@@ -1404,8 +1632,14 @@ Scheme:
   color: "#1e4aec"
   primary_extension: .scm
   extensions:
+  - .sld
   - .sls
   - .ss
+  interpreters:
+  - guile
+  - racket
+  - bigloo
+  - chicken
 
 Scilab:
   type: programming
@@ -1430,9 +1664,19 @@ Shell:
   extensions:
   - .bats
   - .tmux
+  interpreters:
+  - bash
+  - sh
+  - zsh
   filenames:
   - Dockerfile
 
+Shen:
+  type: programming
+  color: "#120F14"
+  lexer: Text only
+  primary_extension: .shen
+
 Slash:
   type: programming
   color: "#007eff"
@@ -1457,12 +1701,29 @@ Standard ML:
   aliases:
   - sml
   primary_extension: .sml
+  extensions:
+  - .fun
+
+Stylus:
+  type: markup
+  group: CSS
+  lexer: Text only
+  primary_extension: .styl
 
 SuperCollider:
   type: programming
   color: "#46390b"
   lexer: Text only
-  primary_extension: .sc
+  primary_extension: .scd
+
+SystemVerilog:
+  type: programming
+  color: "#343761"
+  lexer: systemverilog
+  primary_extension: .sv
+  extensions:
+  - .svh
+  - .vh
 
 TOML:
   type: data
@@ -1479,6 +1740,7 @@ Tcl:
   primary_extension: .tcl
   extensions:
   - .adp
+  - .tm
 
 Tcsh:
   type: programming
@@ -1491,12 +1753,14 @@ TeX:
   type: markup
   color: "#3D6117"
   ace_mode: latex
+  wrap: true
   aliases:
   - latex
   primary_extension: .tex
   extensions:
   - .aux
   - .bib
+  - .cls
   - .dtx
   - .ins
   - .ltx
@@ -1511,7 +1775,7 @@ Tea:
   primary_extension: .tea
 
 Textile:
-  type: markup
+  type: prose
   lexer: Text only
   ace_mode: textile
   wrap: true
@@ -1603,6 +1867,7 @@ Visual Basic:
   - .frm
   - .frx
   - .vba
+  - .vbhtml
   - .vbs
 
 Volt:
@@ -1638,6 +1903,7 @@ XML:
   - .kml
   - .launch
   - .mxml
+  - .osm
   - .plist
   - .pluginspec
   - .ps1xml
@@ -1754,7 +2020,7 @@ ooc:
   primary_extension: .ooc
 
 reStructuredText:
-  type: markup
+  type: prose
   wrap: true
   search_term: rst
   aliases: