github-linguist 7.25.0 → 7.26.0

data/grammars/text.pseudoxml.json

@@ -0,0 +1 @@
+{"name":"Docutils pseudo-XML","scopeName":"text.pseudoxml","patterns":[{"include":"#main"}],"repository":{"attr":{"patterns":[{"include":"#attr-quoted"},{"include":"#attr-unquoted"},{"include":"#attr-boolean"}]},"attr-boolean":{"name":"meta.attribute.without-value.pseudoxml","match":"(?:\\G|^|(?\u003c=\\s))([^\\s\u003c\u003e\"'=]+)(?=\\s*\u003e|\\s+[^\\s\u003c\u003e=])","captures":{"1":{"name":"entity.other.attribute-name.pseudoxml"}}},"attr-quoted":{"name":"meta.attribute.with-value.quoted.pseudoxml","begin":"(?:\\G|^|(?\u003c=\\s))([^\\s\u003c\u003e\"'=]+)\\s*(=)\\s*(?=\"|')","end":"(?!\\G)","patterns":[{"include":"#str"}],"beginCaptures":{"1":{"name":"entity.other.attribute-name.pseudoxml"},"2":{"patterns":[{"include":"#punct"}]}}},"attr-unquoted":{"name":"meta.attribute.with-value.unquoted.pseudoxml","contentName":"string.unquoted.pseudoxml","begin":"(?:\\G|^|(?\u003c=\\s))([^\\s\u003c\u003e\"'=]+)\\s*(=)\\s*(?=[^\\s\"'\u003c\u003e])","end":"(?=\\s\"'\u003c\u003e)","beginCaptures":{"1":{"name":"entity.other.attribute-name.pseudoxml"},"2":{"patterns":[{"include":"#punct"}]}}},"comment":{"name":"comment.block.pseudoxml","begin":"^[ \\t]*(\u003c!--)","end":"--\u003e","beginCaptures":{"1":{"name":"punctuation.definition.comment.begin.pseudoxml"}},"endCaptures":{"0":{"name":"punctuation.definition.comment.end.pseudoxml"}}},"error":{"contentName":"invalid.illegal.message.error.pseudoxml","begin":"^[ \\t]+(?=[^\\s\u003c])","end":"$"},"esc-codepoint":{"patterns":[{"name":"constant.character.entity.2-digit.hexadecimal.hex.pseudoxml","match":"(\\\\)x([A-Fa-f0-9]{2})","captures":{"1":{"patterns":[{"include":"#punct"}]}}},{"name":"constant.character.entity.4-digit.hexadecimal.hex.pseudoxml","match":"(\\\\)u[A-Fa-f0-9]{4}","captures":{"1":{"patterns":[{"include":"#punct"}]}}},{"name":"constant.character.entity.8-digit.hexadecimal.hex.pseudoxml","match":"(\\\\)U[A-Fa-f0-9]{8}","captures":{"1":{"patterns":[{"include":"#punct"}]}}},{"name":"constant.character.entity.octal.oct.pseudoxml","match":"(\\\\)[0-7]{1,3}","captures":{"1":{"patterns":[{"include":"#punct"}]}}}]},"esc-named":{"name":"constant.character.named.escape.pseudoxml","match":"(\\\\)[\\\\abfnrtv]","captures":{"1":{"patterns":[{"include":"#punct"}]}}},"esc-quote":{"patterns":[{"include":"#esc-quote-double"},{"include":"#esc-quote-single"}]},"esc-quote-double":{"name":"constant.character.quote.escape.double.pseudoxml","match":"(\\\\)\"","captures":{"1":{"patterns":[{"include":"#punct"}]}}},"esc-quote-single":{"name":"constant.character.quote.escape.single.pseudoxml","match":"(\\\\)'","captures":{"1":{"patterns":[{"include":"#punct"}]}}},"main":{"patterns":[{"include":"#node"},{"include":"#text"},{"include":"#comment"}]},"node":{"patterns":[{"include":"#node-comment"},{"include":"#node-sysmsg"},{"include":"#node-strong"},{"include":"#node-emphasis"},{"include":"#node-literal"},{"include":"#node-problematic"},{"include":"#node-other"}]},"node-comment":{"name":"meta.element.node.comment.pseudoxml","contentName":"comment.block.element.pseudoxml","begin":"^([ \\t]*)((\u003c)(comment)(\\s+[^\u003c\u003e]+)?\\s*(\u003e))[ \\t]*$","end":"^(?!\\s*$|\\1(?:\\t+| {2,})\\S)","patterns":[{"include":"#main"}],"beginCaptures":{"2":{"name":"meta.tag.pseudoxml"},"3":{"patterns":[{"include":"#punct"}]},"4":{"name":"entity.name.tag.node.pseudoxml"},"5":{"patterns":[{"include":"#attr"}]},"6":{"patterns":[{"include":"#punct"}]}}},"node-emphasis":{"name":"meta.element.node.emphasis.pseudoxml","contentName":"markup.italic.emphasis.pseudoxml","begin":"(?i)^([ \\t]*)((\u003c)(emphasis)(\\s+[^\u003c\u003e]+)?\\s*(\u003e))[ \\t]*$","end":"^(?!\\s*$|\\1(?:\\t+| {2,})\\S)","patterns":[{"include":"#main"}],"beginCaptures":{"2":{"name":"meta.tag.pseudoxml"},"3":{"patterns":[{"include":"#punct"}]},"4":{"name":"entity.name.tag.node.pseudoxml"},"5":{"patterns":[{"include":"#attr"}]},"6":{"patterns":[{"include":"#punct"}]}}},"node-literal":{"name":"meta.element.node.monospaced-text.pseudoxml","contentName":"markup.raw.monospace.literal.pseudoxml","begin":"(?i)^([ \\t]*)((\u003c)(literal(?:_block)?)(\\s+[^\u003c\u003e]+)?\\s*(\u003e))[ \\t]*$","end":"^(?!\\s*$|\\1(?:\\t+| {2,})\\S)","patterns":[{"include":"#main"}],"beginCaptures":{"2":{"name":"meta.tag.pseudoxml"},"3":{"patterns":[{"include":"#punct"}]},"4":{"name":"entity.name.tag.node.pseudoxml"},"5":{"patterns":[{"include":"#attr"}]},"6":{"patterns":[{"include":"#punct"}]}}},"node-other":{"name":"meta.element.node.${4:/downcase}.pseudoxml","begin":"^([ \\t]*)((\u003c)([-\\w:]+)(\\s+[^\u003c\u003e]+)?\\s*(\u003e))[ \\t]*$","end":"^(?!\\s*$|\\1(?:\\t+| {2,})\\S)","patterns":[{"include":"#main"}],"beginCaptures":{"2":{"name":"meta.tag.pseudoxml"},"3":{"patterns":[{"include":"#punct"}]},"4":{"name":"entity.name.tag.node.pseudoxml"},"5":{"patterns":[{"include":"#attr"}]},"6":{"patterns":[{"include":"#punct"}]}}},"node-problematic":{"name":"meta.element.node.problematic.error.pseudoxml","contentName":"message.error.invalid.pseudoxml","begin":"^([ \\t]*)((\u003c)((problematic))(\\s+[^\u003c\u003e]+)?\\s*(\u003e))[ \\t]*$","end":"^(?!\\s*$|\\1(?:\\t+| {2,})\\S)","patterns":[{"include":"#error"},{"include":"#main"}],"beginCaptures":{"2":{"name":"meta.tag.pseudoxml"},"3":{"patterns":[{"include":"#punct"}]},"4":{"name":"entity.name.tag.node.pseudoxml"},"5":{"name":"sublimelinter.mark.error.invalid"},"6":{"patterns":[{"include":"#attr"}]},"7":{"patterns":[{"include":"#punct"}]}}},"node-strong":{"name":"meta.element.node.strong.pseudoxml","contentName":"markup.bold.emphasis.strong.pseudoxml","begin":"(?i)^([ \\t]*)((\u003c)(strong)(\\s+[^\u003c\u003e]+)?\\s*(\u003e))[ \\t]*$","end":"^(?!\\s*$|\\1(?:\\t+| {2,})\\S)","patterns":[{"include":"#main"}],"beginCaptures":{"2":{"name":"meta.tag.pseudoxml"},"3":{"patterns":[{"include":"#punct"}]},"4":{"name":"entity.name.tag.node.pseudoxml"},"5":{"patterns":[{"include":"#attr"}]},"6":{"patterns":[{"include":"#punct"}]}}},"node-sysmsg":{"patterns":[{"include":"#node-sysmsg-error"},{"include":"#node-sysmsg-warning"}]},"node-sysmsg-error":{"name":"meta.element.node.system-message.error.pseudoxml","begin":"(?ix)^([ \\t]*)((\u003c)((system_message))(?=\n\t\\s+ [^\u003c\u003e]*? (?\u003c=\\s)\n\t(?: level \\s* = \\s* (\"|'|\\b) (?:[3-9]|[1-9]+[0-9]+) \\6\n\t|    type \\s* = \\s* (\"|'|\\b) (?:ERROR|SEVERE)       \\7\n\t)\n) (\\s+[^\u003c\u003e]+) \\s* (\u003e)) [ \\t]*$","end":"^(?!\\s*$|\\1(?:\\t+| {2,})\\S)","patterns":[{"name":"meta.element.node.paragraph.error-message.pseudoxml","contentName":"message.error.invalid.pseudoxml","begin":"^([ \\t]+)((\u003c)(paragraph)(\\s+[^\u003c\u003e]+)?\\s*(\u003e))[ \\t]*$","end":"^(?!\\s*$|\\1(?:\\t+| {2,})\\S)","patterns":[{"include":"#error"},{"include":"#main"}],"beginCaptures":{"2":{"name":"meta.tag.pseudoxml"},"3":{"patterns":[{"include":"#punct"}]},"4":{"name":"entity.name.tag.node.pseudoxml"},"5":{"patterns":[{"include":"#attr"}]},"6":{"patterns":[{"include":"#punct"}]}}},{"include":"#main"}],"beginCaptures":{"2":{"name":"meta.tag.pseudoxml"},"3":{"patterns":[{"include":"#punct"}]},"4":{"name":"entity.name.tag.node.pseudoxml"},"5":{"name":"sublimelinter.mark.error.invalid"},"8":{"patterns":[{"include":"#attr"}]},"9":{"patterns":[{"include":"#punct"}]}}},"node-sysmsg-warning":{"name":"meta.element.node.system-message.warning.pseudoxml","contentName":"sublimelinter.mark.warning.invalid","begin":"(?ix)^([ \\t]*)((\u003c)((system_message))(?=\n\t\\s+ [^\u003c\u003e]*? (?\u003c=\\s)\n\t(?: level \\s* = \\s* (\"|'|\\b) 2       \\6\n\t|    type \\s* = \\s* (\"|'|\\b) WARNING \\7\n\t)\n) (\\s+[^\u003c\u003e]+) \\s* (\u003e)) [ \\t]*$","end":"^(?!\\s*$|\\1(?:\\t+| {2,})\\S)","patterns":[{"include":"#main"}],"beginCaptures":{"2":{"name":"meta.tag.pseudoxml"},"3":{"patterns":[{"include":"#punct"}]},"4":{"name":"entity.name.tag.node.pseudoxml"},"5":{"name":"sublimelinter.mark.warning.invalid"},"8":{"patterns":[{"include":"#attr"}]},"9":{"patterns":[{"include":"#punct"}]}}},"punct":{"patterns":[{"name":"punctuation.definition.escape.backslash.pseudoxml","match":"\\\\"},{"name":"punctuation.definition.tag.begin.pseudoxml","match":"\u003c","captures":{"0":{"name":"sublimelinter.gutter-mark"}}},{"name":"punctuation.definition.tag.end.pseudoxml","match":"\u003e","captures":{"0":{"name":"sublimelinter.gutter-mark"}}},{"name":"keyword.operator.assignment.attribute.pseudoxml","match":"=","captures":{"0":{"name":"punctuation.separator.key-value.pseudoxml"}}}]},"str":{"patterns":[{"include":"#str-double"},{"include":"#str-single"}]},"str-double":{"name":"string.quoted.double.pseudoxml","begin":"\\G\"","end":"(\")|([^\u003c\u003e\"]*+)(?=\u003e|$)","beginCaptures":{"0":{"name":"punctuation.definition.string.begin.pseudoxml"}},"endCaptures":{"1":{"name":"punctuation.definition.string.end.pseudoxml"},"2":{"name":"invalid.illegal.unclosed.string.pseudoxml"}}},"str-single":{"name":"string.quoted.single.pseudoxml","begin":"\\G'","end":"(')|([^\u003c\u003e']*+)(?=\u003e|$)","beginCaptures":{"0":{"name":"punctuation.definition.string.begin.pseudoxml"}},"endCaptures":{"1":{"name":"punctuation.definition.string.end.pseudoxml"},"2":{"name":"invalid.illegal.unclosed.string.pseudoxml"}}},"text":{"name":"meta.text.node.pseudoxml","begin":"^([ \\t]*)((\u003c)(#text))(\u003e)[ \\t]*$","end":"^(?!\\s*$|\\1(?:\\t+| {2,})\\S)","patterns":[{"name":"meta.text.fragment.pseudoxml","begin":"^[ \\t]+(?='|\")","end":"(?!\\G)","patterns":[{"include":"#str"}]}],"beginCaptures":{"2":{"name":"meta.tag.pseudoxml"},"3":{"patterns":[{"include":"#punct"}]},"4":{"name":"markup.list.strings.pseudoxml"},"5":{"patterns":[{"include":"#punct"}]}}}},"injections":{"meta.text.fragment.pseudoxml string.quoted":{"patterns":[{"include":"#esc-codepoint"},{"include":"#esc-named"}]},"meta.text.fragment.pseudoxml string.quoted.double":{"patterns":[{"include":"#esc-quote-double"}]},"meta.text.fragment.pseudoxml string.quoted.single":{"patterns":[{"include":"#esc-quote-single"}]}}}

