linguist-js 2.5.4 → 2.5.5

package/dist/schema.d.ts

@@ -1,37 +1,37 @@
-import { Category, Language } from './types';
-export interface LanguagesScema {
-    [name: string]: {
-        language_id: number;
-        fs_name?: Language;
-        type: Category;
-        group?: Language;
-        color?: `#${string}`;
-        aliases?: string[];
-        extensions?: `.${string}`[];
-        filenames?: string[];
-        interpreters?: string[];
-        tm_scope?: `${'source' | 'text'}.${string}`;
-        ace_mode?: string;
-        codemirror_mode?: string;
-        codemirror_mime_type?: `${string}/${string}`;
-        wrap?: boolean;
-    };
-}
-interface HeuristicsRules {
-    pattern?: string;
-    named_pattern?: string;
-    named_patterns?: string[];
-    negative_pattern?: string;
-}
-export interface HeuristicsSchema {
-    disambiguations: Array<{
-        extensions: string[];
-        rules: Array<HeuristicsRules & {
-            language: string | string[];
-            and?: HeuristicsRules[];
-        }>;
-    }>;
-    named_patterns: Record<string, string | string[]>;
-}
-export type VendorSchema = string[];
-export {};
+import { Category, Language } from './types';
+export interface LanguagesScema {
+    [name: string]: {
+        language_id: number;
+        fs_name?: Language;
+        type: Category;
+        group?: Language;
+        color?: `#${string}`;
+        aliases?: string[];
+        extensions?: `.${string}`[];
+        filenames?: string[];
+        interpreters?: string[];
+        tm_scope?: `${'source' | 'text'}.${string}`;
+        ace_mode?: string;
+        codemirror_mode?: string;
+        codemirror_mime_type?: `${string}/${string}`;
+        wrap?: boolean;
+    };
+}
+interface HeuristicsRules {
+    pattern?: string;
+    named_pattern?: string;
+    named_patterns?: string[];
+    negative_pattern?: string;
+}
+export interface HeuristicsSchema {
+    disambiguations: Array<{
+        extensions: string[];
+        rules: Array<HeuristicsRules & {
+            language: string | string[];
+            and?: HeuristicsRules[];
+        }>;
+    }>;
+    named_patterns: Record<string, string | string[]>;
+}
+export type VendorSchema = string[];
+export {};

package/dist/schema.js

@@ -1,2 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types.d.ts

@@ -1,47 +1,47 @@
-export type LanguageResult = string | null;
-export type Language = string;
-export type Category = 'data' | 'markup' | 'programming' | 'prose';
-export type FilePath = string;
-export type Bytes = Integer;
-export type Integer = number;
-export interface Options {
-    fileContent?: string | string[];
-    ignoredFiles?: string[];
-    ignoredLanguages?: Language[];
-    categories?: Category[];
-    keepVendored?: boolean;
-    keepBinary?: boolean;
-    relativePaths?: boolean;
-    childLanguages?: boolean;
-    quick?: boolean;
-    offline?: boolean;
-    checkIgnored?: boolean;
-    checkAttributes?: boolean;
-    checkHeuristics?: boolean;
-    checkShebang?: boolean;
-    checkModeline?: boolean;
-}
-export interface Results {
-    files: {
-        count: Integer;
-        bytes: Bytes;
-        /** Note: Results use slashes as delimiters even on Windows. */
-        results: Record<FilePath, LanguageResult>;
-    };
-    languages: {
-        count: Integer;
-        bytes: Bytes;
-        results: Record<Language, {
-            bytes: Bytes;
-            type: Category;
-            parent?: Language;
-            color?: `#${string}`;
-        }>;
-    };
-    unknown: {
-        count: Integer;
-        bytes: Bytes;
-        extensions: Record<string, Bytes>;
-        filenames: Record<string, Bytes>;
-    };
-}
+export type LanguageResult = string | null;
+export type Language = string;
+export type Category = 'data' | 'markup' | 'programming' | 'prose';
+export type FilePath = string;
+export type Bytes = Integer;
+export type Integer = number;
+export interface Options {
+    fileContent?: string | string[];
+    ignoredFiles?: string[];
+    ignoredLanguages?: Language[];
+    categories?: Category[];
+    keepVendored?: boolean;
+    keepBinary?: boolean;
+    relativePaths?: boolean;
+    childLanguages?: boolean;
+    quick?: boolean;
+    offline?: boolean;
+    checkIgnored?: boolean;
+    checkAttributes?: boolean;
+    checkHeuristics?: boolean;
+    checkShebang?: boolean;
+    checkModeline?: boolean;
+}
+export interface Results {
+    files: {
+        count: Integer;
+        bytes: Bytes;
+        /** Note: Results use slashes as delimiters even on Windows. */
+        results: Record<FilePath, LanguageResult>;
+    };
+    languages: {
+        count: Integer;
+        bytes: Bytes;
+        results: Record<Language, {
+            bytes: Bytes;
+            type: Category;
+            parent?: Language;
+            color?: `#${string}`;
+        }>;
+    };
+    unknown: {
+        count: Integer;
+        bytes: Bytes;
+        extensions: Record<string, Bytes>;
+        filenames: Record<string, Bytes>;
+    };
+}

