Merge branch 'master' into 2667-local

lib/linguist/blob.rb

@@ -0,0 +1,73 @@
+require 'linguist/blob_helper'
+
+module Linguist
+  # A Blob is a wrapper around the content of a file to make it quack
+  # like a Grit::Blob. It provides the basic interface: `name`,
+  # `data`, `path` and `size`.
+  class Blob
+    include BlobHelper
+
+    # Public: Initialize a new Blob.
+    #
+    # path    - A path String (does not necessarily exists on the file system).
+    # content - Content of the file.
+    #
+    # Returns a Blob.
+    def initialize(path, content)
+      @path = path
+      @content = content
+    end
+
+    # Public: Filename
+    #
+    # Examples
+    #
+    #   Blob.new("/path/to/linguist/lib/linguist.rb", "").path
+    #   # =>  "/path/to/linguist/lib/linguist.rb"
+    #
+    # Returns a String
+    attr_reader :path
+
+    # Public: File name
+    #
+    # Returns a String
+    def name
+      File.basename(@path)
+    end
+
+    # Public: File contents.
+    #
+    # Returns a String.
+    def data
+      @content
+    end
+
+    # Public: Get byte size
+    #
+    # Returns an Integer.
+    def size
+      @content.bytesize
+    end
+
+    # Public: Get file extension.
+    #
+    # Returns a String.
+    def extension
+      extensions.last || ""
+    end
+
+    # Public: Return an array of the file extensions
+    #
+    #     >> Linguist::Blob.new("app/views/things/index.html.erb").extensions
+    #     => [".html.erb", ".erb"]
+    #
+    # Returns an Array
+    def extensions
+      basename, *segments = name.downcase.split(".")
+
+      segments.map.with_index do |segment, index|
+        "." + segments[index..-1].join(".")
+      end
+    end
+  end
+end

lib/linguist/file_blob.rb

@@ -1,10 +1,11 @@
 require 'linguist/blob_helper'
+require 'linguist/blob'
 
 module Linguist
   # A FileBlob is a wrapper around a File object to make it quack
   # like a Grit::Blob. It provides the basic interface: `name`,
   # `data`, `path` and `size`.
-  class FileBlob
+  class FileBlob < Blob
     include BlobHelper
 
     # Public: Initialize a new FileBlob from a path
@@ -18,20 +19,6 @@ module Linguist
       @path = base_path ? path.sub("#{base_path}/", '') : path
     end
 
-    # Public: Filename
-    #
-    # Examples
-    #
-    #   FileBlob.new("/path/to/linguist/lib/linguist.rb").path
-    #   # =>  "/path/to/linguist/lib/linguist.rb"
-    #
-    #   FileBlob.new("/path/to/linguist/lib/linguist.rb",
-    #                "/path/to/linguist").path
-    #   # =>  "lib/linguist.rb"
-    #
-    # Returns a String
-    attr_reader :path
-
     # Public: Read file permissions
     #
     # Returns a String like '100644'
@@ -39,13 +26,6 @@ module Linguist
       File.stat(@fullpath).mode.to_s(8)
     end
 
-    # Public: File name
-    #
-    # Returns a String
-    def name
-      File.basename(@fullpath)
-    end
-
     # Public: Read file contents.
     #
     # Returns a String.
@@ -59,26 +39,5 @@ module Linguist
     def size
       File.size(@fullpath)
     end
-
-    # Public: Get file extension.
-    #
-    # Returns a String.
-    def extension
-      extensions.last || ""
-    end
-
-    # Public: Return an array of the file extensions
-    #
-    #     >> Linguist::FileBlob.new("app/views/things/index.html.erb").extensions
-    #     => [".html.erb", ".erb"]
-    #
-    # Returns an Array
-    def extensions
-      basename, *segments = name.downcase.split(".")
-
-      segments.map.with_index do |segment, index|
-        "." + segments[index..-1].join(".")
-      end
-    end
   end
 end

lib/linguist/generated.rb

@@ -71,7 +71,8 @@ module Linguist
       generated_jni_header? ||
       vcr_cassette? ||
       generated_module? ||
-      generated_unity3d_meta?
+      generated_unity3d_meta? ||
+      generated_racc?
     end
 
     # Internal: Is the blob an Xcode file?
@@ -359,5 +360,18 @@ module Linguist
       return false unless lines.count > 1
       return lines[0].include?("fileFormatVersion: ")
     end
+
+    # Internal: Is this a Racc-generated file?
+    #
+    # A Racc-generated file contains:
+    # # This file is automatically generated by Racc x.y.z
+    # on the third line.
+    #
+    # Return true or false
+    def generated_racc?
+      return false unless extname == '.rb'
+      return false unless lines.count > 2
+      return lines[2].start_with?("# This file is automatically generated by Racc")
+    end
   end
 end

lib/linguist/heuristics.rb

@@ -131,7 +131,7 @@ module Linguist
     disambiguate ".for", ".f" do |data|
       if /^: /.match(data)
         Language["Forth"]
-      elsif /^([c*][^a-z]|      (subroutine|program)\s|\s*!)/i.match(data)
+      elsif /^([c*][^abd-z]|      (subroutine|program|end)\s|\s*!)/i.match(data)
         Language["FORTRAN"]
       end
     end

lib/linguist/languages.yml

@@ -393,6 +393,7 @@ C#:
   - csharp
   extensions:
   - .cs
+  - .cake
   - .cshtml
   - .csx
 
@@ -568,6 +569,7 @@ CoffeeScript:
   extensions:
   - .coffee
   - ._coffee
+  - .cake
   - .cjsx
   - .cson
   - .iced
@@ -720,7 +722,7 @@ Cython:
 
 D:
   type: programming
