github-linguist 7.14.0 → 7.17.0

data/lib/linguist/heuristics.rb

@@ -46,7 +46,7 @@ module Linguist
         return
       end
 
-      data = YAML.load_file(File.expand_path("../heuristics.yml", __FILE__))
+      data = self.load_config
       named_patterns = data['named_patterns'].map { |k,v| [k, self.to_regex(v)] }.to_h
 
       data['disambiguations'].each do |disambiguation|
@@ -60,6 +60,10 @@ module Linguist
       end
     end
 
+    def self.load_config
+      YAML.load_file(File.expand_path("../heuristics.yml", __FILE__))
+    end
+
     def self.parse_rule(named_patterns, rule)
       if !rule['and'].nil?
         rules = rule['and'].map { |block| self.parse_rule(named_patterns, block) }
@@ -160,6 +164,6 @@ module Linguist
     def match(input)
       return !@pat.match(input)
     end
-    
+
   end
 end

data/lib/linguist/heuristics.yml

@@ -200,6 +200,12 @@ disambiguations:
     pattern: '^\s*(#version|precision|uniform|varying|vec[234])'
   - language: Filterscript
     pattern: '#include|#pragma\s+(rs|version)|__attribute__'
+- extensions: ['.ftl']
+  rules:
+  - language: FreeMarker
+    pattern: '^(?:<|[a-zA-Z-][a-zA-Z0-9_-]+[ \t]+\w)|\${\w+[^\n]*?}|^[ \t]*(?:<#--.*?-->|<#([a-z]+)(?=\s|>)[^>]*>.*?</#\1>|\[#--.*?--\]|\[#([a-z]+)(?=\s|\])[^\]]*\].*?\[#\2\])'
+  - language: Fluent
+    pattern: '^-?[a-zA-Z][a-zA-Z0-9_-]* *=|\{\$-?[a-zA-Z][-\w]*(?:\.[a-zA-Z][-\w]*)?\}'
 - extensions: ['.gd']
   rules:
   - language: GAP
@@ -229,6 +235,7 @@ disambiguations:
     named_pattern: objectivec
   - language: C++
     named_pattern: cpp
+  - language: C
 - extensions: ['.hh']
   rules:
   - language: Hack
@@ -251,7 +258,10 @@ disambiguations:
   - language: PHP
     pattern: '^<\?(?:php)?'
   - language: SourcePawn
-    pattern: '^public\s+(?:SharedPlugin(?:\s+|:)__pl_\w+\s*=(?:\s*{)?|(?:void\s+)?__pl_\w+_SetNTVOptional\(\)(?:\s*{)?)'
+    pattern:
+    - '^public\s+(?:SharedPlugin(?:\s+|:)__pl_\w+\s*=(?:\s*{)?|(?:void\s+)?__pl_\w+_SetNTVOptional\(\)(?:\s*{)?)'
+    - '^methodmap\s+\w+\s+<\s+\w+'
+    - '^\s*MarkNativeAsOptional\s*\('
   - language: NASL
     pattern:
     - '^\s*include\s*\(\s*(?:"|'')[\\/\w\-\.:\s]+\.(?:nasl|inc)\s*(?:"|'')\s*\)\s*;'
@@ -261,6 +271,10 @@ disambiguations:
     - '^\s*(?:public\s+|private\s+|\s*)function\s+\w+\s*\([\w\s,]*\)\s*{'
   - language: POV-Ray SDL
     pattern: '^\s*#(declare|local|macro|while)\s'
+  - language: Pascal
+    pattern:
+    - '(?i:^\s*{\$(?:mode|ifdef|undef|define)[ ]+[a-z0-9_]+})'
+    - '^\s*end[.;]\s*$'
 - extensions: ['.l']
   rules:
   - language: Common Lisp
@@ -438,7 +452,7 @@ disambiguations:
     - pattern: '^[#!]'
   - language: INI
     named_pattern: key_equals_value
-  - language: Java properties
+  - language: Java Properties
     pattern: '^[^#!][^:]*:'
 - extensions: ['.q']
   rules:
@@ -571,7 +585,7 @@ disambiguations:
     # The following RegExp is simply a collapsed and simplified form of the
     # VIM_MODELINE pattern in `./lib/linguist/strategy/modeline.rb`.
   - language: Vim Help File
-    pattern: '(?:(?:[ \t]|^)vi(?:m[<=>]?\d+|m)?|[ \t]ex)(?=:(?=[ \t]*set?[ \t][^\n:]+:)|:(?![ \t]* set?[ \t]))(?:(?:[ \t]|[ \t]*:[ \t]*)\w*(?:[ \t]*=(?:[^\\[ \t]]|\\.)*)?)*[[ \t]:](?:filetype|ft|syntax)[ \t]*=help(?=[ \t]|:|$)'
+    pattern: '(?:(?:^|[ \t])(?:vi|Vi(?=m))(?:m[<=>]?[0-9]+|m)?|[ \t]ex)(?=:(?=[ \t]*set?[ \t][^\r\n:]+:)|:(?![ \t]*set?[ \t]))(?:(?:[ \t]*:[ \t]*|[ \t])\w*(?:[ \t]*=(?:[^\\\s]|\\.)*)?)*[ \t:](?:filetype|ft|syntax)[ \t]*=(help)(?=$|\s|:)'
     # HACK: This is a contrived use of heuristics needed to address
     # an unusual edge-case. See https://git.io/JULye for discussion.
   - language: Text
@@ -585,7 +599,7 @@ disambiguations:
     pattern: '\$(?:if|else)[ \t]|^[ \t]*fn\s+[^\s()]+\(.*?\).*?\{|^[ \t]*for\s*\{'
 - extensions: ['.vba']
   rules:
-  - language: Vim script
+  - language: Vim Script
     pattern: '^UseVimball'
   - language: VBA
 - extensions: ['.w']

data/lib/linguist/language.rb

@@ -32,8 +32,6 @@ module Linguist
     @interpreter_index  = Hash.new { |h,k| h[k] = [] }
     @filename_index     = Hash.new { |h,k| h[k] = [] }
 
-    # Valid Languages types
-    TYPES = [:data, :markup, :programming, :prose]
 
     # Detect languages by a specific type
     #
@@ -265,7 +263,7 @@ module Linguist
 
       # Set type
       @type = attributes[:type] ? attributes[:type].to_sym : nil
-      if @type && !TYPES.include?(@type)
+      if @type && !get_types.include?(@type)
         raise ArgumentError, "invalid type: #{@type}"
       end
 
@@ -302,6 +300,11 @@ module Linguist
       end
     end
 
+    def get_types
+      # Valid Languages types
+      @types = [:data, :markup, :programming, :prose]
+    end
+
     # Public: Get proper name
     #
     # Examples