Fixed semantic highlighting bug & added highlighting unit tests.

ICSharpCode.NRefactory.CSharp/Analysis/SemanticHighlightingVisitor.cs

@@ -83,7 +83,7 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 		protected TextLocation regionEnd;
 		
 		protected CSharpAstResolver resolver;
-		bool isInAccessor;
+		bool isInAccessorContainingValueParameter;
 		
 		protected abstract void Colorize(TextLocation start, TextLocation end, TColor color);
 		
@@ -97,7 +97,10 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 				return;
 			}
 			if (rr is TypeResolveResult) {
-				Colorize(identifier, GetTypeHighlighting (rr.Type.Kind));
+				TColor color;
+				if (TryGetTypeHighlighting (rr.Type.Kind, out color)) {
+					Colorize(identifier, color);
+				}
 				return;
 			}
 			var mrr = rr as MemberResolveResult;
@@ -232,7 +235,7 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 		{
 			var identifier = identifierExpression.IdentifierToken;
 			VisitChildrenUntil(identifierExpression, identifier);
-			if (isInAccessor && identifierExpression.Identifier == "value") {
+			if (isInAccessorContainingValueParameter && identifierExpression.Identifier == "value") {
 				Colorize(identifier, valueKeywordColor);
 			} else {
 				Colorize(identifier, resolver.Resolve(identifierExpression, cancellationToken));
@@ -304,6 +307,7 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 					}
 				}
 			}
+
 			return hasConditionalAttribute;
 		}
 		#endregion
@@ -318,11 +322,11 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 		
 		public override void VisitAccessor(Accessor accessor)
 		{
-			isInAccessor = true;
+			isInAccessorContainingValueParameter = accessor.Role != PropertyDeclaration.GetterRole;
 			try {
 				VisitChildren(accessor);
 			} finally {
-				isInAccessor = false;
+				isInAccessorContainingValueParameter = false;
 			}
 		}
 		
@@ -442,7 +446,9 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 			VisitChildrenUntil(constructorDeclaration, nameToken);
 			var currentTypeDef = resolver.GetResolverStateBefore(constructorDeclaration).CurrentTypeDefinition;
 			if (currentTypeDef != null && nameToken.Name == currentTypeDef.Name) {
-				Colorize(nameToken, GetTypeHighlighting (currentTypeDef.Kind));
+				TColor color;
+				if (TryGetTypeHighlighting (currentTypeDef.Kind, out color))
+					Colorize(nameToken, color);
 			}
 			VisitChildrenAfter(constructorDeclaration, nameToken);
 		}
@@ -463,11 +469,8 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 					color = methodCallColor;
 					return true;
 				case EntityType.Constructor:
-					color = GetTypeHighlighting (member.DeclaringType.Kind);
-					return true;
 				case EntityType.Destructor:
-					color = GetTypeHighlighting (member.DeclaringType.Kind);
+					return TryGetTypeHighlighting (member.DeclaringType.Kind, out color);
-					return true;
 				default:
 					color = default (TColor);
 					return false;
@@ -490,23 +493,30 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 			}
 		}
 		
-		TColor GetTypeHighlighting (TypeKind kind)
+		bool TryGetTypeHighlighting (TypeKind kind, out TColor color)
 		{
 			switch (kind) {
 				case TypeKind.Class:
-					return referenceTypeColor;
+					color = referenceTypeColor;
+					return true;
 				case TypeKind.Struct:
-					return valueTypeColor;
+					color = valueTypeColor;
+					return true;
 				case TypeKind.Interface:
-					return interfaceTypeColor;
+					color = interfaceTypeColor;
+					return true;
 				case TypeKind.Enum:
-					return enumerationTypeColor;
+					color = enumerationTypeColor;
+					return true;
 				case TypeKind.TypeParameter:
-					return typeParameterTypeColor;
+					color = typeParameterTypeColor;
+					return true;
 				case TypeKind.Delegate:
-					return delegateTypeColor;
+					color = delegateTypeColor;
+					return true;
 				default:
-					throw new InvalidOperationException ("Unknown class type kind :" + kind);
+					color = default (TColor);
+					return false;
 			}
 		}
 		

ICSharpCode.NRefactory.Tests/CSharp/Analysis/SemanticHighlightingTests.cs

