Merge branch 'master' into 2821-slim

lib/linguist/generated.rb

@@ -72,7 +72,9 @@ module Linguist
       vcr_cassette? ||
       generated_module? ||
       generated_unity3d_meta? ||
-      generated_racc?
+      generated_racc? ||
+      generated_jflex? ||
+      generated_grammarkit?
     end
 
     # Internal: Is the blob an Xcode file?
@@ -373,5 +375,32 @@ module Linguist
       return false unless lines.count > 2
       return lines[2].start_with?("# This file is automatically generated by Racc")
     end
+
+    # Internal: Is this a JFlex-generated file?
+    #
+    # A JFlex-generated file contains:
+    # /* The following code was generated by JFlex x.y.z on d/at/e ti:me */
+    # on the first line.
+    #
+    # Return true or false
+    def generated_jflex?
+      return false unless extname == '.java'
+      return false unless lines.count > 1
+      return lines[0].start_with?("/* The following code was generated by JFlex ")
+    end
+
+    # Internal: Is this a GrammarKit-generated file?
+    #
+    # A GrammarKit-generated file typically contain:
+    # // This is a generated file. Not intended for manual editing.
+    # on the first line. This is not always the case, as it's possible to
+    # customize the class header.
+    #
+    # Return true or false
+    def generated_grammarkit?
+      return false unless extname == '.java'
+      return false unless lines.count > 1
+      return lines[0].start_with?("// This is a generated file. Not intended for manual editing.")
+    end
   end
 end

lib/linguist/grammars.rb

@@ -1,6 +1,3 @@
-# Note: This file is included in the github-linguist-grammars gem, not the
-# github-linguist gem.
-
 module Linguist
   module Grammars
     # Get the path to the directory containing the language grammar JSON files.

lib/linguist/heuristics.rb

@@ -321,6 +321,14 @@ module Linguist
       end
     end
 
