Merge branch 'master' into 1005

Conflicts:
	lib/linguist/samples.json

lib/linguist/language.rb

@@ -485,7 +485,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

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
@@ -86,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:
@@ -129,6 +135,12 @@ AsciiDoc:
   - .adoc
   - .asc
 
+AspectJ:
+  type: programming
+  lexer: AspectJ
+  color: "#1957b0"
+  primary_extension: .aj
+
 Assembly:
   type: programming
   lexer: NASM
@@ -300,7 +312,7 @@ COBOL:
 
 CSS:
   ace_mode: css
-  color: "#1f085e"
+  color: "#563d7c"
   primary_extension: .css
 
 Ceylon:
@@ -488,6 +500,12 @@ DCPU-16 ASM:
 Diff:
   primary_extension: .diff
 
+Dogescript:
+  type: programming
+  lexer: Text only
+  color: "#cca760"
+  primary_extension: .djs
+
 Dylan:
   type: programming
   color: "#3ebc27"
@@ -510,6 +528,14 @@ ECL:
   extensions:
   - .eclxml
 
+Eagle:
+  type: markup
+  color: "#3994bc"
+  lexer: XML
+  primary_extension: .sch
+  extensions:
+  - .brd
+
 Eiffel:
   type: programming
   lexer: Text only
@@ -606,7 +632,7 @@ Fancy:
   - .fancypack
   filenames:
   - Fakefile
-  
+
 Fantom:
   type: programming
   color: "#dbded5"
@@ -620,6 +646,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
@@ -667,6 +704,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"
@@ -677,6 +725,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:
@@ -890,7 +948,7 @@ Java Server Pages:
 JavaScript:
   type: programming
   ace_mode: javascript
-  color: "#f15501"
+  color: "#f7df1e"
   aliases:
   - js
   - node
@@ -910,6 +968,8 @@ JavaScript:
   - .ssjs
   filenames:
   - Jakefile
+  interpreters:
+  - node
 
 Julia:
   type: programming
@@ -1063,6 +1123,11 @@ Mask:
   ace_mode: scss
   primary_extension: .mask
 
+Mathematica:
+  type: programming
+  primary_extension: .mathematica
+  lexer: Text only
+
 Matlab:
   type: programming
   color: "#bb92ac"
@@ -1187,8 +1252,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
@@ -1391,6 +1462,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
@@ -1638,6 +1715,11 @@ Shell:
   filenames:
   - Dockerfile
 
+ShellSession:
+  type: programming
+  lexer: Bash Session
+  primary_extension: .sh-session
+
 Shen:
   type: programming
   color: "#120F14"
@@ -1657,6 +1739,13 @@ Smalltalk:
 Smarty:
   primary_extension: .tpl
 
+SourcePawn:
+  type: programming
+  color: "#f69e1d"
+  aliases:
+  - sourcemod
+  primary_extension: .sp
+
 Squirrel:
   type: programming
   lexer: C++
@@ -1683,6 +1772,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
@@ -1698,6 +1796,7 @@ Tcl:
   primary_extension: .tcl
   extensions:
   - .adp
+  - .tm
 
 Tcsh:
   type: programming
@@ -1860,6 +1959,7 @@ XML:
   - .kml
   - .launch
   - .mxml
+  - .osm
   - .plist
   - .pluginspec
   - .ps1xml
@@ -1940,6 +2040,12 @@ YAML:
   - .rviz
   - .yaml
 
+Zephir:
+  type: programming
+  lexer: PHP
+  color: "#118f9e"
+  primary_extension: .zep
+
 eC:
   type: programming
   search_term: ec

lib/linguist/vendor.yml

@@ -10,7 +10,7 @@
 ## Vendor Conventions ##
 
 # Caches
-- cache/
+- (^|/)cache/
 
 # Dependencies
 - ^[Dd]ependencies/
@@ -98,6 +98,9 @@
 # AngularJS
 - (^|/)angular([^.]*)(\.min)?\.js$
 
+# React
+- (^|/)react(-[^.]*)?(\.min)?\.js$
+
 ## Python ##
 
 # django