package/dist/types.js

@@ -1,2 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/ext/documentation.yml

@@ -18,4 +18,4 @@
 - (^|/)[Ll]icen[cs]e(\.|$)
 - (^|/)README(\.|$)
 - (^|/)[Rr]eadme(\.|$)
-- ^[Ss]amples?/
+- ^[Ss]amples?/

package/ext/generated.rb

@@ -26,6 +26,7 @@ module Linguist
       generated_net_specflow_feature_file? ||
       composer_lock? ||
       cargo_lock? ||
+      flake_lock? ||
       node_modules? ||
       go_vendor? ||
       go_lock? ||
@@ -235,6 +236,9 @@ module Linguist
     def cargo_lock?
       !!name.match(/Cargo\.lock/)
     end
+    def flake_lock?
+      !!name.match(/(^|\/)flake\.lock$/)
+    end
     def vcr_cassette?
       return false unless extname == '.yml'
       return false unless lines.count > 2
@@ -392,4 +396,4 @@ module Linguist
       end.select { |x| x.length == 2 }.to_h
     end
   end
-end
+end

package/ext/heuristics.yml

@@ -30,18 +30,22 @@ disambiguations:
   rules:
   - language: AL
     and:
-    - pattern: '\b(?i:(CODEUNIT|PAGE|PAGEEXTENSION|PAGECUSTOMIZATION|DOTNET|ENUM|ENUMEXTENSION|VALUE|QUERY|REPORT|TABLE|TABLEEXTENSION|XMLPORT|PROFILE|CONTROLADDIN))\b'
+    - pattern: '\b(?i:(CODEUNIT|PAGE|PAGEEXTENSION|PAGECUSTOMIZATION|DOTNET|ENUM|ENUMEXTENSION|VALUE|QUERY|REPORT|TABLE|TABLEEXTENSION|XMLPORT|PROFILE|CONTROLADDIN|REPORTEXTENSION|INTERFACE|PERMISSIONSET|PERMISSIONSETEXTENSION|ENTITLEMENT))\b'
   - language: Perl
+- extensions: ['.app']
+  rules:
+  - language: Erlang
+    pattern: '^\{\s*(?:application|''application'')\s*,\s*(?:[a-z]+[\w@]*|''[^'']+'')\s*,\s*\[(?:.|[\r\n])*\]\s*\}\.[ \t]*$'
 - extensions: ['.as']
   rules:
   - language: ActionScript
