diff options
| author | nosami <jasonimison@gmail.com> | 2016-02-15 19:31:35 +0300 |
|---|---|---|
| committer | nosami <jasonimison@gmail.com> | 2016-02-15 19:31:35 +0300 |
| commit | dbfcb82ff4caf3e45e8d672620521837ddcfbe9a (patch) | |
| tree | fa747ae04b604246ca5a3ae0b7e6a071f0ee9c94 /main | |
| parent | 7cd3bd668413d201f6fe4272658a50d945bd36bb (diff) | |
[F#] Syntax mode fixes
Diffstat (limited to 'main')
| m--------- | main/external/fsharpbinding | 14 | ||||
| -rw-r--r-- | main/src/core/Mono.Texteditor/SyntaxModes/FSharpSyntaxMode.xml | 20 |
2 files changed, 15 insertions, 19 deletions
diff --git a/main/external/fsharpbinding b/main/external/fsharpbinding -Subproject 0974c258b75d43eebc1b6f75ac87b1fed6dbe2a +Subproject a2c4932baf13ab117f5b6bdebb3fb743bf2b439 diff --git a/main/src/core/Mono.Texteditor/SyntaxModes/FSharpSyntaxMode.xml b/main/src/core/Mono.Texteditor/SyntaxModes/FSharpSyntaxMode.xml index b17ebe352c..577331a09c 100644 --- a/main/src/core/Mono.Texteditor/SyntaxModes/FSharpSyntaxMode.xml +++ b/main/src/core/Mono.Texteditor/SyntaxModes/FSharpSyntaxMode.xml @@ -92,8 +92,7 @@ <Match color="Number">CSharpNumber</Match> - <Match color="Keyword(Iteration)">(use|yield|return|do)(!)?\b</Match> -<!-- <Match color="Keyword(Iteration)">(let|use|yield|return|do)(!)?$</Match>--> + <Match color="Keyword(Iteration)" ignorecase="False">((use|yield|return|do)(!?))\b?</Match> <!-- reserved-ident-keyword F# spec v3.0 section 3.4 --> <Match color="Keyword(Other)" ignorecase="False">(atomic|break|checked|component|const|constraint|constructor|continue|eager|fixed|fori|functor|include|measure|method|mixin|object|parallel|params|process|protected|pure|recursive|sealed|tailcall|trait|virtual|volatile)[!#]?\s</Match> @@ -117,8 +116,6 @@ <Word>rec</Word> </Keywords> - - <Keywords color="Keyword(Operator)"> <Word>as</Word> <Word>assert</Word> @@ -194,7 +191,7 @@ <Keywords color = "Punctuation"> <Word>==</Word> <Word>!=</Word> - <Word>!</Word> +<!-- <Word>!</Word>--> <Word>&&</Word> <Word>||</Word> </Keywords> @@ -206,6 +203,8 @@ <Word>]</Word> <Word><</Word> <Word>></Word> + <Word>{</Word> + <Word>}</Word> </Keywords> @@ -266,6 +265,7 @@ <End>></End> </Span> </Rule> + <Match color="Plain Text">\b(get|set)\b</Match> <!-- |> |< << >> <= >= <- -> :?> --> <Match color="Plain Text">(\|>|\|<|<<|>>|<=|>=|<-|->|:\?>)</Match> @@ -314,15 +314,11 @@ <Match color="Keyword(Jump)" ignorecase="False">(function|fun|new)\b</Match> - <Match expression="(fun)" ignorecase="False"> - <Group color="Keyword(Jump)"/> - </Match> - <Match color="Keyword(Iteration)" ignorecase="False">(async|maybe|asyncMaybe|asyncSeq|seq|query|let|finally|try|with|val|while|for|begin|done|elif|else|end|if|match|then|when|void|global|base|inherit|member|type|module|of|class|delegate|exception|interface|struct|as)\b</Match> -<!-- <Match expression="([\w]+)\s(?!(?:with|in|as))[\w]+"> + <Match expression="([a-z]{1}\w*)\s\""> <Group color="User Method Declaration"/> - </Match>--> + </Match> <Match expression="(\|>\s?)([a-z]{1}\w*)" ignorecase="False"> <Group color="Plain Text" /> @@ -340,6 +336,7 @@ <Group color="Plain Text" /> <Group color="User Method Declaration"/> </Match> + <Match expression="([a-z]{1}\w*)" ignorecase="False"> <Group color="User Field Declaration"/> @@ -349,5 +346,4 @@ <Group color="Plain Text" /> <Group color="User Field Declaration"/> </Match> - </SyntaxMode> |