Skip to content

fix ReDim, ByRef/ByVal and Dim storage size highlighting #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mithom wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix ReDim, ByRef/ByVal and Dim storage size highlighting #64

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45b2faa
Update vbs.tmLanguage.json, fix ByRef/ByVal, fix Redim and fix storag…
mithom Oct 13, 2025
2d64bfd
remove unused capture group names
mithom Oct 13, 2025
cc0d0b2
bring back comment edit
mithom Oct 13, 2025
eb3e738
remove unused replaced old byval/byref object
mithom Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 33 additions & 16 deletions syntaxes/vbs.tmLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"version": "https://github.com/textmate/asp.vb.net.tmbundle/commit/72d44550b3286d0382d7be0624140cf97857ff69",
"name": "VBScript",
"scopeName": "source.vbs",
"comment": "Modified from the original ASP bundle. Originally modified by Thomas Aylott subtleGradient.com",
"comment": "Modified from the original ASP bundle. Originally modified by Thomas Aylott subtleGradient.com, afterwards editted by mi_thom (github)",
"patterns": [
{
"match": "\\n",
Expand Down Expand Up @@ -58,8 +58,8 @@
"match": "(?i:'|Rem\\b).*$"
},
{
"comment": "function definition",
"captures": {
"comment": "function definition with args",
"beginCaptures": {
"1": {
"name": "storage.modifier.vbs"
},
Expand All @@ -71,29 +71,46 @@
},
"4": {
"name": "punctuation.definition.parameters.begin.vbs"
}
},
"endCaptures":{
"0":{
"name":"punctuation.definition.parameters.end.vbs"
}
},
"contentName": "variable.parameter.function.vbs",
"patterns":[
{
"match": "(?<=\\b)(?i:ByRef|ByVal)(?=\\b)",
"name": "storage.modifier.vbs"
}
],
"begin": "(?i:(Private|Public)[\\t ]+)?(?i:(Class|Function|Sub|(?:Default\\s+)?Property [GLS]et))[\\t ]+(\\[?[a-zA-Z]\\w*\\]?)[\\t ]*(\\()",
"end": "\\)"
},
{
"comment": "function definition without args",
"captures": {
"1": {
"name": "storage.modifier.vbs"
},
"5": {
"name": "variable.parameter.function.vbs"
"2": {
"name": "storage.type.function.vbs"
},
"6": {
"name": "punctuation.definition.parameters.end.vbs"
"3": {
"name": "entity.name.function.vbs"
}
},
"match": "(?i:(Private|Public)[\\t ]+)?(?i:(Class|Function|Sub|(?:Default\\s+)?Property [GLS]et))[\\t ]+(\\[?[a-zA-Z]\\w*\\]?)[\\t ]*(?:(\\()([^)]*)(\\)))?"
"match": "(?i:(Private|Public)[\\t ]+)?(?i:(Class|Function|Sub|(?:Default\\s+)?Property [GLS]et))[\\t ]+(\\[?[a-zA-Z]\\w*\\]?)[\\t ]*"
},
{
"match": "(?i:End[\\t ]+(Sub|Function|Class|Property))",
"name": "storage.type.end.vbs"
},
{
"match": "(?i:\\s*\\b(Redim|Redim Preserve|With|End With|New|Randomize|Option Explicit|On Error Resume Next|On Error GoTo|Stop)\\b\\s*)",
"match": "(?i:\\s*\\b(With|End With|New|Randomize|Option Explicit|On Error Resume Next|On Error GoTo|Stop)\\b\\s*)",
"name": "keyword.control.vbs"
},
{
"comment": "not working (in only valid place), overwirtten by variable.parameter.function.vbs",
"match": "(?i:\\b(ByRef|ByVal)\\b)",
"name": "storage.modifier.vbs"
},
{
"match": "(?i:\\b(Call|If|Then|Else|ElseIf|End If|Set|While|Wend|For|Step|To|Each|In|Case|Select|End Select|Continue|Do|Until|Loop|Next|Exit (Do|For|Function|Property|Sub))\\b)",
"name": "keyword.control.vbs"
Expand All @@ -111,7 +128,7 @@
"name": "variable.other.dim.vbs"
}
},
"match": "\\b(?i:((?:public|private)\\s+const|public|private|dim|const)\\s+\\b(\\[?[a-zA-Z]\\w*\\]?\\b(?:\\s*,\\s*\\b\\[?[a-zA-Z]\\w*\\]?\\b)*))"
"match": "\\b(?i:((?:public|private)\\s+const|public|private|dim|const|redim(?: preserve)?)\\s+(\\[?[a-zA-Z]\\w*\\]?(?:\\s*\\(\\s*\\d*\\s*\\))?(?:\\s*,\\s*\\[?[a-zA-Z]\\w*\\]?(?:\\s*\\(\\s*\\d*\\s*\\))?)*))"
},
{
"match": "(?i:\\s*\\b(Empty|False|Nothing|Null|True)\\b)",
Expand Down Expand Up @@ -175,4 +192,4 @@
"name": "variable.other.member.vbs"
}
]
}
}