-    pattern: '^\s*(?:package(?:\s+[\w.]+)?\s+(?:{|$)|import\s+[\w.*]+\s*;|(?=.*?(?:intrinsic|extends))(intrinsic\s+)?class\s+[\w<>.]+(?:\s+extends\s+[\w<>.]+)?|(?:(?:public|protected|private|static)\s+)*(?:(?:var|const|local)\s+\w+\s*:\s*[\w<>.]+(?:\s*=.*)?\s*;|function\s+\w+\s*\((?:\s*\w+\s*:\s*[\w<>.]+\s*(,\s*\w+\s*:\s*[\w<>.]+\s*)*)?\)))'
+    pattern: '^\s*(?:package(?:\s+[\w.]+)?\s+(?:\{|$)|import\s+[\w.*]+\s*;|(?=.*?(?:intrinsic|extends))(intrinsic\s+)?class\s+[\w<>.]+(?:\s+extends\s+[\w<>.]+)?|(?:(?:public|protected|private|static)\s+)*(?:(?:var|const|local)\s+\w+\s*:\s*[\w<>.]+(?:\s*=.*)?\s*;|function\s+\w+\s*\((?:\s*\w+\s*:\s*[\w<>.]+\s*(,\s*\w+\s*:\s*[\w<>.]+\s*)*)?\)))'
 - extensions: ['.asc']
   rules:
   - language: Public Key
     pattern: '^(----[- ]BEGIN|ssh-(rsa|dss)) '
   - language: AsciiDoc
-    pattern: '^[=-]+(\s|\n)|{{[A-Za-z]'
+    pattern: '^[=-]+(\s|\n)|\{\{[A-Za-z]'
   - language: AGS Script
     pattern: '^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])'
 - extensions: ['.asm']
@@ -56,9 +60,15 @@ disambiguations:
 - extensions: ['.bas']
   rules:
   - language: FreeBasic
-    pattern: '^[ \t]*#(?:define|endif|endmacro|ifn?def|if|include|lang|macro)\s'
+    pattern: '^[ \t]*#(?i)(?:define|endif|endmacro|ifn?def|include|lang|macro)(?:$|\s)'
   - language: BASIC
-    pattern: '^\s*\d+'
+    pattern: '\A\s*\d'
+  - language: VBA
+    and:
+    - named_pattern: vb-module
+    - named_pattern: vba
+  - language: Visual Basic 6.0
+    named_pattern: vb-module
 - extensions: ['.bb']
   rules:
   - language: BlitzBasic
@@ -80,7 +90,7 @@ disambiguations:
 - extensions: ['.bi']
   rules:
   - language: FreeBasic
-    pattern: '^[ \t]*#(?:define|endif|endmacro|ifn?def|if|include|lang|macro)\s'
+    pattern: '^[ \t]*#(?i)(?:define|endif|endmacro|ifn?def|if|include|lang|macro)(?:$|\s)'
 - extensions: ['.bs']
   rules:
   - language: Bikeshed
@@ -112,11 +122,11 @@ disambiguations:
   - language: Visual Basic 6.0
     and:
     - named_pattern: vb-class
-    - pattern: '^\s*BEGIN\R\s*MultiUse\s*=.*\R\s*Persistable\s*='
+    - pattern: '^\s*BEGIN(?:\r?\n|\r)\s*MultiUse\s*=.*(?:\r?\n|\r)\s*Persistable\s*='
   - language: VBA
-    named_pattern: vb-class  
+    named_pattern: vb-class
   - language: TeX
-    pattern: '^\s*\\(?:NeedsTeXFormat|ProvidesClass){'
+    pattern: '^\s*\\(?:NeedsTeXFormat|ProvidesClass)\{'
   - language: ObjectScript
     pattern: '^Class\s'
 - extensions: ['.cmp']
@@ -128,7 +138,7 @@ disambiguations:
   - language: Smalltalk
     pattern: '![\w\s]+methodsFor: '
   - language: 'C#'
-    pattern: '^\s*(using\s+[A-Z][\s\w.]+;|namespace\s*[\w\.]+\s*({|;)|\/\/)'
+    pattern: '^\s*(using\s+[A-Z][\s\w.]+;|namespace\s*[\w\.]+\s*(\{|;)|\/\/)'
 - extensions: ['.csc']
   rules:
   - language: GSC
@@ -136,15 +146,15 @@ disambiguations:
 - extensions: ['.csl']
   rules:
   - language: XML
