diff options
| author | nosami <jasonimison@gmail.com> | 2016-02-22 16:06:03 +0300 |
|---|---|---|
| committer | nosami <jasonimison@gmail.com> | 2016-02-22 16:06:40 +0300 |
| commit | 0b5e6de1a4f41f6b03a933b58b4747c9815e693f (patch) | |
| tree | fb1260eef0d4f1548157d5e3005f4646e35a2a6a | |
| parent | ec607b10d26a682c82cb710bdd488efbc9517577 (diff) | |
[F#] Syntax mode fix
| m--------- | main/external/fsharpbinding | 10 | ||||
| -rw-r--r-- | main/src/core/Mono.Texteditor/SyntaxModes/FSharpSyntaxMode.xml | 11 |
2 files changed, 9 insertions, 12 deletions
diff --git a/main/external/fsharpbinding b/main/external/fsharpbinding -Subproject 9f10ceb96d822f1903bf3c856ba825e74355adc +Subproject 2797949ac58da4990bb55f4d28aed701f110e1b diff --git a/main/src/core/Mono.Texteditor/SyntaxModes/FSharpSyntaxMode.xml b/main/src/core/Mono.Texteditor/SyntaxModes/FSharpSyntaxMode.xml index b9cb53dab5..7b7cf23137 100644 --- a/main/src/core/Mono.Texteditor/SyntaxModes/FSharpSyntaxMode.xml +++ b/main/src/core/Mono.Texteditor/SyntaxModes/FSharpSyntaxMode.xml @@ -196,7 +196,6 @@ <Word>}</Word> </Keywords> - <EolSpan color = "Comment(Doc)" rule="XmlDocumentation" tagColor="Comment(DocTag)">///</EolSpan> <EolSpan color = "Comment(Line)" rule="Comment" tagColor="Comment(Line)">//</EolSpan> <!-- </Rule>--> @@ -277,10 +276,8 @@ <Group color="User Types"/> </Match> - - <!-- |> |< << >> <= >= <- -> :?> --> - <Match color="Plain Text">(\|>|\|<|<<|>>|<=|>=|<-|->|:\?>)</Match> + <Match color="Plain Text">\b(\|>|\|<|<<|>>|<=|>=|<-|->|:\?>)\b</Match> <Match expression="(let)(\s)(static|abstract|default|override|public|extern|internal|mutable|rec|inline|private)(\s)(static|abstract|default|override|public|extern|internal|mutable|rec|inline|private)(\s)([\w]+)\s[^=:]" ignorecase="False"> <!-- let inline add x y = x + y --> @@ -326,10 +323,9 @@ <Group color="User Types"/> </Match> - <Match expression="(<)([^_]\w*)(>)"> + <Match expression="(<)([^_]\w*)"> <Group color="Punctuation(Brackets)"/> <Group color="User Types"/> - <Group color="Punctuation(Brackets)"/> </Match> <Match color="User Types">'\w+</Match> @@ -348,7 +344,7 @@ <Match color="Keyword(Jump)" ignorecase="False">(function|fun|new)\b</Match> <Match color="Keyword(Constants)" ignorecase="False">\b(false|null|true|__LINE__|__SOURCE_DIRECTORY__|__SOURCE_FILE__)\b</Match> - <Match color="Keyword(Iteration)" ignorecase="False">(async|maybe|asyncMaybe|asyncSeq|asyncChoice|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|in)\b</Match> + <Match color="Keyword(Iteration)" ignorecase="False">\b(async|maybe|asyncMaybe|asyncSeq|asyncChoice|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|in)\b</Match> <Match expression="([a-z]{1}\w*)\s\""> <Group color="User Method Declaration"/> @@ -384,4 +380,5 @@ <Group color="Plain Text" /> <Group color="User Property Declaration"/> </Match> + </SyntaxMode> |