linguist-js 2.5.2 → 2.5.3

package/dist/helpers/convert-pcre.js

@@ -12,16 +12,25 @@ function pcre(regex) {
         replace(match, '');
         [...flags].forEach(flag => finalFlags.add(flag));
     }
-    // Remove invalid syntax
+    // Remove PCRE-only syntax
     replace(/([*+]){2}/g, '$1');
     replace(/\(\?>/g, '(?:');
     // Remove start/end-of-file markers
     if (/\\[AZ]/.test(finalRegex)) {
-        replace(/\\A/g, '^').replace(/\\Z/g, '$');
+        replace(/\\A/g, '^');
+        replace(/\\Z/g, '$');
         finalFlags.delete('m');
     }
-    else
+    else {
         finalFlags.add('m');
+    }
+    // Reformat free-spacing mode
+    if (finalFlags.has('x')) {
+        finalFlags.delete('x');
+        replace(/#.+/g, '');
+        replace(/^\s+|\s+$|\n/gm, '');
+        replace(/\s+/g, ' ');
+    }
     // Return final regex
     return RegExp(finalRegex, [...finalFlags].join(''));
 }

package/ext/generated.rb

@@ -146,7 +146,7 @@ module Linguist
       !!creator.include?("EAGLE") and lines[0..4].find {|line| line =~ /^%%Title: EAGLE Drawing /}
     end    def generated_go?
       return false unless extname == '.go'
-      return false unless lines.count > 1      return lines.first(40).any? { |l| l.include? "Code generated by" }
+      return false unless lines.count > 1      return lines.first(40).any? { |l| l =~ %r{^// Code generated .*} }
     end
     def generated_protocol_buffer_from_go?
       return false unless extname == '.proto'

package/ext/heuristics.yml

@@ -67,6 +67,16 @@ disambiguations:
     pattern: '^\s*(# |include|require)\b'
   - language: Clojure
     pattern: '\((def|defn|defmacro|let)\s'
+- extensions: ['.bf']
+  rules:
+  - language: Beef
+    pattern: '(?-m)^\s*using\s+(System|Beefy)(\.(.*))?;\s*$'
+  - language: HyPhy
+    pattern:
+    - '(?-m)^\s*#include\s+".*";\s*$'
+    - '\sfprintf\s*\('
+  - language: Brainfuck
+    pattern: '(>\+>|>\+<)'
 - extensions: ['.bi']
   rules:
   - language: FreeBasic
@@ -112,7 +122,7 @@ disambiguations:
   - language: Smalltalk
     pattern: '![\w\s]+methodsFor: '
   - language: 'C#'
-    pattern: '^(\s*namespace\s*[\w\.]+\s*({|;)|\s*\/\/)'
+    pattern: '^\s*(using\s+[A-Z][\s\w.]+;|namespace\s*[\w\.]+\s*({|;)|\/\/)'
 - extensions: ['.csc']
   rules:
   - language: GSC
@@ -209,6 +219,12 @@ disambiguations:
     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: ['.g']
+  rules:
+  - language: GAP
+    pattern: '\s*(Declare|BindGlobal|KeyDependentOperation|Install(Method|GlobalFunction)|SetPackageInfo)'
+  - language: G-code
+    pattern: '^[MG][0-9]+\n'
 - extensions: ['.gd']
   rules:
   - language: GAP
@@ -458,7 +474,7 @@ disambiguations:
     - pattern: HEADERS
     - pattern: SOURCES
   - language: IDL
-    pattern: '^\s*function[ \w,]+$'
+    pattern: '^\s*(?i:function|pro|compile_opt) \w[ \w,:]*$'
 - extensions: ['.properties']
   rules:
   - language: INI
@@ -537,6 +553,12 @@ disambiguations:
     pattern: '(?i:\^(this|super)\.|^\s*~\w+\s*=\.)'
   - language: Scala
     pattern: '(^\s*import (scala|java)\.|^\s*class\b)'
+- extensions: ['.scd']
+  rules:
+  - language: SuperCollider
+    pattern: '(?i:\^(this|super)\.|^\s*(~\w+\s*=\.|SynthDef\b))'
+  - language: Markdown
+    pattern: '^#+\s+(NAME|SYNOPSIS|DESCRIPTION)'
 - extensions: ['.sol']
   rules:
   - language: Solidity
@@ -607,6 +629,27 @@ disambiguations:
   rules:
   - language: Vim Help File
     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|:)'
+  - language: Adblock Filter List
+    pattern: |-
+      (?x)\A
+      \[
+      (?<version>
+        (?:
+          [Aa]d[Bb]lock
+          (?:[ \t][Pp]lus)?
+          |
+          u[Bb]lock
+          (?:[ \t][Oo]rigin)?
+          |
+          [Aa]d[Gg]uard
+        )
+        (?:[ \t] \d+(?:\.\d+)*+)?
+      )
+      (?:
+        [ \t]?;[ \t]?
+        \g<version>
+      )*+
+      \]
   - language: Text
 - extensions: ['.url']
   rules:

package/ext/languages.yml

@@ -192,6 +192,19 @@ Ada:
   tm_scope: source.ada
   ace_mode: ada
   language_id: 11
+Adblock Filter List:
+  type: data
+  color: "#800000"
+  ace_mode: text
+  extensions:
+  - ".txt"
+  aliases:
+  - ad block filters
+  - ad block
+  - adb
+  - adblock
+  tm_scope: text.adblock
+  language_id: 884614762
 Adobe Font Metrics:
   type: data
   color: "#fa0f00"
@@ -366,6 +379,7 @@ Assembly:
   - ".a51"
   - ".i"
   - ".inc"
+  - ".nas"
   - ".nasm"
   tm_scope: source.assembly
   ace_mode: assembly_x86
@@ -492,6 +506,7 @@ Befunge:
   type: programming
   extensions:
   - ".befunge"
+  - ".bf"
   tm_scope: source.befunge
   ace_mode: text
   language_id: 30
@@ -1665,6 +1680,16 @@ Elm:
   codemirror_mode: elm
   codemirror_mime_type: text/x-elm
   language_id: 101
+Elvish:
+  type: programming
+  ace_mode: text
+  extensions:
+  - ".elv"
+  interpreters:
+  - elvish
+  tm_scope: source.elvish
+  color: "#55BB55"
+  language_id: 570996448
 Emacs Lisp:
   type: programming
   tm_scope: source.emacs.lisp
@@ -2095,6 +2120,17 @@ Gemfile.lock:
   filenames:
   - Gemfile.lock
   language_id: 907065713
+Gemini:
+  type: prose
+  color: "#ff6900"
+  ace_mode: text
+  extensions:
+  - ".gmi"
+  aliases:
+  - gemtext
+  wrap: true
+  tm_scope: source.gemini
+  language_id: 310828396
 Genero:
   type: programming
   color: "#63408e"
@@ -2459,6 +2495,14 @@ HLSL:
   ace_mode: text
   tm_scope: source.hlsl
   language_id: 145
+HOCON:
+  type: data
+  color: "#9ff8ee"
+  extensions:
+  - ".hocon"
+  tm_scope: source.hocon
+  ace_mode: text
+  language_id: 679725279
 HTML:
   type: markup
   tm_scope: text.html.basic
@@ -3302,6 +3346,7 @@ Kusto:
   type: data
   extensions:
   - ".csl"
+  - ".kql"
   tm_scope: source.kusto
   ace_mode: text
   language_id: 225697190
@@ -4027,6 +4072,14 @@ Motorola 68K Assembly:
   tm_scope: source.m68k
   ace_mode: assembly_x86
   language_id: 477582706
+Move:
+  type: programming
+  color: "#4a137a"
+  extensions:
+    - ".move"
+  tm_scope: source.move
+  ace_mode: text
+  language_id: 638334599
 Muse:
   type: prose
   extensions:
@@ -4119,6 +4172,14 @@ NWScript:
   codemirror_mode: clike
   codemirror_mime_type: text/x-csrc
   language_id: 731233819
+Nasal:
+  type: programming
+  color: "#1d2c4e"
+  extensions:
+  - ".nas"
+  tm_scope: none
+  ace_mode: text
+  language_id: 178322513
 Nearley:
   type: programming
   ace_mode: text
@@ -5578,6 +5639,16 @@ Rouge:
   - ".rg"
   tm_scope: source.clojure
   language_id: 325
+RouterOS Script:
+  type: programming
+  ace_mode: text
+  extensions:
+  - ".rsc"
+  interpreters:
+  - RouterOS
+  color: "#DE3941"
+  tm_scope: none
+  language_id: 592853203
 Ruby:
   type: programming
   tm_scope: source.ruby
@@ -6252,7 +6323,6 @@ SugarSS:
   type: markup
   color: "#2fcc9f"
   tm_scope: source.css.postcss.sugarss
-  group: CSS
   extensions:
   - ".sss"
   ace_mode: text
@@ -6751,6 +6821,19 @@ Valve Data Format:
   ace_mode: text
   tm_scope: source.keyvalues
   language_id: 544060961
+Velocity Template Language:
+  type: markup
+  color: "#507cff"
+  aliases:
+  - vtl
+  - velocity
+  extensions:
+  - ".vtl"
+  ace_mode: velocity
+  tm_scope: source.velocity
+  codemirror_mode: velocity
+  codemirror_mime_type: text/velocity
+  language_id: 292377326
 Verilog:
   type: programming
   color: "#b2b7f8"
@@ -6984,6 +7067,16 @@ World of Warcraft Addon Data:
   tm_scope: source.toc
   ace_mode: text
   language_id: 396
+Wren:
+  type: programming
+  color: "#383838"
+  aliases:
+  - wrenlang
+  extensions:
+  - ".wren"
+  tm_scope: source.wren
+  ace_mode: text
+  language_id: 713580619
 X BitMap:
   type: data
   group: C
@@ -7116,6 +7209,7 @@ XML:
   - ".ps1xml"
   - ".psc1"
   - ".pt"
+  - ".qhelp"
   - ".rdf"
   - ".res"
   - ".resx"

package/ext/vendor.yml

@@ -29,7 +29,7 @@
 - (^|/)\.indent\.pro
 - (\.|-)min\.(js|css)$
 - ([^\s]*)import\.(css|less|scss|styl)$
-- (^|/)bootstrap([^/.]*)\.(js|css|less|scss|styl)$
+- (^|/)bootstrap([^/.]*)(?=\.).*\.(js|css|less|scss|styl)$
 - (^|/)custom\.bootstrap([^\s]*)(js|css|less|scss|styl)$
 - (^|/)font-?awesome\.(css|less|scss|styl)$
 - (^|/)font-?awesome/.*\.(css|less|scss|styl)$

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "linguist-js",
-	"version": "2.5.2",
+	"version": "2.5.3",
 	"description": "Analyse languages used in a folder. Powered by GitHub Linguist, although it doesn't need to be installed.",
 	"main": "dist/index.js",
 	"bin": {
@@ -40,7 +40,7 @@
 	"homepage": "https://github.com/Nixinova/Linguist#readme",
 	"dependencies": {
 		"binary-extensions": "^2.2.0",
-		"commander": "^9.3.0",
+		"commander": "^9.4.0",
 		"common-path-prefix": "^3.0.0",
 		"cross-fetch": "^3.1.5",
 		"ignore": "^5.2.0",
@@ -50,8 +50,8 @@
 	},
 	"devDependencies": {
 		"@types/js-yaml": "^4.0.5",
-		"@types/node": "ts4.7",
+		"@types/node": "ts4.8",
 		"deep-object-diff": "^1.1.7",
-		"typescript": "~4.7.4"
+		"typescript": "~4.8.2"
 	}
 }