pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

make HTML colors customizable and fix bug in text marker preview

pull/28/head
Siegfried Pammer 13 years ago
parent
052d80d953
commit
097d36091d
2 changed files with 23 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml.cs
  2. 42
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/HTML-Mode.xshd

6
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml.cs
Unescape View File

@ -553,13 +553,11 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
case ErrorPainter.WarningColorName: case ErrorPainter.WarningColorName:
case ErrorPainter.MessageColorName: case ErrorPainter.MessageColorName:
marker.MarkerType = TextMarkerType.SquigglyUnderline; marker.MarkerType = TextMarkerType.SquigglyUnderline;
marker.ForegroundColor = item.Foreground; marker.MarkerColor = item.Foreground;
marker.BackgroundColor = item.Background;
break; break;
default: default:
marker.MarkerType = TextMarkerType.None; marker.MarkerType = TextMarkerType.None;
marker.ForegroundColor = item.Foreground; marker.MarkerColor = Colors.Transparent;
marker.BackgroundColor = item.Background;
break; break;
} }
} }

42
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/HTML-Mode.xshd
Unescape View File

@ -2,31 +2,27 @@
<!-- syntaxdefinition for HTML 2000 by Mike Krueger --> <!-- syntaxdefinition for HTML 2000 by Mike Krueger -->
<!-- converted to AvalonEdit format by Siegfried Pammer in 2010 --> <!-- converted to AvalonEdit format by Siegfried Pammer in 2010 -->
<SyntaxDefinition name="HTML" extensions=".htm;.html" xmlns="http://icsharpcode.net/sharpdevelop/syntaxdefinition/2008"> <SyntaxDefinition name="HTML" extensions=".htm;.html" xmlns="http://icsharpcode.net/sharpdevelop/syntaxdefinition/2008">
<Color name="Comment" foreground="DarkSlateGray" /> <Color name="Comment" foreground="DarkSlateGray" exampleText="&lt;!-- comment --&gt;" />
<Color name="Digits" foreground="DarkBlue" /> <Color name="Digits" foreground="DarkBlue" exampleText="&lt;digits&gt;0123456789&lt;/digits&gt;" />
<Color name="ScriptTag" foreground="#FF8B008B" /> <Color name="ScriptTag" foreground="#FF8B008B" exampleText="&lt;script&gt;alert('Hello World!');&lt;/script&gt;" />
<Color name="JavaScriptTag" foreground="#FF8B008B" /> <Color name="JavaScriptTag" foreground="#FF8B008B" exampleText="&lt;script lang=&quot;JavaScript&quot;&gt;alert('Hello World!');&lt;/script&gt;" />
<Color name="JScriptTag" foreground="#FF8B008B" /> <Color name="JScriptTag" foreground="#FF8B008B" exampleText="&lt;script lang=&quot;JScript&quot;&gt;Response.Write(&quot;Hello World!&quot;);&lt;/script&gt;" />
<Color name="VBScriptTag" foreground="#FF8B008B" /> <Color name="VBScriptTag" foreground="#FF8B008B" exampleText="&lt;script lang=&quot;VBScript&quot;&gt;Response.Write(&quot;Hello World!&quot;)&lt;/script&gt;" />
<Color name="UnknownScriptTag" foreground="#FF8B008B" /> <Color name="UnknownScriptTag" foreground="#FF8B008B" exampleText="&lt;script la&gt;alert('Hello World!');&lt;/script&gt;" />
<Color name="HtmlTag" foreground="#FF8B008B" /> <Color name="HtmlTag" foreground="#FF8B008B" exampleText="&lt;html&gt;Hello World!/html&gt;" />
<Color name="Tags" foreground="#FF8B008B" /> <Color name="Tags" foreground="#FF8B008B" exampleText="&lt;html&gt;Hello World! &lt;test /&gt;&lt;/html&gt;" />
<Color name="Attributes" foreground="Red" /> <Color name="Attributes" foreground="Red" exampleText="&lt;html background='green'&gt;Hello World! &lt;test /&gt;&lt;/html&gt;" />
<Color name="Slash" foreground="DarkMagenta" /> <Color name="Slash" foreground="DarkMagenta" exampleText="&lt;html background='green'&gt;Hello World! &lt;test /&gt;&lt;/html&gt;" />
<Color name="Assignment" foreground="Blue" /> <Color name="Assignment" foreground="Blue" exampleText="&lt;html background='green'&gt;Hello World! &lt;test /&gt;&lt;/html&gt;" />
<Color name="String" foreground="Blue" /> <Color name="String" foreground="Blue" exampleText="&lt;html background='green'&gt;Hello World! &lt;test /&gt;&lt;/html&gt;" />
<Color name="EntityReference" foreground="Blue" /> <Color name="EntityReference" foreground="Blue" exampleText="&lt;html background='green'&gt;Hello&amp;nbsp;World! &lt;test /&gt;&lt;/html&gt;" />
<Color name="Entities" foreground="#FF008000" /> <Color name="Entities" foreground="#FF008000" exampleText="&lt;html background='green'&gt;Hello&amp;nbsp;World! &lt;test /&gt;&lt;/html&gt;" />
<Color name="UnknownAttribute" foreground="Blue" /> <Color name="UnknownAttribute" foreground="Blue" exampleText="&lt;html foo='bar' background='green'&gt;Hello&amp;nbsp;World! &lt;test /&gt;&lt;/html&gt;" />
<RuleSet ignoreCase="true"> <RuleSet ignoreCase="true">
<Span color="Comment" multiline="true"> <Span color="Comment" multiline="true">
<Begin>&lt;!--</Begin> <Begin>&lt;!--</Begin>
<End>--&gt;</End> <End>--&gt;</End>
</Span> </Span>
<Span ruleSet="JavaScriptSet" multiline="true">
<Begin color="ScriptTag">&lt;script&gt;</Begin>
<End color="ScriptTag">&lt;/script&gt;</End>
</Span>
<Span ruleSet="JavaScriptSet" multiline="true"> <Span ruleSet="JavaScriptSet" multiline="true">
<Begin color="JavaScriptTag">&lt;script\ lang="JavaScript"&gt;</Begin> <Begin color="JavaScriptTag">&lt;script\ lang="JavaScript"&gt;</Begin>
<End color="JavaScriptTag">&lt;/script&gt;</End> <End color="JavaScriptTag">&lt;/script&gt;</End>
@ -44,9 +40,13 @@
<End color="VBScriptTag">&lt;/script&gt;</End> <End color="VBScriptTag">&lt;/script&gt;</End>
</Span> </Span>
<Span multiline="true"> <Span multiline="true">
<Begin color="UnknownScriptTag">&lt;script[^\w\d_]</Begin> <Begin color="UnknownScriptTag">&lt;script[^\w\d_]&gt;</Begin>
<End color="UnknownScriptTag">&lt;/script&gt;</End> <End color="UnknownScriptTag">&lt;/script&gt;</End>
</Span> </Span>
<Span ruleSet="JavaScriptSet" multiline="true">
<Begin color="ScriptTag">&lt;script&gt;</Begin>
<End color="ScriptTag">&lt;/script&gt;</End>
</Span>
<Span color="HtmlTag" ruleSet="HtmlTagSet" multiline="true"> <Span color="HtmlTag" ruleSet="HtmlTagSet" multiline="true">
<Begin>&lt;</Begin> <Begin>&lt;</Begin>
<End>&gt;</End> <End>&gt;</End>

Write Preview
Loading…
Cancel
Save