+    disambiguate ".rpy" do |data|
+      if /(^(import|from|class|def)[\s\S])/m.match(data)
+        Language["Python"]
+      else
+        Language["Ren'Py"]
+      end
+    end
+
     disambiguate ".rs" do |data|
       if /^(use |fn |mod |pub |macro_rules|impl|#!?\[)/.match(data)
         Language["Rust"]

lib/linguist/languages.yml

@@ -475,6 +475,13 @@ CSS:
   extensions:
   - .css
 
+CSV:
+  type: data
+  ace_mode: text
+  tm_scope: none
+  extensions:
+  - .csv
+
 Cap'n Proto:
   type: programming
   tm_scope: source.capnp
@@ -1283,6 +1290,7 @@ Groff:
   - '.8'
   - '.9'
   - .l
+  - .me
   - .ms
   - .n
   - .rno
@@ -1303,6 +1311,8 @@ Groovy:
   - .gvy
   interpreters:
   - groovy
+  filenames:
+  - Jenkinsfile
 
 Groovy Server Pages:
   type: programming
@@ -1323,6 +1333,16 @@ HCL:
   ace_mode: ruby
   tm_scope: source.ruby
 
+HLSL:
+  type: programming
+  extensions:
+    - .hlsl
+    - .fx
+    - .fxh
+    - .hlsli
+  ace_mode: text
+  tm_scope: none
+
 HTML:
   type: markup
   tm_scope: text.html.basic
@@ -1988,6 +2008,25 @@ M:
   tm_scope: source.lisp
   ace_mode: lisp
 
+M4:
+  type: programming
+  extensions:
+  - .m4
+  tm_scope: none
+  ace_mode: text
+
+M4Sugar:
+  type: programming
+  group: M4
+  aliases:
+  - autoconf
+  extensions:
+  - .m4
+  filenames:
+  - configure.ac
+  tm_scope: none
+  ace_mode: text
+
 MAXScript:
   type: programming
   color: "#00a6a6"
@@ -2029,6 +2068,8 @@ Makefile:
   - GNUmakefile
   - Kbuild
   - Makefile
+  - Makefile.am
+  - Makefile.in
   - Makefile.inc
   - makefile
   interpreters:
@@ -2555,6 +2596,16 @@ PLpgSQL:
   extensions:
   - .sql
 
+POV-Ray SDL:
+  type: programming
+  aliases:
+  - pov-ray
+  - povray
+  extensions:
+  - .pov
+  - .inc
+  ace_mode: text
+
 Pan:
   type: programming
   color: '#cc0000'
@@ -2654,7 +2705,7 @@ Perl6:
   - Rexfile
   interpreters:
   - perl6
-  tm_scope: source.perl.6
+  tm_scope: source.perl6fe
   ace_mode: perl
 
 Pickle:
@@ -2749,8 +2800,10 @@ Prolog:
   - .pl
   - .pro
   - .prolog
+  - .yap
   interpreters:
   - swipl
+  - yap
   tm_scope: source.prolog
   ace_mode: prolog
 
@@ -2820,6 +2873,7 @@ Python:
   color: "#3572A5"
   extensions:
   - .py
+  - .bzl
   - .cgi
   - .fcgi
   - .gyp
@@ -2828,10 +2882,12 @@ Python:
   - .pyp
   - .pyt
   - .pyw
+  - .rpy
   - .tac
   - .wsgi
   - .xpy
   filenames:
+  - BUCK
   - BUILD
   - SConscript
   - SConstruct
@@ -3001,7 +3057,6 @@ Redcode:
 
 Ren'Py:
   type: programming
-  group: Python
   aliases:
   - renpy
   color: "#ff7f7f"
@@ -3274,6 +3329,7 @@ Shell:
   color: "#89e051"
   aliases:
   - sh
+  - shell-script
   - bash
   - zsh
   extensions:
@@ -3284,6 +3340,7 @@ Shell:
   - .command
   - .fcgi
   - .ksh
+  - .sh.in
   - .tmux
   - .tool
   - .zsh
@@ -3526,7 +3583,20 @@ Text:
   extensions:
   - .txt
   - .fr
+  - .nb
   - .ncl
+  - .no
+  filenames:
+  - COPYING
+  - INSTALL
+  - LICENSE
+  - NEWS
+  - README.me
+  - click.me
+  - delete.me
+  - keep.me
+  - read.me
+  - test.me
   tm_scope: none
   ace_mode: text
 
@@ -3601,6 +3671,13 @@ Unity3D Asset:
   - .unity
   tm_scope: source.yaml
 
+Uno:
+  type: programming
+  extensions:
+  - .uno
+  ace_mode: csharp
+  tm_scope: source.cs
+
 UnrealScript:
   type: programming
   color: "#a54c4d"
@@ -3807,6 +3884,7 @@ XML:
   - .tsx
   - .ui
   - .urdf
+  - .ux
   - .vbproj
   - .vcxproj
   - .vxml
@@ -3823,6 +3901,7 @@ XML:
   - .xliff
   - .xmi
   - .xml.dist
+  - .xproj
   - .xsd
   - .xul
   - .zcml
@@ -3908,11 +3987,19 @@ YAML:
   - .yml
   - .reek
   - .rviz
+  - .sublime-syntax
   - .syntax
   - .yaml
   - .yaml-tmlanguage
   ace_mode: yaml
 
+YANG:
+  type: data
+  extensions:
+  - .yang
+  tm_scope: source.yang
+  ace_mode: text
+
 Yacc:
   type: programming
   extensions:

lib/linguist/strategy/modeline.rb

@@ -5,12 +5,12 @@ module Linguist
 
       # First form vim modeline
       # [text]{white}{vi:|vim:|ex:}[white]{options}
-      # ex: 'vim: syntax=perl'
+      # ex: 'vim: syntax=ruby'
       VIM_MODELINE_1 = /(?:vim|vi|ex):\s*(?:ft|filetype|syntax)=(\w+)\s?/i
 
       # Second form vim modeline (compatible with some versions of Vi)
       # [text]{white}{vi:|vim:|Vim:|ex:}[white]se[t] {options}:[text]
-      # ex: 'vim set syntax=perl:'
+      # ex: 'vim set syntax=ruby:'
       VIM_MODELINE_2 = /(?:vim|vi|Vim|ex):\s*se(?:t)?.*\s(?:ft|filetype|syntax)=(\w+)\s?.*:/i
 
       MODELINES = [EMACS_MODELINE, VIM_MODELINE_1, VIM_MODELINE_2]

lib/linguist/vendor.yml

@@ -20,10 +20,17 @@
 - ^deps/
 - ^tools/
 - (^|/)configure$
-- (^|/)configure.ac$
 - (^|/)config.guess$
 - (^|/)config.sub$
 
+# stuff autogenerated by autoconf - still C deps
+- (^|/)aclocal.m4
+- (^|/)libtool.m4
+- (^|/)ltoptions.m4
+- (^|/)ltsugar.m4
+- (^|/)ltversion.m4
+- (^|/)lt~obsolete.m4
+
 # Linters
 - cpplint.py
 
@@ -302,3 +309,6 @@
 
 # Android Google APIs
 - (^|/)\.google_apis/
+
+# Jenkins Pipeline
+- ^Jenkinsfile$

lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.7.4"
+  VERSION = "4.7.6"
 end