diff --git a/tool/test.tmlanguage b/tool/test.tmlanguage
new file mode 100644
index 00000000..5481f2d8
--- /dev/null
+++ b/tool/test.tmlanguage
@@ -0,0 +1,58 @@
+
+
+
+
+ comment
+ Modified from the original ASP bundle. Originally modified by Thomas Aylott subtleGradient.com
+ fileTypes
+
+ vbs
+ vbe
+ wsf
+ wsc
+
+ foldingStartMarker
+ (<(?i:(head|table|div|style|script|ul|ol|form|dl))\b.*?>|\{|^\s*<?%?\s*'?\s*(?i:(sub|private\s+Sub|public\s+Sub|function|if|while|For))\s*.*$)
+ foldingStopMarker
+ (</(?i:(head|table|div|style|script|ul|ol|form|dl))>?|\}|^\s*<?%?\s*\s*'?\s*(?i:(end|Next))\s*.*$)
+ keyEquivalent
+ ^~A
+ name
+ VBScript
+ patterns
+
+
+ begin
+ ^(?=\t)
+ end
+ (?=[^\t])
+ name
+ meta.leading-space
+ patterns
+
+
+ captures
+
+ 1
+
+ name
+ meta.odd-tab.tabs
+
+ 2
+
+ name
+ meta.even-tab.tabs
+
+
+ match
+ (\t)(\t)?
+
+
+
+
+ scopeName
+ source.vbs
+ uuid
+ 7F9C9343-D48E-4E7D-BFE8-F680714DCD3E
+
+
\ No newline at end of file
diff --git a/tool/tmlanguage.js b/tool/tmlanguage.js
index 3694d003..5f024eba 100644
--- a/tool/tmlanguage.js
+++ b/tool/tmlanguage.js
@@ -103,13 +103,14 @@ function transformRegExp(str) {
str = removeXFlag(str);
str = checkForLookBehind(str);
str = checkForInvariantRegex(str);
+ str = str.replace(/\\n(?!\?).?/, '$'); // replace newlines by $ except if its postfixed by ?
return str;
}
function assembleStateObjs(strState, pattern) {
+ console.log("assembleStateObjs", strState, pattern);
var patterns = pattern.patterns;
var stateObj = {};
- var tokenElem = [];
if (patterns) {
for (var p in patterns) {
@@ -119,27 +120,41 @@ function assembleStateObjs(strState, pattern) {
stateObj.include = patterns[p].include;
}
else {
- stateObj.token = patterns[p].name;
+ if (patterns[p].captures)
+ stateObj.token = extractCaptures(patterns[p].captures);
+ else
+ stateObj.token = patterns[p].name;
+
stateObj.regex = transformRegExp(patterns[p].match);
}
statesObj[strState].push(stateObj);
}
+
+ statesObj[strState].push({
+ token: pattern.name,
+ regex: transformRegExp(pattern.end),
+ merge: true,
+ next: "start"
+ });
stateObj = {};
- stateObj.token = [];
- stateObj.regex = transformRegExp(pattern.end);
- stateObj.next = "start";
+ stateObj.token = pattern.name;
+ stateObj.regex = ".";
+ stateObj.merge = true;
+ stateObj.next = strState;
}
else {
- stateObj.token = [];
- stateObj.regex = transformRegExp(pattern.end);
- stateObj.next = "start";
-
- statesObj[strState].push(stateObj);
-
+ statesObj[strState].push({
+ token: pattern.name,
+ regex: transformRegExp(pattern.end),
+ merge: true,
+ next: "start"
+ });
+
stateObj = {};
- stateObj.token = [];
- stateObj.regex = ".+";
+ stateObj.token = pattern.name;
+ stateObj.regex = ".";
+ stateObj.merge = true;
stateObj.next = strState;
}
@@ -222,8 +237,8 @@ function extractPatterns(patterns) {
}
else if (pattern.include) {
- tokenObj.token.push(pattern.include);
- tokenObj.regex = "";
+ // f*ck it
+ return;
}
else {
diff --git a/tool/vbs.tmlanguage b/tool/vbs.tmlanguage
new file mode 100644
index 00000000..fb46c054
--- /dev/null
+++ b/tool/vbs.tmlanguage
@@ -0,0 +1,362 @@
+
+
+
+
+ comment
+ Modified from the original ASP bundle. Originally modified by Thomas Aylott subtleGradient.com
+ fileTypes
+
+ vbs
+ vbe
+ wsf
+ wsc
+
+ foldingStartMarker
+ (<(?i:(head|table|div|style|script|ul|ol|form|dl))\b.*?>|\{|^\s*<?%?\s*'?\s*(?i:(sub|private\s+Sub|public\s+Sub|function|if|while|For))\s*.*$)
+ foldingStopMarker
+ (</(?i:(head|table|div|style|script|ul|ol|form|dl))>?|\}|^\s*<?%?\s*\s*'?\s*(?i:(end|Next))\s*.*$)
+ keyEquivalent
+ ^~A
+ name
+ VBScript
+ patterns
+
+
+ match
+ \n
+ name
+ meta.ending-space
+
+
+ include
+ #round-brackets
+
+
+ begin
+ ^(?=\t)
+ end
+ (?=[^\t])
+ name
+ meta.leading-space
+ patterns
+
+
+ captures
+
+ 1
+
+ name
+ meta.odd-tab.tabs
+
+ 2
+
+ name
+ meta.even-tab.tabs
+
+
+ match
+ (\t)(\t)?
+
+
+
+
+ begin
+ ^(?= )
+ end
+ (?=[^ ])
+ name
+ meta.leading-space
+ patterns
+
+
+ captures
+
+ 1
+
+ name
+ meta.odd-tab.spaces
+
+ 2
+
+ name
+ meta.even-tab.spaces
+
+
+ match
+ ( )( )?
+
+
+
+
+ captures
+
+ 1
+
+ name
+ storage.type.function.asp
+
+ 2
+
+ name
+ entity.name.function.asp
+
+ 3
+
+ name
+ punctuation.definition.parameters.asp
+
+ 4
+
+ name
+ variable.parameter.function.asp
+
+ 5
+
+ name
+ punctuation.definition.parameters.asp
+
+
+ match
+ ^\s*((?i:function|sub))\s*([a-zA-Z_]\w*)\s*(\()([^)]*)(\)).*\n?
+ name
+ meta.function.asp
+
+
+ begin
+ ('|REM)
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.definition.comment.asp
+
+
+ end
+ (?=(\n|%>))
+ name
+ comment.line.apostrophe.asp
+
+
+ match
+ (?i:\b(If|Then|Else|ElseIf|Else If|End If|While|Wend|For|To|Each|Case|Select|End Select|Return|Continue|Do|Until|Loop|Next|With|Exit Do|Exit For|Exit Function|Exit Property|Exit Sub|IIf)\b)
+ name
+ keyword.control.asp
+
+
+ match
+ (?i:\b(Mod|And|Not|Or|Xor|as)\b)
+ name
+ keyword.operator.asp
+
+
+ captures
+
+ 1
+
+ name
+ storage.type.asp
+
+ 2
+
+ name
+ variable.other.bfeac.asp
+
+ 3
+
+ name
+ meta.separator.comma.asp
+
+
+ match
+ (?i:(dim)\s*(?:(\b[a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?\b)\s*(,?)))
+ name
+ variable.other.dim.asp
+
+
+ match
+ (?i:\s*\b(Call|Class|Const|Dim|Redim|Function|Sub|Private Sub|Public Sub|End sub|End Function|Set|Let|Get|New|Randomize|Option Explicit|On Error Resume Next|On Error GoTo)\b\s*)
+ name
+ storage.type.asp
+
+
+ match
+ (?i:\b(Private|Public|Default)\b)
+ name
+ storage.modifier.asp
+
+
+ match
+ (?i:\s*\b(Empty|False|Nothing|Null|True)\b)
+ name
+ constant.language.asp
+
+
+ begin
+ "
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.begin.asp
+
+
+ end
+ "
+ endCaptures
+
+ 0
+
+ name
+ punctuation.definition.string.end.asp
+
+
+ name
+ string.quoted.double.asp
+ patterns
+
+
+ match
+ ""
+ name
+ constant.character.escape.apostrophe.asp
+
+
+
+
+ captures
+
+ 1
+
+ name
+ punctuation.definition.variable.asp
+
+
+ match
+ (\$)[a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?\b\s*
+ name
+ variable.other.asp
+
+
+ match
+ (?i:\b(Application|ObjectContext|Request|Response|Server|Session)\b)
+ name
+ support.class.asp
+
+
+ match
+ (?i:\b(Contents|StaticObjects|ClientCertificate|Cookies|Form|QueryString|ServerVariables)\b)
+ name
+ support.class.collection.asp
+
+
+ match
+ (?i:\b(TotalBytes|Buffer|CacheControl|Charset|ContentType|Expires|ExpiresAbsolute|IsClientConnected|PICS|Status|ScriptTimeout|CodePage|LCID|SessionID|Timeout)\b)
+ name
+ support.constant.asp
+
+
+ match
+ (?i:\b(Lock|Unlock|SetAbort|SetComplete|BianryRead|AddHeader|AppendToLog|BinaryWrite|Clear|End|Flush|Redirect|Write|CreateObject|HTMLEncode|MapPath|URLEncode|Abandon|Convert|Regex)\b)
+ name
+ support.function.asp
+
+
+ match
+ (?i:\b(Application_OnEnd|Application_OnStart|OnTransactionAbort|OnTransactionCommit|Session_OnEnd|Session_OnStart)\b)
+ name
+ support.function.event.asp
+
+
+ match
+ (?i:(?<=as )(\b[a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?\b))
+ name
+ support.type.vb.asp
+
+
+ match
+ (?i:\b(Array|Add|Asc|Atn|CBool|CByte|CCur|CDate|CDbl|Chr|CInt|CLng|Conversions|Cos|CreateObject|CSng|CStr|Date|DateAdd|DateDiff|DatePart|DateSerial|DateValue|Day|Derived|Math|Escape|Eval|Exists|Exp|Filter|FormatCurrency|FormatDateTime|FormatNumber|FormatPercent|GetLocale|GetObject|GetRef|Hex|Hour|InputBox|InStr|InStrRev|Int|Fix|IsArray|IsDate|IsEmpty|IsNull|IsNumeric|IsObject|Item|Items|Join|Keys|LBound|LCase|Left|Len|LoadPicture|Log|LTrim|RTrim|Trim|Maths|Mid|Minute|Month|MonthName|MsgBox|Now|Oct|Remove|RemoveAll|Replace|RGB|Right|Rnd|Round|ScriptEngine|ScriptEngineBuildVersion|ScriptEngineMajorVersion|ScriptEngineMinorVersion|Second|SetLocale|Sgn|Sin|Space|Split|Sqr|StrComp|String|StrReverse|Tan|Time|Timer|TimeSerial|TimeValue|TypeName|UBound|UCase|Unescape|VarType|Weekday|WeekdayName|Year)\b)
+ name
+ support.function.vb.asp
+
+
+ match
+ -?\b(?:(?:0(?:x|X)[0-9a-fA-F]*)|(?:(?:[0-9]+\.?[0-9]*)|(?:\.[0-9]+))(?:(?:e|E)(?:\+|-)?[0-9]+)?)(?:L|l|UL|ul|u|U|F|f)?\b
+ name
+ constant.numeric.asp
+
+
+ match
+ (?i:\b(vbtrue|fvbalse|vbcr|vbcrlf|vbformfeed|vblf|vbnewline|vbnullchar|vbnullstring|int32|vbtab|vbverticaltab|vbbinarycompare|vbtextcomparevbsunday|vbmonday|vbtuesday|vbwednesday|vbthursday|vbfriday|vbsaturday|vbusesystemdayofweek|vbfirstjan1|vbfirstfourdays|vbfirstfullweek|vbgeneraldate|vblongdate|vbshortdate|vblongtime|vbshorttime|vbobjecterror|vbEmpty|vbNull|vbInteger|vbLong|vbSingle|vbDouble|vbCurrency|vbDate|vbString|vbObject|vbError|vbBoolean|vbVariant|vbDataObject|vbDecimal|vbByte|vbArray)\b)
+ name
+ support.type.vb.asp
+
+
+ captures
+
+ 1
+
+ name
+ entity.name.function.asp
+
+
+ match
+ (?i:(\b[a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?\b)(?=\(\)?))
+ name
+ support.function.asp
+
+
+ match
+ (?i:((?<=(\+|=|-|\&|\\|/|<|>|\(|,))\s*\b([a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?)\b(?!(\(|\.))|\b([a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?)\b(?=\s*(\+|=|-|\&|\\|/|<|>|\(|\)))))
+ name
+ variable.other.asp
+
+
+ match
+ !|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|/=|%=|\+=|\-=|&=|\^=|\b(in|instanceof|new|delete|typeof|void)\b
+ name
+ keyword.operator.js
+
+
+ repository
+
+ round-brackets
+
+ begin
+ \(
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.section.round-brackets.begin.asp
+
+
+ end
+ \)
+ endCaptures
+
+ 0
+
+ name
+ punctuation.section.round-brackets.end.asp
+
+
+ name
+ meta.round-brackets
+ patterns
+
+
+ include
+ source.vbs
+
+
+
+
+ scopeName
+ source.vbs
+ uuid
+ 7F9C9343-D48E-4E7D-BFE8-F680714DCD3E
+
+
\ No newline at end of file