-  color: "#fcd46d"
+  color: "#ba595e"
   extensions:
   - .d
   - .di
@@ -885,6 +887,8 @@ Elixir:
   ace_mode: elixir
   filenames:
   - mix.lock
+  interpreters:
+  - elixir
 
 Elm:
   type: programming
@@ -1012,6 +1016,7 @@ Formatted:
   type: data
   extensions:
   - .for
+  - .eam.fs
   tm_scope: none
   ace_mode: text
 
@@ -1029,6 +1034,16 @@ Forth:
   - .fs
   ace_mode: forth
 
+FreeMarker:
+  type: programming
+  color: "#0050b2"
+  aliases:
+  - ftl
+  extensions:
+  - .ftl
+  tm_scope: text.html.ftl
+  ace_mode: ftl
+
 Frege:
   type: programming
   color: "#00cafe"
@@ -1318,11 +1333,22 @@ HTML+Django:
   - .mustache
   - .jinja
   aliases:
+  - django
   - html+django/jinja
   - html+jinja
   - htmldjango
   ace_mode: django
 
+HTML+EEX:
+  type: markup
+  tm_scope: text.html.elixir
+  group: HTML
+  aliases:
+  - eex
+  extensions:
+  - .eex
+  ace_mode: text
+
 HTML+ERB:
   type: markup
   tm_scope: text.html.erb
@@ -1332,7 +1358,7 @@ HTML+ERB:
   extensions:
   - .erb
   - .erb.deface
-  ace_mode: html_ruby
+  ace_mode: text
 
 HTML+PHP:
   type: markup
@@ -1590,7 +1616,7 @@ Jade:
   type: markup
   extensions:
   - .jade
-  tm_scope: source.jade
+  tm_scope: text.jade
   ace_mode: jade
 
 Jasmin:
@@ -1635,6 +1661,7 @@ JavaScript:
   - .gs
   - .jake
   - .jsb
+  - .jscad
   - .jsfl
   - .jsm
   - .jss
@@ -1681,6 +1708,7 @@ KiCad:
   type: programming
   extensions:
   - .sch
+  - .brd
   - .kicad_pcb
   tm_scope: none
   ace_mode: text
@@ -2015,6 +2043,8 @@ Mathematica:
 Matlab:
   type: programming
   color: "#bb92ac"
+  aliases:
+  - octave
   extensions:
   - .matlab
   - .m
@@ -2063,6 +2093,14 @@ Mercury:
   tm_scope: source.mercury
   ace_mode: prolog
 
+Metal:
+  type: programming
+  color: "#8f14e9"
+  extensions:
+  - .metal
+  tm_scope: source.c++
+  ace_mode: c_cpp
+
 MiniD: # Legacy
   type: programming
   searchable: false
@@ -2441,6 +2479,7 @@ PHP:
   - .php3
   - .php4
   - .php5
+  - .phps
   - .phpt
   filenames:
   - Phakefile
@@ -2457,6 +2496,7 @@ PLSQL:
   color: "#dad8d8"
   extensions:
   - .pls
+  - .pck
   - .pkb
   - .pks
   - .plb
@@ -2573,6 +2613,13 @@ Perl6:
   tm_scope: source.perl.6
   ace_mode: perl
 
+Pickle:
+  type: data
+  extensions:
+  - .pkl
+  tm_scope: none
+  ace_mode: text
+
 PicoLisp:
   type: programming
   extensions:
@@ -2617,6 +2664,13 @@ PogoScript:
   tm_scope: source.pogoscript
   ace_mode: text
 
+Pony:
+  type: programming
+  extensions:
+  - .pony
+  tm_scope: source.pony
+  ace_mode: text
+
 PostScript:
   type: markup
   extensions:
@@ -3108,7 +3162,7 @@ Sass:
 Scala:
   type: programming
   ace_mode: scala
-  color: "#7dd3b0"
+  color: "#DC322F"
   extensions:
   - .scala
   - .sbt
@@ -3297,9 +3351,12 @@ SuperCollider:
   type: programming
   color: "#46390b"
   extensions:
-  - .scd
   - .sc
-  tm_scope: none
+  - .scd
+  interpreters:
+  - sclang
+  - scsynth
+  tm_scope: source.supercollider
   ace_mode: text
 
 Swift:
@@ -3442,6 +3499,7 @@ TypeScript:
   - ts
   extensions:
   - .ts
+  - .tsx
   tm_scope: source.ts
   ace_mode: typescript
 
@@ -3623,6 +3681,7 @@ XML:
   - .ccxml
   - .clixml
   - .cproject
+  - .csl
   - .csproj
   - .ct
   - .dita
@@ -3669,6 +3728,7 @@ XML:
   - .tmSnippet
   - .tmTheme
   - .ts
+  - .tsx
   - .ui
   - .urdf
   - .vbproj

lib/linguist/tokenizer.rb

@@ -86,13 +86,13 @@ module Linguist
           if s.peek(1) == "\""
             s.getch
           else
-            s.skip_until(/[^\\]"/)
+            s.skip_until(/(?<!\\)"/)
           end
         elsif s.scan(/'/)
           if s.peek(1) == "'"
             s.getch
           else
-            s.skip_until(/[^\\]'/)
+            s.skip_until(/(?<!\\)'/)
           end
 
         # Skip number literals

lib/linguist/vendor.yml

@@ -95,7 +95,7 @@
 - jquery.fn.gantt.js
 
 # jQuery fancyBox
-- jquery.fancybox.js
+- jquery.fancybox.(js|css)
 
 # Fuel UX
 - fuelux.js

lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.6.3"
+  VERSION = "4.7.2"
 end