-    pattern: '(?i:^\s*(\<\?xml|xmlns))'
+    pattern: '(?i:^\s*(<\?xml|xmlns))'
   - language: Kusto
     pattern: '(^\|\s*(where|extend|project|limit|summarize))|(^\.\w+)'
 - extensions: ['.d']
   rules:
   - language: D
-    pattern: '^module\s+[\w.]*\s*;|import\s+[\w\s,.:]*;|\w+\s+\w+\s*\(.*\)(?:\(.*\))?\s*{[^}]*}|unittest\s*(?:\(.*\))?\s*{[^}]*}'
+    pattern: '^module\s+[\w.]*\s*;|import\s+[\w\s,.:]*;|\w+\s+\w+\s*\(.*\)(?:\(.*\))?\s*\{[^}]*\}|unittest\s*(?:\(.*\))?\s*\{[^}]*\}'
   - language: DTrace
-    pattern: '^(\w+:\w*:\w*:\w*|BEGIN|END|provider\s+|(tick|profile)-\w+\s+{[^}]*}|#pragma\s+D\s+(option|attributes|depends_on)\s|#pragma\s+ident\s)'
+    pattern: '^(\w+:\w*:\w*:\w*|BEGIN|END|provider\s+|(tick|profile)-\w+\s+\{[^}]*\}|#pragma\s+D\s+(option|attributes|depends_on)\s|#pragma\s+ident\s)'
   - language: Makefile
     pattern: '([\/\\].*:\s+.*\s\\$|: \\$|^[ %]:|^[\w\s\/\\.]+\w+\.\w+\s*:\s+[\w\s\/\\.]+\w+\.\w+)'
 - extensions: ['.dsp']
@@ -158,8 +168,8 @@ disambiguations:
   - language: E
     pattern:
     - '^\s*(def|var)\s+(.+):='
-    - '^\s*(def|to)\s+(\w+)(\(.+\))?\s+{'
-    - '^\s*(when)\s+(\(.+\))\s+->\s+{'
+    - '^\s*(def|to)\s+(\w+)(\(.+\))?\s+\{'
+    - '^\s*(when)\s+(\(.+\))\s+->\s+\{'
   - language: Eiffel
     pattern:
     - '^\s*\w+\s*(?:,\s*\w+)*[:]\s*\w+\s'
@@ -178,7 +188,7 @@ disambiguations:
   - language: Erlang
     pattern: '^\s*(?:%%|main\s*\(.*?\)\s*->)'
   - language: JavaScript
-    pattern: '(?m:\/\/|("|'')use strict\1|export\s+default\s|\/\*.*?\*\/)'
+    pattern: '\/\/|("|'')use strict\1|export\s+default\s|\/\*(?:.|[\r\n])*?\*\/'
 - extensions: ['.ex']
   rules:
   - language: Elixir
@@ -205,34 +215,25 @@ disambiguations:
 - extensions: ['.fr']
   rules:
   - language: Forth
-    pattern: '^(: |also |new-device|previous )'
-  - language: Frege
-    pattern: '^\s*(import|module|package|data|type) '
-  - language: Text
+    pattern: '^(: '- language: Fregepattern: '^\s*(import|module|package|data|type) '- language: Text'
 - extensions: ['.frm']
   rules:
   - language: VBA
     and:
     - named_pattern: vb-form
-    - pattern: '^\s*Begin\s+{[0-9A-Z\-]*}\s?'
+    - pattern: '^\s*Begin\s+\{[0-9A-Z\-]*\}\s?'
   - language: Visual Basic 6.0
     and:
     - named_pattern: vb-form
-    - pattern: '^\s*Begin\s+VB\.Form\s+'  
+    - pattern: '^\s*Begin\s+VB\.Form\s+'
 - extensions: ['.fs']
   rules:
   - language: Forth
