Skip to content

Commit

Permalink
Merge branch '4.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
@peters-ben-0007
peters-ben-0007 committed Jul 5, 2014
2 parents a9d4cb4 + 18bcb51 commit 2688695
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 23 deletions.
33 changes: 24 additions & 9 deletions vbdotnet.JSON-tmLanguage
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
{ "include": "#importDefinition" },
{ "include": "#numericConstant" },
{ "include": "#characterOperator" },
{ "include": "#lineContinuationOperator" },
{ "include": "#wordOperator" },
{ "include": "#languageContants" },
{ "include": "#compilerDirectives" },
{ "include": "#supportTypes" },
{ "include": "#suportFunctions" },
{ "include": "#linqKeywords" },
Expand All @@ -20,13 +22,14 @@
{ "include": "#interfaceDefinition" },
{ "include": "#classDefinition" },
{ "include": "#functionDefinition" },
{ "include": "#lambdaDefinition" },
{ "include": "#propertyDefinition" },
{ "include": "#propertyGetSet" },
{ "include": "#definitionEnd" },
{ "include": "#storageModifiers" },
{ "include": "#inheritanceModifiers" },
{ "include": "#controlKeywords" },
{ "include": "#otherKeywords" },
{ "include": "#modifierKeywords" },
{ "include": "#vbFunctions" }
],
"repository": {
Expand All @@ -39,14 +42,14 @@
"name": "meta.region.source.vbnet",
"begin": "^\\s*((?i:#region))",
"beginCaptures": {
"1": { "name": "keyword.other.vbnet" }
"1": { "name": "keyword.directive.vbnet" }
},
"patterns": [
{ "include": "$self" }
],
"end": "^\\s*((?i:#end region))",
"endCaptures": {
"1": { "name": "keyword.other.vbnet" }
"1": { "name": "keyword.directive.vbnet" }
}
},
"quotedString": {
Expand Down Expand Up @@ -76,6 +79,10 @@
"match": "(\\.|\\+=|\\+|\\*=|\\*|\\\\=|\\\\|/=|/|=|-=|-|<|<=|>|>=|&=|&|\\^|\\^=|>>=|>>|<<=|<<|:=)",
"name": "keyword.operator.vbnet"
},
"lineContinuationOperator":{
"match": "\\w*\\b(\\_)$",
"name": "keyword.operator.vbnet"
},
"wordOperator":{
"match": "(?i:\\b(mod|not|and|andalso|or|orelse|in|is|isnot|xor|out)\\b)",
"name": "keyword.operator.vbnet"
Expand All @@ -84,6 +91,10 @@
"match": "((?i:true|false|nothing))",
"name": "constant.language.vbnet"
},
"compilerDirectives":{
"name": "keyword.directive.vbnet",
"match": "^\\s*(?i:#if|#else|#elseif|#endif|#const|#externalsource|#end|#end externalsource)\\s+"
},
"supportTypes":{
"name": "support.type.vbnet",
"match": "(?i:\\b(integer|decimal|double|single|date|long|short|char|string|byte|date|boolean|delegate|event|enum|sbyte|uinteger|ulong|ushort|const|object|global|paramarray)\\b)"
Expand Down Expand Up @@ -147,7 +158,7 @@
},
"propertyGetSet":{
"name": "keyword.other.property.accessor.vbnet",
"match": "(?i:^\\s*(protected friend|protected|friend|private)?\\s+(get|set)\\s*\\(?)"
"match": "(?i:^\\s*(protected friend|protected|friend|private)?\\s+(get|set)\\s*\\(?\\b)"
},
"functionDefinition": {
"name": "meta.function.vbnet",
Expand All @@ -171,6 +182,10 @@
"match": "(?i:^\\s*(end)\\s+(function|sub|class|namespace|module|interface|property|addhandler|enum|event|operator|raiseevent|removehandler|select|structure|synclock))",
"name": "keyword.control.end-definition.vbnet"
},
"lambdaDefinition":{
"match": "(?i:function|sub)",
"name": "support.type.lambda.vbnet"
},
"inheritanceModifiers":{
"name": "storage.modifier.inheritance.vbnet",
"match": "(?i:overloads|overrides|overridable|notoverridable|mustoverride|mustoverride overrides|notoverridable overrides|overloads overrides|mustinherit|notinheritable)"
Expand All @@ -185,14 +200,14 @@
},
"controlKeywords":{
"name": "keyword.control.vbnet",
"match": "(?i:\\b(If|Then|Else|ElseIf|Else If|End If|While|End While|For|End For|To|Each|Case|Select|End Select|Return|Continue|Do|Until|Loop|Next|End With|With|Exit Do|Exit For|Exit Function|Exit Property|Exit Sub|IIf|Step|GoTo|Try|Catch|Finally|End Try|Using|RaiseEvent|Stop)\\b)"
"match": "(?i:\\b(If|Then|Else|ElseIf|Else If|End If|While|End While|For|End For|To|Each|Case|Select|End Select|Return|Continue|Do|Until|Loop|Next|End With|With|Exit Do|Exit For|Exit Function|Exit Property|Exit Sub|IIf|Step|GoTo|Try|Catch|Finally|End Try|Using|RaiseEvent|Stop|On Error|Resume|Async|Await|Yield)\\b)"
},
"otherKeywords":{
"name": "keyword.other.vbnet",
"match": "\\b(?i:As|byval|byref|optional|handles|inherits|implements|withevents|end set|end get|of|alias|declare)\\s+"
"modifierKeywords":{
"name": "keyword.modifier.vbnet",
"match": "\\b(?i:As|byval|byref|optional|handles|inherits|implements|withevents|end set|end get|of|alias|declare|widening|narrowing|ansi|assembly|auto|iterator|key|unicode)\\s+"
},
"vbFunctions":{
"match": "\\b((?i:CBool|CByte|CChar|CDate|CDbl|CDec|Char|CInt|CLng|CObj|CSByte|CShort|CSng|CStr|CType|CUInt|CULng|CUShort|DirectCast|GetType|TryCast))\\(",
"match": "\\b((?i:CBool|CByte|CChar|CDate|CDbl|CDec|Char|CInt|CLng|CObj|CSByte|CShort|CSng|CStr|CType|CUInt|CULng|CUShort|DirectCast|GetType|TryCast|GetXmlNamespace))\\(",
"captures": {
"1": { "name": "support.function.vbnet" }
}
Expand Down
61 changes: 47 additions & 14 deletions vbdotnet.tmLanguage
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>fileTypes</key>
Expand Down Expand Up @@ -38,6 +38,10 @@
<key>include</key>
<string>#characterOperator</string>
</dict>
<dict>
<key>include</key>
<string>#lineContinuationOperator</string>
</dict>
<dict>
<key>include</key>
<string>#wordOperator</string>
Expand All @@ -46,6 +50,10 @@
<key>include</key>
<string>#languageContants</string>
</dict>
<dict>
<key>include</key>
<string>#compilerDirectives</string>
</dict>
<dict>
<key>include</key>
<string>#supportTypes</string>
Expand Down Expand Up @@ -82,6 +90,10 @@
<key>include</key>
<string>#functionDefinition</string>
</dict>
<dict>
<key>include</key>
<string>#lambdaDefinition</string>
</dict>
<dict>
<key>include</key>
<string>#propertyDefinition</string>
Expand All @@ -108,7 +120,7 @@
</dict>
<dict>
<key>include</key>
<string>#otherKeywords</string>
<string>#modifierKeywords</string>
</dict>
<dict>
<key>include</key>
Expand Down Expand Up @@ -144,6 +156,13 @@
<key>name</key>
<string>meta.class.vbnet</string>
</dict>
<key>compilerDirectives</key>
<dict>
<key>match</key>
<string>^\s*(?i:#if|#else|#elseif|#endif|#const|#externalsource|#end|#end externalsource)\s+</string>
<key>name</key>
<string>keyword.directive.vbnet</string>
</dict>
<key>compilerOption</key>
<dict>
<key>captures</key>
Expand All @@ -170,7 +189,7 @@
<key>controlKeywords</key>
<dict>
<key>match</key>
<string>(?i:\b(If|Then|Else|ElseIf|Else If|End If|While|End While|For|End For|To|Each|Case|Select|End Select|Return|Continue|Do|Until|Loop|Next|End With|With|Exit Do|Exit For|Exit Function|Exit Property|Exit Sub|IIf|Step|GoTo|Try|Catch|Finally|End Try|Using|RaiseEvent|Stop)\b)</string>
<string>(?i:\b(If|Then|Else|ElseIf|Else If|End If|While|End While|For|End For|To|Each|Case|Select|End Select|Return|Continue|Do|Until|Loop|Next|End With|With|Exit Do|Exit For|Exit Function|Exit Property|Exit Sub|IIf|Step|GoTo|Try|Catch|Finally|End Try|Using|RaiseEvent|Stop|On Error|Resume|Async|Await|Yield)\b)</string>
<key>name</key>
<string>keyword.control.vbnet</string>
</dict>
Expand Down Expand Up @@ -277,6 +296,13 @@
<key>name</key>
<string>meta.interface.vbnet</string>
</dict>
<key>lambdaDefinition</key>
<dict>
<key>match</key>
<string>(?i:function|sub)</string>
<key>name</key>
<string>support.type.lambda.vbnet</string>
</dict>
<key>languageContants</key>
<dict>
<key>match</key>
Expand All @@ -291,13 +317,27 @@
<key>name</key>
<string>keyword.other.vbnet</string>
</dict>
<key>lineContinuationOperator</key>
<dict>
<key>match</key>
<string>\w*\b(\_)$</string>
<key>name</key>
<string>keyword.operator.vbnet</string>
</dict>
<key>linqKeywords</key>
<dict>
<key>match</key>
<string>(?i:\b(from|aggregate|select|where|order by|join|groupp by|into|group join|equals|let|distinct|skip|skip while|take|take while)\b)</string>
<key>name</key>
<string>keyword.control.linq.vbnet</string>
</dict>
<key>modifierKeywords</key>
<dict>
<key>match</key>
<string>\b(?i:As|byval|byref|optional|handles|inherits|implements|withevents|end set|end get|of|alias|declare|widening|narrowing|ansi|assembly|auto|iterator|key|unicode)\s+</string>
<key>name</key>
<string>keyword.modifier.vbnet</string>
</dict>
<key>moduleDefinition</key>
<dict>
<key>captures</key>
Expand Down Expand Up @@ -345,13 +385,6 @@
<key>name</key>
<string>constant.numeric.vbnet</string>
</dict>
<key>otherKeywords</key>
<dict>
<key>match</key>
<string>\b(?i:As|byval|byref|optional|handles|inherits|implements|withevents|end set|end get|of|alias|declare)\s+</string>
<key>name</key>
<string>keyword.other.vbnet</string>
</dict>
<key>propertyDefinition</key>
<dict>
<key>begin</key>
Expand Down Expand Up @@ -401,7 +434,7 @@
<key>propertyGetSet</key>
<dict>
<key>match</key>
<string>(?i:^\s*(protected friend|protected|friend|private)?\s+(get|set)\s*\(?)</string>
<string>(?i:^\s*(protected friend|protected|friend|private)?\s+(get|set)\s*\(?\b)</string>
<key>name</key>
<string>keyword.other.property.accessor.vbnet</string>
</dict>
Expand All @@ -421,7 +454,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>keyword.other.vbnet</string>
<string>keyword.directive.vbnet</string>
</dict>
</dict>
<key>end</key>
Expand All @@ -431,7 +464,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>keyword.other.vbnet</string>
<string>keyword.directive.vbnet</string>
</dict>
</dict>
<key>name</key>
Expand Down Expand Up @@ -485,7 +518,7 @@
</dict>
</dict>
<key>match</key>
<string>\b((?i:CBool|CByte|CChar|CDate|CDbl|CDec|Char|CInt|CLng|CObj|CSByte|CShort|CSng|CStr|CType|CUInt|CULng|CUShort|DirectCast|GetType|TryCast))\(</string>
<string>\b((?i:CBool|CByte|CChar|CDate|CDbl|CDec|Char|CInt|CLng|CObj|CSByte|CShort|CSng|CStr|CType|CUInt|CULng|CUShort|DirectCast|GetType|TryCast|GetXmlNamespace))\(</string>
</dict>
<key>wordOperator</key>
<dict>
Expand Down

0 comments on commit 2688695

Please sign in to comment.