Corrected color bleeding after "class" arbitrarily within code.

Author: matthaw

ColorCode.AcceptanceTests/ColorCode.AcceptanceTests.csproj

@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -69,6 +70,9 @@
     <None Include="Data\csharp\comments.source.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Data\csharp\correct-classname.source.cs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Compile Include="Data\csharp\linq-keyword.source.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Compile>
@@ -162,6 +166,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Data\csharp\comments.expected.html" />
+    <Content Include="Data\csharp\correct-classname.expected.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Data\csharp\linq-keyword.expected.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

ColorCode.AcceptanceTests/Data/csharp/correct-classname.expected.html

@@ -0,0 +1,17 @@
+<div style="color:Black;background-color:White;"><pre>
+<span style="color:Blue;">public</span> <span style="color:Blue;">class</span><span style="color:MediumTurquoise;"> IntermediateProject :
+        IIntermediateProject,
+        IAttributeDeclarationTarget
+</span>{
+    <span style="color:Blue;">#region</span> IntermediateProject data members.
+    <span style="color:Gray;">///</span> <span style="color:Gray;">&lt;summary&gt;</span>
+    <span style="color:Gray;">///</span><span style="color:Green;"> Data member for &lt;see cref=&quot;Classes&quot;/&gt;.</span>
+    <span style="color:Gray;">///</span> <span style="color:Gray;">&lt;/summary&gt;</span>
+    <span style="color:Blue;">private</span> IClassTypes classes;
+    <span style="color:Gray;">///</span> <span style="color:Gray;">&lt;summary&gt;</span>
+    <span style="color:Gray;">///</span><span style="color:Green;"> Data member for &lt;see cref=&quot;Delegates&quot;/&gt;.</span>
+    <span style="color:Gray;">///</span> <span style="color:Gray;">&lt;/summary&gt;</span>
+    <span style="color:Blue;">private</span> IDelegateTypes delegates;
+    <span style="color:Blue;">#endregion</span>
+}
+</pre></div>

ColorCode.AcceptanceTests/Data/csharp/correct-classname.source.cs

@@ -0,0 +1,15 @@
+public class IntermediateProject :
+        IIntermediateProject,
+        IAttributeDeclarationTarget
+{
+    #region IntermediateProject data members.
+    /// <summary>
+    /// Data member for <see cref="Classes"/>.
+    /// </summary>
+    private IClassTypes classes;
+    /// <summary>
+    /// Data member for <see cref="Delegates"/>.
+    /// </summary>
+    private IDelegateTypes delegates;
+    #endregion
+}

ColorCode/Compilation/Languages/CSharp.cs

@@ -89,7 +89,7 @@ public IList<LanguageRule> Rules
                                            { 1, ScopeName.Keyword }
                                        }),
                                new LanguageRule(
-                                   @"(class|interface)([^{]+?){",
+                                   @"\b(class|interface)\b([^{]+?){",
                                    new Dictionary<int, string>
                                        {
                                            { 1, ScopeName.Keyword },