@@ -0,0 +1,140 @@
+//
+// SemanticHighlightingTests.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.TypeSystem;
+using NUnit.Framework;
+using System.Reflection;
+using System.Text;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.Editor;
+
+namespace ICSharpCode.NRefactory.CSharp.Analysis
+{
+	[TestFixture]
+	public class SemanticHighlightingTests
+	{
+		class TestSemanticHighlightingVisitor : SemanticHighlightingVisitor<FieldInfo>
+		{
+			public TestSemanticHighlightingVisitor(CSharpAstResolver resolver)
+			{
+				base.resolver = resolver;
+				this.regionStart = new TextLocation (1, 1);
+				this.regionEnd = new TextLocation (int.MaxValue, int.MaxValue);
+				var fields = typeof (TestSemanticHighlightingVisitor).GetFields (BindingFlags.NonPublic | BindingFlags.Instance);
+				foreach (var field in fields) {
+					if (field.FieldType == typeof (FieldInfo))
+						field.SetValue (this, field);
+				}
+			}
+
+			List<Tuple<DomRegion, string>> colors = new List<Tuple<DomRegion, string>> ();
+
+			protected override void Colorize(TextLocation start, TextLocation end, FieldInfo color)
+			{
+				colors.Add (Tuple.Create (new DomRegion (start, end), color != null ? color.Name : null));
+			}
+
+			public string GetColor(TextLocation loc)
+			{
+				foreach (var color in colors) {
+					if (color.Item1.IsInside (loc))
+						return color.Item2;
+				}
+				return null;
+			}
+		}
+
+		static TestSemanticHighlightingVisitor CreateHighighting (string text)
+		{
+			var syntaxTree = SyntaxTree.Parse (text, "a.cs");
+			if (syntaxTree.Errors.Count > 0) {
+				Console.WriteLine (text);
+				Assert.Fail ("parse error.");
+			}
+			var project = new CSharpProjectContent().AddAssemblyReferences(new [] { CecilLoaderTests.Mscorlib, CecilLoaderTests.SystemCore });
+			var file = syntaxTree.ToTypeSystem();
+			project = project.AddOrUpdateFiles(file);
+
+			var resolver = new CSharpAstResolver(project.CreateCompilation(), syntaxTree, file);
+			var result = new TestSemanticHighlightingVisitor (resolver);
+			syntaxTree.AcceptVisitor (result);
+			return result;
+		}
+
+		void TestColor(string text, string keywordColor)
+		{
+			var sb = new StringBuilder ();
+			var offsets = new List<int> ();
+			foreach (var ch in text) {
+				if (ch == '$') {
+					offsets.Add (sb.Length);
+					continue;
+				}
+				sb.Append (ch);
+			}
+			var visitor = CreateHighighting (sb.ToString ());
+			var doc = new ReadOnlyDocument (sb.ToString ());
+
+			foreach (var offset in offsets) {
+				var loc = doc.GetLocation (offset);
+				var color = visitor.GetColor (loc);
+				Assert.AreEqual (keywordColor, color, "Color at " + loc + " is wrong:" + color);
+			}
+		}
+
+		[Test]
+		public void TestValueInPropertySetter()
+		{
+			TestColor (@"class Class { int Property { get {} set { test = $value; } } }", "valueKeywordColor");
+		}
+
+		[Test]
+		public void TestValueInPropertyGetter()
+		{
+			TestColor (@"class Class { int value; int Property { get { return $value; } set { } } }", "fieldAccessColor");
+		}
+
+		[Test]
+		public void TestValueInCustomEvent()
+		{
+			TestColor (@"using System;
+class Class {
+	public event EventHandler Property { 
+		add { Console.WriteLine ($value); } 
+		remove { Console.WriteLine ($value); }
+	}
+}", "valueKeywordColor");
+		}
+	
+		[Test]
+		public void TestExternAliasColor()
+		{
+			TestColor (@"extern $alias FooBar;", "externAliasKeywordColor");
+		}
+	}
+}
+

ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj

@@ -393,6 +393,7 @@
     <Compile Include="CSharp\CodeCompletion\GetCurrentParameterIndexTests.cs" />
     <Compile Include="CSharp\CodeIssues\SimplifyAnonymousMethodToDelegateIssueTests.cs" />
     <Compile Include="CSharp\CodeIssues\CS0127ReturnMustNotBeFollowedByAnyExpressionTests.cs" />
+    <Compile Include="CSharp\Analysis\SemanticHighlightingTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\cecil\Mono.Cecil.csproj">
@@ -431,8 +432,8 @@
     <MonoDevelop>
       <Properties>
         <Policies>
-          <TextStylePolicy TabWidth="4" EolMarker="Unix" inheritsSet="Mono" inheritsScope="text/plain" scope="text/plain" />
+          <TextStylePolicy TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/plain" />
-          <TextStylePolicy FileWidth="120" TabWidth="4" EolMarker="Unix" inheritsSet="Mono" inheritsScope="text/plain" scope="text/x-csharp" />
+          <TextStylePolicy FileWidth="120" TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/x-csharp" />
           <CSharpFormattingPolicy IndentSwitchBody="True" IfElseBraceForcement="AddBraces" ForBraceForcement="AddBraces" ForEachBraceForcement="AddBraces" WhileBraceForcement="AddBraces" UsingBraceForcement="AddBraces" FixedBraceForcement="AddBraces" BeforeMethodDeclarationParentheses="False" BeforeMethodCallParentheses="False" BeforeConstructorDeclarationParentheses="False" BeforeDelegateDeclarationParentheses="False" NewParentheses="False" inheritsSet="Mono" inheritsScope="text/x-csharp" scope="text/x-csharp" />
         </Policies>
       </Properties>