[f#] update grammar

This commit is contained in:
Martin Aeschlimann 2017-05-18 12:14:24 +02:00
parent 7efdde8060
commit f1abf5ad11

View file

@ -16,9 +16,6 @@
{
"include": "#structure"
},
{
"include": "#attributes"
},
{
"include": "#strings"
},
@ -31,6 +28,9 @@
{
"include": "#definition"
},
{
"include": "#attributes"
},
{
"include": "#method_calls"
},
@ -59,7 +59,7 @@
{
"name": "function.anonymous",
"begin": "\\b(fun)\\b",
"end": "[(->)\\n]",
"end": "(->)",
"beginCaptures": {
"1": {
"name": "keyword.other.function-definition.fsharp"
@ -139,7 +139,7 @@
"patterns": [
{
"name": "binding.fsharp",
"begin": "\\b(val mutable|val|let mutable|let inline|let|member|static member|override|let!)(\\s+rec|mutable)?(\\s+private|internal|public)?\\s+(\\([^\\s-]*\\)|[_[:alpha:]]([_[:alpha:]0-9,\\.]|(?<=,)\\s)*)",
"begin": "\\b(val mutable|val|let mutable|let inline|let|member|static member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\([^\\s-]*\\)|[_[:alpha:]]([_[:alpha:]0-9,\\._]|(?<=,)\\s)*)",
"end": "((``.*``)|(with)|=|$)",
"beginCaptures": {
"1": {
@ -149,9 +149,12 @@
"name": "keyword.other.function-recursive.fsharp"
},
"3": {
"name": "keyword.other.access.fsharp"
"name": "support.function.attribute.fsharp"
},
"4": {
"name": "keyword.other.access.fsharp"
},
"5": {
"name": "variable.other.binding.fsharp"
}
},
@ -178,7 +181,7 @@
"patterns": [
{
"name": "keyword.other.fsharp",
"match": "\\b(function|yield!|yield|class|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\\!|return\\!|return|interface|with|abstract|member|try|finally|and|when|use|use\\!|struct|while)\\b"
"match": "\\b(function|yield!|yield|class|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\\!|return\\!|return|interface|with|abstract|member|try|finally|and|when|use|use\\!|struct|while|mutable)\\b"
},
{
"name": "meta.preprocessor.fsharp",
@ -195,7 +198,7 @@
"patterns": [
{
"name": "entity.name.section.fsharp",
"begin": "\\b(namespace|module)(\\s+public|internal|private)?\\s+([[:alpha:]][[:alpha:]0-9'_. ]*)",
"begin": "\\b(namespace|module)\\s*(public|internal|private)?\\s+([[:alpha:]][[:alpha:]0-9'_. ]*)",
"end": "(\\s|$)",
"beginCaptures": {
"1": {
@ -389,7 +392,7 @@
"patterns": [
{
"name": "record.fsharp",
"match": "(type)[\\s]+(private|internal|public)?[\\s]*([[:alpha:]0-9'<>^:,. ]+)[\\s]*(\\([[:alpha:]0-9'<>^:,. ]+\\))?[\\s]*((with)|(as [[:alpha:]0-9']+)|(=)|(\\(\\)))",
"match": "(type)[\\s]+(private|internal|public)?[\\s]*([[:alpha:]0-9'<>^:,._ ]+)[\\s]*(\\([[:alpha:]0-9'<>^:,._ ]+\\))?[\\s]*((with)|(as [[:alpha:]0-9']+)|(=)|(\\(\\)))",
"captures": {
"1": {
"name": "keyword.other.fsharp"
@ -454,5 +457,5 @@
]
}
},
"version": "https://github.com/ionide/ionide-fsgrammar/commit/edb05603ec3f2eb3c633f92df1649e82fe870545"
"version": "https://github.com/ionide/ionide-fsgrammar/commit/f2e3c30f0ebfcc89fb78ad908701159f20516812"
}