Merge branch 'master' into 1261-local

lib/linguist/generated.rb

@@ -63,7 +63,8 @@ module Linguist
         generated_jni_header? ||
         composer_lock? ||
         node_modules? ||
-        vcr_cassette?
+        vcr_cassette? ||
+        generated_by_zephir?
     end
 
     # Internal: Is the blob an XCode project file?
@@ -237,6 +238,13 @@ module Linguist
       !!name.match(/composer.lock/)
     end
 
+    # Internal: Is the blob a generated by Zephir
+    #
+    # Returns true or false.
+    def generated_by_zephir?
+      !!name.match(/.\.zep\.(?:c|h|php)$/)
+    end
+
     # Is the blob a VCR Cassette file?
     #
     # Returns true or false

lib/linguist/languages.yml

@@ -157,6 +157,7 @@ Assembly:
   - nasm
   extensions:
   - .asm
+  - .inc
 
 Augeas:
   type: programming
@@ -998,6 +999,13 @@ Ioke:
   extensions:
   - .ik
 
+Isabelle:
+  type: programming
+  lexer: Text only
+  color: "#fdcd00"
+  extensions:
+  - .thy
+
 J:
   type: programming
   lexer: Text only
@@ -1700,6 +1708,7 @@ Python:
   - .gyp
   - .lmi
   - .pyde
+  - .pyp
   - .pyt
   - .pyw
   - .wsgi
@@ -1905,6 +1914,13 @@ SQL:
   - .udf
   - .viw
 
+STON:
+  type: data
+  group: Smalltalk
+  lexer: JSON
+  extensions:
+  - .ston
+
 Sage:
   type: programming
   lexer: Python
@@ -1997,6 +2013,14 @@ Slash:
   extensions:
   - .sl
 
+Slim:
+  group: HTML
+  type: markup
+  lexer: Slim
+  color: "#ff8877"
+  extensions:
+  - .slim
+
 Smalltalk:
   type: programming
   color: "#596706"
@@ -2059,8 +2083,8 @@ SuperCollider:
 
 Swift:
   type: programming
+  lexer: Swift
   color: "#ffac45"
-  lexer: Text only
   extensions:
   - .swift
 
@@ -2275,6 +2299,7 @@ XML:
   - .launch
   - .mxml
   - .nproj
+  - .nuspec
   - .osm
   - .plist
   - .pluginspec
@@ -2346,6 +2371,17 @@ XSLT:
   - .xslt
   - .xsl
 
+Xojo:
+  type: programming
+  lexer: VB.net
+  extensions:
+  - .xojo_code
+  - .xojo_menu
+  - .xojo_report
+  - .xojo_script
+  - .xojo_toolbar
+  - .xojo_window
+
 Xtend:
   type: programming
   extensions:

lib/linguist/vendor.yml

@@ -204,3 +204,7 @@
 - ^vignettes/
 - ^inst/extdata/
 
+# Octicons
+- octicons.css
+- octicons.min.css
+- sprockets-octicons.scss

lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "2.11.4"
+  VERSION = "2.12.0"
 end