-    pattern: '^(: |new-device)'
-  - language: 'F#'
-    pattern: '^\s*(#light|import|let|module|namespace|open|type)'
-  - language: GLSL
-    pattern: '^\s*(#version|precision|uniform|varying|vec[234])'
-  - language: Filterscript
-    pattern: '#include|#pragma\s+(rs|version)|__attribute__'
+    pattern: '^(: '- language: 'F#'pattern: '^\s*(#light|import|let|module|namespace|open|type)'- language: GLSLpattern: '^\s*(#version|precision|uniform|varying|vec[234])'- language: Filterscriptpattern: '#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\])'
+    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']
@@ -250,7 +251,7 @@ disambiguations:
 - extensions: ['.gml']
   rules:
   - language: XML
-    pattern: '(?i:^\s*(\<\?xml|xmlns))'
+    pattern: '(?i:^\s*(<\?xml|xmlns))'
   - language: Graph Modeling Language
     pattern: '(?i:^\s*(graph|node)\s+\[$)'
   - language: Gerber Image
@@ -307,21 +308,21 @@ disambiguations:
     pattern: '^<\?(?:php)?'
   - language: SourcePawn
     pattern:
-    - '^public\s+(?:SharedPlugin(?:\s+|:)__pl_\w+\s*=(?:\s*{)?|(?:void\s+)?__pl_\w+_SetNTVOptional\(\)(?:\s*{)?)'
+    - '^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*;'
     - '^\s*(?:global|local)_var\s+(?:\w+(?:\s*=\s*[\w\-"'']+)?\s*)(?:,\s*\w+(?:\s*=\s*[\w\-"'']+)?\s*)*+\s*;'
-    - '^\s*namespace\s+\w+\s*{'
-    - '^\s*object\s+\w+\s*(?:extends\s+\w+(?:::\w+)?)?\s*{'
-    - '^\s*(?:public\s+|private\s+|\s*)function\s+\w+\s*\([\w\s,]*\)\s*{'
+    - '^\s*namespace\s+\w+\s*\{'
+    - '^\s*object\s+\w+\s*(?:extends\s+\w+(?:::\w+)?)?\s*\{'
+    - '^\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_]+})'
+    - '(?i:^\s*\{\$(?:mode|ifdef|undef|define)[ ]+[a-z0-9_]+\})'
     - '^\s*end[.;]\s*$'
 - extensions: ['.json']
   rules:
@@ -343,7 +344,7 @@ disambiguations:
 - extensions: ['.ls']
   rules:
   - language: LoomScript
-    pattern: '^\s*package\s*[\w\.\/\*\s]*\s*{'
+    pattern: '^\s*package\s*[\w\.\/\*\s]*\s*\{'
   - language: LiveScript
 - extensions: ['.lsp', '.lisp']
   rules:
@@ -368,7 +369,7 @@ disambiguations:
   - language: MATLAB
     pattern: '^\s*%'
   - language: Limbo
-    pattern: '^\w+\s*:\s*module\s*{'
+    pattern: '^\w+\s*:\s*module\s*\{'
 - extensions: ['.m4']
   rules:
   - language: M4Sugar
@@ -438,6 +439,11 @@ disambiguations:
   - language: NL
     pattern: '^(b|g)[0-9]+ '
   - language: NewLisp
+- extensions: ['.nu']
+  rules:
+  - language: Nushell
+    pattern: '^\s*(import|export|module|def|let|let-env) '
+  - language: Nu
 - extensions: ['.odin']
   rules:
   - language: Object Data Instance Notation
@@ -462,20 +468,28 @@ disambiguations:
   - language: Prolog
     pattern: '^[^#]*:-'
   - language: Perl
-    named_pattern: perl5
+    and:
+      - negative_pattern: '^\s*use\s+v6\b'
+      - named_pattern: perl
   - language: Raku
-    named_pattern: perl6
+    named_pattern: raku
 - extensions: ['.plist']
   rules:
   - language: XML Property List
     pattern: '^\s*(?:<\?xml\s|<!DOCTYPE\s+plist|<plist(?:\s+version\s*=\s*(["''])\d+(?:\.\d+)?\1)?\s*>\s*$)'
   - language: OpenStep Property List
+- extensions: ['.plt']
+  rules:
+  - language: Prolog
+    pattern: '^\s*:-'
 - extensions: ['.pm']
   rules:
   - language: Perl