data/grammars/version

@@ -1 +1 @@
-7.25.0
+7.26.0

data/lib/linguist/VERSION

@@ -1 +1 @@
-7.25.0
+7.26.0

data/lib/linguist/heuristics.yml

@@ -64,17 +64,17 @@ disambiguations:
 - extensions: ['.app']
   rules:
   - language: Erlang
-    pattern: '(?m)^{\s*(?:application|''application'')\s*,\s*(?:[a-z]+[\w@]*|''[^'']+'')\s*,\s*\[.*?\]\s*}\.[ \t]*$'
+    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']
@@ -89,9 +89,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: '^\A\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
@@ -113,7 +119,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
@@ -145,11 +151,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']
@@ -161,7 +167,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
@@ -169,7 +175,7 @@ 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']
@@ -177,10 +183,10 @@ disambiguations:
   - language: D
     # see http://dlang.org/spec/grammar
     # ModuleDeclaration | ImportDeclaration | FuncDeclaration | unittest
-    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
     # see http://dtrace.org/guide/chp-prog.html, http://dtrace.org/guide/chp-profile.html, http://dtrace.org/guide/chp-opt.html
-    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
     # path/target : dependency \
     # target : \
@@ -198,8 +204,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'
@@ -218,7 +224,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
@@ -254,11 +260,11 @@ disambiguations:
   - 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
