Merge branch 'master' into 920

Conflicts:
	lib/linguist/samples.json

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:
@@ -326,6 +355,7 @@ Clojure:
   - .cljscm
   - .cljx
   - .hic
+  - .cljs.hl
   filenames:
   - riemann.config
 
@@ -471,10 +501,19 @@ 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
@@ -496,6 +535,14 @@ ECL:
   extensions:
   - .eclxml
 
+Eagle:
+  type: markup
+  color: "#3994bc"
+  lexer: XML
+  primary_extension: .sch
+  extensions:
+  - .brd
+
 Eiffel:
   type: programming
   lexer: Text only
@@ -546,6 +593,14 @@ F#:
   - .fsi
   - .fsx
 
+FLUX:
+  type: programming
+  color: "#33CCFF"
+  primary_extension: .fx
+  lexer: Text only
+  extensions:
+  - .flux
+
 FORTRAN:
   type: programming
   lexer: Fortran
@@ -598,6 +653,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
@@ -645,9 +721,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:
@@ -655,6 +742,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:
@@ -690,6 +787,7 @@ HTML:
   extensions:
   - .htm
   - .xhtml
+  - .html.hl
 
 HTML+Django:
   type: markup
@@ -779,6 +877,10 @@ INI:
   - .prefs
   - .properties
   primary_extension: .ini
+  
+Inno Setup:
+  primary_extension: .iss
+  lexer: Text only
 
 Idris:
   type: programming
@@ -838,6 +940,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
@@ -860,7 +975,7 @@ Java Server Pages:
 JavaScript:
   type: programming
   ace_mode: javascript
-  color: "#f15501"
+  color: "#f7df1e"
   aliases:
   - js
   - node
@@ -880,6 +995,8 @@ JavaScript:
   - .ssjs
   filenames:
   - Jakefile
+  interpreters:
+  - node
 
 Julia:
   type: programming
@@ -891,6 +1008,12 @@ KRL:
   type: programming
   color: "#f5c800"
   primary_extension: .krl
+  
+Kit:
+  type: markup
+  lexer: HTML
+  ace_mode: html
+  primary_extension: .kit
 
 Kotlin:
   type: programming
@@ -995,6 +1118,12 @@ M:
   extensions:
   - .m
 
+MTML:
+  type: markup
+  lexer: HTML
+  color: "#0095d9"
+  primary_extension: .mtml
+
 Makefile:
   aliases:
   - make
@@ -1026,10 +1155,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
@@ -1052,6 +1195,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
@@ -1073,6 +1229,7 @@ Monkey:
   primary_extension: .monkey
 
 Moocode:
+  type: programming
   lexer: MOOCode
   primary_extension: .moo
 
@@ -1150,8 +1307,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
@@ -1329,6 +1492,7 @@ Prolog:
   color: "#74283c"
   primary_extension: .prolog
   extensions:
+  - .ecl
   - .pl
 
 Protocol Buffer:
@@ -1353,6 +1517,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
@@ -1393,6 +1563,7 @@ R:
   primary_extension: .r
   extensions:
   - .R
+  - .rsx
   filenames:
   - .Rprofile
   interpreters:
@@ -1455,10 +1626,12 @@ Rebol:
   type: programming
   lexer: REBOL
   color: "#358a5b"
-  primary_extension: .rebol
+  primary_extension: .reb
   extensions:
+  - .r
   - .r2
   - .r3
+  - .rebol
 
 Redcode:
   primary_extension: .cw
@@ -1506,6 +1679,7 @@ Ruby:
   - Appraisals
   - Berksfile
   - Gemfile
+  - Gemfile.lock
   - Guardfile
   - Podfile
   - Thorfile
@@ -1557,6 +1731,7 @@ Scheme:
   color: "#1e4aec"
   primary_extension: .scm
   extensions:
+  - .sld
   - .sls
   - .ss
   interpreters:
@@ -1595,6 +1770,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"
@@ -1608,6 +1794,13 @@ Smalltalk:
 Smarty:
   primary_extension: .tpl
 
+SourcePawn:
+  type: programming
+  color: "#f69e1d"
+  aliases:
+  - sourcemod
+  primary_extension: .sp
+
 Squirrel:
   type: programming
   lexer: C++
@@ -1622,6 +1815,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
@@ -1634,6 +1840,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
@@ -1649,6 +1864,7 @@ Tcl:
   primary_extension: .tcl
   extensions:
   - .adp
+  - .tm
 
 Tcsh:
   type: programming
@@ -1811,6 +2027,7 @@ XML:
   - .kml
   - .launch
   - .mxml
+  - .osm
   - .plist
   - .pluginspec
   - .ps1xml
@@ -1891,6 +2108,12 @@ YAML:
   - .rviz
   - .yaml
 
+Zephir:
+  type: programming
+  lexer: PHP
+  color: "#118f9e"
+  primary_extension: .zep
+
 eC:
   type: programming
   search_term: ec