-    named_pattern: perl5
+    and:
+      - negative_pattern: '^\s*use\s+v6\b'
+      - named_pattern: perl
   - language: Raku
-    named_pattern: perl6
+    named_pattern: raku
   - language: X PixMap
     pattern: '^\s*\/\* XPM \*\/'
 - extensions: ['.pod']
@@ -520,7 +534,7 @@ disambiguations:
 - extensions: ['.q']
   rules:
   - language: q
-    pattern: '((?i:[A-Z.][\w.]*:{)|(^|\n)\\(cd?|d|l|p|ts?) )'
+    pattern: '((?i:[A-Z.][\w.]*:\{)|(^|\n)\\(cd?|d|l|p|ts?) )'
   - language: HiveQL
     pattern: '(?i:SELECT\s+[\w*,]+\s+FROM|(CREATE|ALTER|DROP)\s(DATABASE|SCHEMA|TABLE))'
 - extensions: ['.qs']
@@ -541,7 +555,7 @@ disambiguations:
     pattern:
     - '^\s*module\s+type\s'
     - '^\s*(?:include|open)\s+\w+\s*;\s*$'
-    - '^\s*let\s+(?:module\s\w+\s*=\s*{|\w+:\s+.*=.*;\s*$)'
+    - '^\s*let\s+(?:module\s\w+\s*=\s*\{|\w+:\s+.*=.*;\s*$)'
   - language: C++
     pattern:
     - '^\s*#(?:(?:if|ifdef|define|pragma)\s+\w|\s*include\s+<[^>]+>)'
@@ -561,7 +575,7 @@ disambiguations:
 - extensions: ['.rpy']
   rules:
   - language: Python
-    pattern: '(?m:^(import|from|class|def)\s)'
+    pattern: '^(import|from|class|def)\s'
   - language: "Ren'Py"
 - extensions: ['.rs']
   rules:
@@ -613,7 +627,7 @@ disambiguations:
   - language: StringTemplate
     pattern: '\$\w+[($]|(.)!\s*.+?\s*!\1|<!\s*.+?\s*!>|\[!\s*.+?\s*!\]|\{!\s*.+?\s*!\}'
   - language: Smalltalk
-    pattern: '\A\s*[\[{(^"''\w#]|[a-zA-Z_]\w*\s*:=\s*[a-zA-Z_]\w*|class\s*>>\s*[a-zA-Z_]\w*|^[a-zA-Z_]\w*\s+[a-zA-Z_]\w*:|^Class\s*{|if(?:True|False):\s*\['
+    pattern: '\A\s*[\[{(^"''\w#]|[a-zA-Z_]\w*\s*:=\s*[a-zA-Z_]\w*|class\s*>>\s*[a-zA-Z_]\w*|^[a-zA-Z_]\w*\s+[a-zA-Z_]\w*:|^Class\s*\{|if(?:True|False):\s*\['
 - extensions: ['.star']
   rules:
   - language: STAR
@@ -622,11 +636,19 @@ disambiguations:
 - extensions: ['.stl']
   rules:
   - language: STL
-    pattern: '\A\s*solid(?=$|\s)(?m:.*?)\Rendsolid(?:$|\s)'
+    pattern: '\A\s*solid(?=$|\s)(?:.|[\r\n])*?^endsolid(?:$|\s)'
+- extensions: ['.sw']
+  rules:
+  - language: Sway
+    pattern: '^\s*(?:(?:abi|dep|fn|impl|mod|pub|trait)\s|#\[)'
+  - language: XML
+    pattern: '^\s*<\?xml\s+version'
 - extensions: ['.t']
   rules:
   - language: Perl
-    named_pattern: perl5
+    and:
+      - negative_pattern: '^\s*use\s+v6\b'
+      - named_pattern: perl
   - language: Raku
     pattern: '^\s*(?:use\s+v6\b|\bmodule\b|\bmy\s+class\b)'
   - language: Turing
@@ -635,6 +657,10 @@ disambiguations:
   rules:
   - language: Java Server Pages
     pattern: '<%[@!=\s]?\s*(taglib|tag|include|attribute|variable)\s'
