Update grammars

This commit is contained in:
Alex Ross
2020-03-03 16:19:40 +01:00
parent 43ca0e3029
commit 2f6da279c7
10 changed files with 321 additions and 284 deletions

View File

@@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/ionide/ionide-fsgrammar/commit/b4f43aafa6f843707410fabe9f904ec04fa536dc",
"version": "https://github.com/ionide/ionide-fsgrammar/commit/af2a9a88639f384c6e5d1340d510dc6fb743d514",
"name": "fsharp",
"scopeName": "source.fsharp",
"patterns": [
@@ -476,7 +476,7 @@
},
"endCaptures": {
"1": {
"name": "keyword.fsharp"
"name": "keyword.symbol.arrow.fsharp"
}
},
"patterns": [
@@ -488,12 +488,12 @@
"end": "\\s*(?=(->))",
"beginCaptures": {
"1": {
"name": "keyword.symbol.fsharp"
"name": "keyword.symbol.arrow.fsharp"
}
},
"endCaptures": {
"1": {
"name": "keyword.symbol.fsharp"
"name": "keyword.symbol.arrow.fsharp"
}
},
"patterns": [
@@ -545,15 +545,6 @@
}
]
},
{
"name": "comment.block.markdown.fsharp.end",
"match": "^(\\s*\\*\\)$)",
"captures": {
"1": {
"name": "comment.block.fsharp"
}
}
},
{
"name": "comment.block.fsharp",
"begin": "(\\(\\*(?!\\)))",
@@ -567,6 +558,20 @@
"1": {
"name": "comment.block.fsharp"
}
},
"patterns": [
{
"include": "#comments"
}
]
},
{
"name": "comment.block.markdown.fsharp.end",
"match": "(\\*\\))",
"captures": {
"1": {
"name": "comment.block.fsharp"
}
}
},
{
@@ -592,7 +597,7 @@
"match": "\\(\\)"
},
{
"name": "constant.numeric.floating-point.fsharp",
"name": "constant.numeric.float.fsharp",
"match": "\\b-?[0-9][0-9_]*((\\.([0-9][0-9_]*([eE][+-]??[0-9][0-9_]*)?)?)|([eE][+-]??[0-9][0-9_]*))"
},
{
@@ -600,7 +605,7 @@
"match": "\\b(-?((0(x|X)[0-9a-fA-F][0-9a-fA-F_]*)|(0(o|O)[0-7][0-7_]*)|(0(b|B)[01][01_]*)|([0-9][0-9_]*)))"
},
{
"name": "constant.others.fsharp",
"name": "constant.other.fsharp",
"match": "\\b(true|false|null|unit|void)\\b"
}
]
@@ -918,7 +923,7 @@
"name": "support.function.attribute.fsharp"
},
"4": {
"name": "keyword.fsharp"
"name": "storage.modifier.fsharp"
},
"5": {
"name": "variable.fsharp"
@@ -970,7 +975,7 @@
"name": "support.function.attribute.fsharp"
},
"4": {
"name": "keyword.fsharp"
"name": "storage.modifier.fsharp"
},
"5": {
"name": "variable.fsharp"
@@ -1061,9 +1066,21 @@
},
"keywords": {
"patterns": [
{
"name": "storage.modifier",
"match": "\\b(private|public|internal)\\b"
},
{
"name": "keyword.fsharp",
"match": "\\b(private|to|public|internal|function|yield!|yield|class|exception|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\\!|return\\!|return|interface|with|abstract|enum|member|try|finally|and|when|or|use|use\\!|struct|while|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b"
"match": "\\b(private|to|public|internal|function|class|exception|delegate|of|as|begin|end|inherit|let!|interface|abstract|enum|member|and|when|or|use|use\\!|struct|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b"
},
{
"name": "keyword.control",
"match": "\\b(match|yield|yield!|with|if|then|else|elif|for|in|return!|return|try|finally|while|do)(?!')\\b"
},
{
"name": "keyword.symbol.new",
"match": "\\b(new)\\b"
},
{
"name": "keyword.symbol.fsharp",
@@ -1075,7 +1092,7 @@
"patterns": [
{
"name": "entity.name.section.fsharp",
"begin": "\\b(namespace global)|(namespace|module)\\s*(public|internal|private|rec)?\\s+([[:alpha:]][[:alpha:]0-9'_. ]*)",
"begin": "\\b(namespace global)|\\b(namespace|module)\\s*(public|internal|private|rec)?\\s+([[:alpha:]][[:alpha:]0-9'_. ]*)",
"end": "(\\s?=|\\s|$)",
"beginCaptures": {
"1": {
@@ -1085,7 +1102,7 @@
"name": "keyword.fsharp"
},
"3": {
"name": "keyword.fsharp"
"name": "storage.modifier.fsharp"
},
"4": {
"name": "entity.name.section.fsharp"
@@ -1507,7 +1524,7 @@
"name": "keyword.fsharp"
},
"2": {
"name": "keyword.fsharp"
"name": "storage.modifier.fsharp"
}
},
"endCaptures": {
@@ -1619,7 +1636,7 @@
"name": "keyword.symbol.fsharp"
},
"2": {
"name": "keyword.fsharp"
"name": "storage.modifier.fsharp"
}
}
},
@@ -1770,8 +1787,8 @@
"compiler_directives": {
"patterns": [
{
"name": "compiler_directive.fsharp",
"match": "\\s?(#if|#elif|#else|#elseif|#endif|#light|#nowarn)",
"name": "keyword.control.directive.fsharp",
"match": "\\s?(#if|#elif|#elseif|#else|#endif|#light|#nowarn)",
"captures": {}
}
]