Merge branch 'master' into obj_cpp

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
@@ -92,6 +104,8 @@ AppleScript:
   primary_extension: .applescript
   extensions:
   - .scpt
+  interpreters:
+  - osascript
 
 Arc:
   type: programming
@@ -115,6 +129,12 @@ AsciiDoc:
   - .adoc
   - .asc
 
+AspectJ:
+  type: programming
+  lexer: AspectJ
+  color: "#1957b0"
+  primary_extension: .aj
+
 Assembly:
   type: programming
   lexer: NASM
@@ -214,6 +234,7 @@ C:
   color: "#555"
   primary_extension: .c
   extensions:
+  - .cats
   - .w
 
 C#:
@@ -239,6 +260,7 @@ C++:
   extensions:
   - .C
   - .c++
+  - .cc
   - .cxx
   - .H
   - .h++
@@ -284,7 +306,7 @@ COBOL:
 
 CSS:
   ace_mode: css
-  color: "#1f085e"
+  color: "#563d7c"
   primary_extension: .css
 
 Ceylon:
@@ -296,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"
@@ -316,6 +348,7 @@ Clojure:
   - .cljscm
   - .cljx
   - .hic
+  - .cljs.hl
   filenames:
   - riemann.config
 
@@ -333,6 +366,8 @@ CoffeeScript:
   - .iced
   filenames:
   - Cakefile
+  interpreters:
+  - coffee
 
 ColdFusion:
   type: programming
@@ -388,7 +423,7 @@ Crystal:
   lexer: Ruby
   primary_extension: .cr
   ace_mode: ruby
-  
+
 Cucumber:
   lexer: Gherkin
   primary_extension: .feature
@@ -459,10 +494,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
 
 Ecere Projects:
   type: data
@@ -478,6 +522,14 @@ ECL:
   extensions:
   - .eclxml
 
+Eagle:
+  type: markup
+  color: "#3994bc"
+  lexer: XML
+  primary_extension: .sch
+  extensions:
+  - .brd
+
 Eiffel:
   type: programming
   lexer: Text only
@@ -528,6 +580,14 @@ F#:
   - .fsi
   - .fsx
 
+FLUX:
+  type: programming
+  color: "#33CCFF"
+  primary_extension: .fx
+  lexer: Text only
+  extensions:
+  - .flux
+
 FORTRAN:
   type: programming
   lexer: Fortran
@@ -580,6 +640,17 @@ Forth:
   extensions:
   - .4th
 
+Frege:
+  type: programming
+  color: "#00cafe"
+  lexer: Haskell
+  primary_extension: .fr
+
+Game Maker Language:
+  type: programming
+  lexer: JavaScript
+  primary_extension: .gml
+
 GAS:
   type: programming
   group: Assembly
@@ -627,6 +698,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"
@@ -653,6 +735,8 @@ Groovy:
   ace_mode: groovy
   color: "#e69f56"
   primary_extension: .groovy
+  interpreters:
+  - groovy
 
 Groovy Server Pages:
   group: Groovy
@@ -670,6 +754,7 @@ HTML:
   extensions:
   - .htm
   - .xhtml
+  - .html.hl
 
 HTML+Django:
   type: markup
@@ -718,6 +803,12 @@ Handlebars:
   - .html.handlebars
   - .html.hbs
 
+Harbour:
+  type: programming
+  lexer: Text only
+  color: "#0e60e3"
+  primary_extension: .hb
+
 Haskell:
   type: programming
   color: "#29b544"
@@ -733,6 +824,13 @@ Haxe:
   extensions:
   - .hxsl
 
+Hy:
+  type: programming
+  lexer: Clojure
+  ace_mode: clojure
+  color: "#7891b1"
+  primary_extension: .hy
+
 IDL:
   type: programming
   lexer: Text only
@@ -805,6 +903,13 @@ JSON5:
   lexer: JavaScript
   primary_extension: .json5
 
+JSONLD:
+  type: data
+  group: JavaScript
+  ace_mode: json
+  lexer: JavaScript
+  primary_extension: .jsonld
+
 Jade:
   group: HTML
   type: markup
@@ -827,7 +932,7 @@ Java Server Pages:
 JavaScript:
   type: programming
   ace_mode: javascript
-  color: "#f15501"
+  color: "#f7df1e"
   aliases:
   - js
   - node
@@ -835,6 +940,7 @@ JavaScript:
   extensions:
   - ._js
   - .bones
+  - .es6
   - .jake
   - .jsfl
   - .jsm
@@ -846,6 +952,8 @@ JavaScript:
   - .ssjs
   filenames:
   - Jakefile
+  interpreters:
+  - node
 
 Julia:
   type: programming
@@ -992,6 +1100,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"
@@ -1099,6 +1219,7 @@ OCaml:
   primary_extension: .ml
   extensions:
   - .eliomi
+  - .ml4
   - .mli
   - .mll
   - .mly
@@ -1171,6 +1292,12 @@ Oxygene:
   color: "#5a63a3"
   primary_extension: .oxygene
 
+PAWN:
+  type: programming
+  lexer: C++
+  color: "#dbb284"
+  primary_extension: .pwn
+
 PHP:
   type: programming
   ace_mode: php
@@ -1293,6 +1420,9 @@ Prolog:
   type: programming
   color: "#74283c"
   primary_extension: .prolog
+  extensions:
+  - .ecl
+  - .pl
 
 Protocol Buffer:
   type: markup
@@ -1351,11 +1481,12 @@ R:
   type: programming
   color: "#198ce7"
   lexer: S
-  aliases: 
+  aliases:
   - R
   primary_extension: .r
   extensions:
   - .R
+  - .rsx
   filenames:
   - .Rprofile
   interpreters:
@@ -1469,6 +1600,7 @@ Ruby:
   - Appraisals
   - Berksfile
   - Gemfile
+  - Gemfile.lock
   - Guardfile
   - Podfile
   - Thorfile
@@ -1520,6 +1652,7 @@ Scheme:
   color: "#1e4aec"
   primary_extension: .scm
   extensions:
+  - .sld
   - .sls
   - .ss
   interpreters:
@@ -1558,6 +1691,12 @@ Shell:
   filenames:
   - Dockerfile
 
+Shen:
+  type: programming
+  color: "#120F14"
+  lexer: Text only
+  primary_extension: .shen
+
 Slash:
   type: programming
   color: "#007eff"
@@ -1597,6 +1736,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
@@ -1612,6 +1760,7 @@ Tcl:
   primary_extension: .tcl
   extensions:
   - .adp
+  - .tm
 
 Tcsh:
   type: programming
@@ -1631,6 +1780,7 @@ TeX:
   extensions:
   - .aux
   - .bib
+  - .cls
   - .dtx
   - .ins
   - .ltx
@@ -1773,6 +1923,7 @@ XML:
   - .kml
   - .launch
   - .mxml
+  - .osm
   - .plist
   - .pluginspec
   - .ps1xml