+- extensions: ['.tlv']
+  rules:
+  - language: TL-Verilog
+    pattern: '^\\.{0,10}TLV_version'
 - extensions: ['.toc']
   rules:
   - language: World of Warcraft Addon Data
@@ -662,31 +688,12 @@ disambiguations:
   - 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>
-      )*+
-      \]
+    pattern: '\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:
   - language: INI
-    pattern: '^\[InternetShortcut\]\R(?>[^\s\[][^\n]*\R)*URL='
+    pattern: '^\[InternetShortcut\](?:\r?\n|\r)(?>[^\s\[][^\n]*(?:\r?\n|\r))*URL='
 - extensions: ['.v']
   rules:
   - language: Coq
@@ -711,7 +718,7 @@ disambiguations:
   - language: DirectX 3D File
     pattern:  '^xof 030(2|3)(?:txt|bin|tzip|bzip)\b'
   - language: RPC
-    pattern: '\b(program|version)\s+\w+\s*{|\bunion\s+\w+\s+switch\s*\('
+    pattern: '\b(program|version)\s+\w+\s*\{|\bunion\s+\w+\s+switch\s*\('
   - language: Logos
     pattern: '^%(end|ctor|hook|group)\b'
   - language: Linker Script
@@ -765,7 +772,20 @@ named_patterns:
   mdoc-heading: '^[.''][ \t]*Sh +(?:[^"\s]|"[^"]+")'
   mdoc-title:   '^[.''][ \t]*Dt +(?:[^"\s]+|"[^"]+") +"?(?:[1-9]|@[^\s@]+@)'
   objectivec: '^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])'
-  perl5: '\buse\s+(?:strict\b|v?5\.)'
-  perl6: '^\s*(?:use\s+v6\b|\bmodule\b|\b(?:my\s+)?class\b)'
-  vb-class: '^\s*VERSION\s+[0-9]\.[0-9]\s+CLASS'
-  vb-form: '^\s*VERSION\s+[0-9]\.[0-9]{2}'
+  perl:
+  - '\buse\s+(?:strict\b|v?5\b)'
+  - '^\s*use\s+(?:constant|overload)\b'
+  - '^\s*(?:\*|(?:our\s*)?@)EXPORT\s*='
+  - '^\s*package\s+[^\W\d]\w*(?:::\w+)*\s*(?:[;{]|\sv?\d)'
+  - '[\s$][^\W\d]\w*(?::\w+)*->[a-zA-Z_\[({]'
+  raku: '^\s*(?:use\s+v6\b|\bmodule\b|\b(?:my\s+)?class\b)'
+  vb-class: '^[ ]*VERSION [0-9]\.[0-9] CLASS'
+  vb-form: '^[ ]*VERSION [0-9]\.[0-9]{2}'
+  vb-module: '^[ ]*Attribute VB_Name = '
+  vba:
+  - '\b(?:VBA|[vV]ba)(?:\b|[0-9A-Z_])'
+  - '^[ ]*(?:Public|Private)? Declare PtrSafe (?:Sub|Function)\b'
+  - '^[ ]*#If Win64\b'
+  - '^[ ]*(?:Dim|Const) [0-9a-zA-Z_]*[ ]*As Long(?:Ptr|Long)\b'
+  - '^[ ]*Option (?:Private Module|Compare Database)\b'
+  - '(?: '- '\b(?:(?:Active)?VBProjects?|VBComponents?|Application\.(?:VBE|ScreenUpdating))\b'- '\b(?:ThisDrawing|AcadObject|Active(?:Explorer|Inspector|Window\.Presentation|Presentation|Document)|Selection\.(?:Find|Paragraphs))\b'- '\b(?:(?:This|Active)?Workbooks?|Worksheets?|Active(?:Sheet|Chart|Cell)|WorksheetFunction)\b'- '\b(?:Range\(".*|Cells\([0-9a-zA-Z_]*, (?:[0-9a-zA-Z_]*|"[a-zA-Z]{1,3}"))\)''