@@ -272,7 +278,7 @@ disambiguations:
 - 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']
@@ -290,7 +296,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
@@ -347,21 +353,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:
@@ -383,7 +389,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:
@@ -408,7 +414,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
@@ -478,6 +484,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
@@ -568,7 +579,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']
@@ -589,7 +600,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+<[^>]+>)'
@@ -609,7 +620,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:
@@ -666,7 +677,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
@@ -675,7 +686,7 @@ 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
@@ -696,6 +707,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
@@ -752,7 +767,7 @@ disambiguations:
 - 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
@@ -777,7 +792,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
@@ -838,5 +853,22 @@ named_patterns:
   - '^\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: '^\s*VERSION\s+[0-9]\.[0-9]\s+CLASS'
-  vb-form: '^\s*VERSION\s+[0-9]\.[0-9]{2}'
+  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_])'
+    # VBA7 new 64-bit features
+  - '^[ ]*(?:Public|Private)? Declare PtrSafe (?:Sub|Function)\b'
+  - '^[ ]*#If Win64\b'
+  - '^[ ]*(?:Dim|Const) [0-9a-zA-Z_]*[ ]*As Long(?:Ptr|Long)\b'
+  # Top module declarations unique to VBA
+  - '^[ ]*Option (?:Private Module|Compare Database)\b'
+  # General VBA libraries and objects
+  - '(?: |\()(?:Access|Excel|Outlook|PowerPoint|Visio|Word|VBIDE)\.\w'
+  - '\b(?:(?:Active)?VBProjects?|VBComponents?|Application\.(?:VBE|ScreenUpdating))\b'
+  # AutoCAD, Outlook, PowerPoint and Word objects
+  - '\b(?:ThisDrawing|AcadObject|Active(?:Explorer|Inspector|Window\.Presentation|Presentation|Document)|Selection\.(?:Find|Paragraphs))\b'
+  # Excel objects
+  - '\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}"))\)'