diff options
| author | Mirta <mirta@twine-s.com> | 2020-12-30 16:39:52 +0200 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2020-12-30 16:39:52 +0200 |
| commit | 00a491d93733d4625ad329b2ba8237f445364b3f (patch) | |
| tree | 4b24c6fa78d7648f4bb7cefafa464bb0b063fec4 /Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting | |
| parent | 124ad4150f80c6846fdee41dbbda9848c105f6e5 (diff) | |
| download | Tango-00a491d93733d4625ad329b2ba8237f445364b3f.tar.gz Tango-00a491d93733d4625ad329b2ba8237f445364b3f.zip | |
merge
Diffstat (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting')
4 files changed, 39 insertions, 13 deletions
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/OffsetColorizer.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/OffsetColorizer.cs index 72c27f9a9..a05d1fc75 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/OffsetColorizer.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/OffsetColorizer.cs @@ -30,7 +30,7 @@ namespace Tango.Scripting.Editors.Highlighting { try { - ChangeLinePart(StartOffset, EndOffset, element => element.TextRunProperties.SetBackgroundBrush(Brush)); + ChangeLinePart(StartOffset, EndOffset, element => element.TextRunProperties.SetForegroundBrush(Brush)); } catch { } } diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/CSharp-Mode.xshd b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/CSharp-Mode.xshd index 1f6139ff6..40f362e08 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/CSharp-Mode.xshd +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/CSharp-Mode.xshd @@ -11,7 +11,7 @@ <Color name="InterfaceTypes" foreground="#B5CE8A" exampleText="object o;" /> <Color name="MethodCall" foreground="Gainsboro" exampleText="o.ToString();"/> <Color name="NumberLiteral" foreground="#B5CE8A" exampleText="3.1415f"/> - <Color name="ThisOrBaseReference" foreground="#3F8FD6" exampleText="this.Do(); base.Do();"/> + <Color name="ThisOrBaseReference" exampleText="this.Do(); base.Do();"/> <Color name="NullOrValueKeywords" exampleText="if (value == null)"/> <Color name="Keywords" foreground="#3F8FD6" exampleText="if (a) {} else {}"/> <Color name="GotoKeywords" foreground="#3F8FD6" exampleText="continue; return null;"/> @@ -22,7 +22,7 @@ <Color name="OperatorKeywords" foreground="Pink" exampleText="public static implicit operator..."/> <Color name="ParameterModifiers" foreground="DeepPink" exampleText="(ref int a, params int[] b)"/> <Color name="Modifiers" foreground="#3F8FD6" exampleText="static readonly int a;"/> - <Color name="CustomKeywords" foreground="DarkGray" /> + <Color name="CustomKeywords" foreground="#FAFF00" /> <Color name="Visibility" foreground="#3F8FD6" exampleText="public override void ToString();"/> <Color name="NamespaceKeywords" foreground="#569CD6" exampleText="namespace A.B { using System; }"/> <Color name="GetSetAddRemove" foreground="#3F8FD6" exampleText="int Prop { get; set; }"/> @@ -47,7 +47,26 @@ <!-- This is the main ruleset. --> <RuleSet> - + <Span color="Preprocessor"> + <Begin>\#</Begin> + <RuleSet name="PreprocessorSet"> + <Span> <!-- preprocessor directives that allows comments --> + <Begin > + (define|undef|if|elif|else|endif|line)\b + </Begin> + <RuleSet> + <Span color="Comment" ruleSet="CommentMarkerSet"> + <Begin>//</Begin> + </Span> + </RuleSet> + </Span> + <Span> <!-- preprocessor directives that don't allow comments --> + <Begin > + (region|endregion|error|warning|pragma)\b + </Begin> + </Span> + </RuleSet> + </Span> <!--<Span color="Comment"> <Begin color="XmlDoc/DocComment">///</Begin> @@ -99,7 +118,8 @@ </Rule> <Keywords color="CustomKeywords"> - <Word>#load</Word> + <Word>include</Word> + <Word>import</Word> </Keywords> <Keywords color="ThisOrBaseReference"> @@ -194,7 +214,6 @@ <Word>enum</Word> <Word>float</Word> <Word>int</Word> - <Word>object</Word> <Word>string</Word> <Word>long</Word> <Word>sbyte</Word> diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/MarkDown-Mode.xshd b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/MarkDown-Mode.xshd index 8e02db898..ead5045ab 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/MarkDown-Mode.xshd +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/MarkDown-Mode.xshd @@ -5,6 +5,7 @@ <Color name="StrongEmphasis" fontWeight="bold" exampleText="**this** is more important!" /> <Color name="Code" exampleText="this is `int.GetHashCode()`" /> <Color name="BlockQuote" foreground="DarkBlue" exampleText="> This is a\r\n> quote." /> + <Color name="Link" foreground="Blue" exampleText="[text](http://example.com)" /> <Color name="Image" foreground="Green" exampleText="[text][http://example.com/test.png]" /> <Color name="LineBreak" background="LightGray" exampleText="end of line \r\n2nd line " /> @@ -42,6 +43,12 @@ <Rule color="Image"> \!\[.*\]\[.*\] </Rule> + <Rule color="Link"> + \[.*\]\(.*\) + </Rule> + <Rule color="Link"> + \[.*\]\[.*\] + </Rule> <Rule color="LineBreak"> [ ]{2}$ </Rule> diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/XML-Mode.xshd b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/XML-Mode.xshd index 50fdc0e2c..8f0bdef76 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/XML-Mode.xshd +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/XML-Mode.xshd @@ -1,13 +1,13 @@ <SyntaxDefinition name="XML" extensions=".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.wxi;.wxl;.proj;.csproj;.vbproj;.ilproj;.booproj;.build;.xfrm;.targets;.xaml;.xpt;.xft;.map;.wsdl;.disco;.ps1xml;.nuspec" xmlns="http://icsharpcode.net/sharpdevelop/syntaxdefinition/2008"> <Color foreground="Green" name="Comment" exampleText="<!-- comment -->" /> - <Color foreground="#3F92D6" name="CData" exampleText="<![CDATA[data]]>" /> - <Color foreground="#C8C8C7" name="DocType" exampleText="<!DOCTYPE rootElement>" /> - <Color foreground="#3F92D6" name="XmlDeclaration" exampleText='<?xml version="1.0"?>' /> - <Color foreground="#3F92D6" name="XmlTag" exampleText='<tag attribute="value" />' /> - <Color foreground="#92CAF4" name="AttributeName" exampleText='<tag attribute="value" />' /> - <Color foreground="#C8C8C7" name="AttributeValue" exampleText='<tag attribute="value" />' /> + <Color foreground="Blue" name="CData" exampleText="<![CDATA[data]]>" /> + <Color foreground="Blue" name="DocType" exampleText="<!DOCTYPE rootElement>" /> + <Color foreground="Blue" name="XmlDeclaration" exampleText='<?xml version="1.0"?>' /> + <Color foreground="DarkMagenta" name="XmlTag" exampleText='<tag attribute="value" />' /> + <Color foreground="Red" name="AttributeName" exampleText='<tag attribute="value" />' /> + <Color foreground="Blue" name="AttributeValue" exampleText='<tag attribute="value" />' /> <Color foreground="Teal" name="Entity" exampleText="index.aspx?a=1&amp;b=2" /> - <Color foreground="Red" name="BrokenEntity" exampleText="index.aspx?a=1&b=2" /> + <Color foreground="Olive" name="BrokenEntity" exampleText="index.aspx?a=1&b=2" /> <RuleSet> <Span color="Comment" multiline="true"> |