Merge remote-tracking branch 'upstream/master' into mansheng

ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs

@@ -5295,6 +5295,36 @@ static class Ext
 				Assert.IsNull(provider.Find("this"), "'this' found.");
 			});
 		}
+		
+		/// <summary>
+		/// Bug 5404 - Completion and highlighting for pointers 
+		/// </summary>
+		[Test()]
+		public void TestBug5404()
+		{
+			CombinedProviderTest(
+				@"using System;
+
+namespace TestConsole
+{
+unsafe class MainClass
+{
+public int i = 5, j =19;
+
+public static void Main (string[] args)
+{
+MainClass*  mc;
+$mc->$
+}
+}
+}
+", provider => {
+				Assert.IsNotNull(provider.Find("i"), "'i' not found.");
+			});
+		}
+		
+
+
 
 	}
 }

ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/PrimitiveExpressionTests.cs

@@ -145,9 +145,9 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Expression
 		public void InvalidHexadecimalInteger()
 		{
 			// don't check result, just make sure there is no exception
-			ParseUtilCSharp.ParseExpression<PrimitiveExpression>("0x2GF", expectErrors: true);
-			ParseUtilCSharp.ParseExpression<PrimitiveExpression>("0xG2F", expectErrors: true);
-			ParseUtilCSharp.ParseExpression<PrimitiveExpression>("0x", expectErrors: true); // SD-457
+			ParseUtilCSharp.ParseExpression<ICSharpCode.NRefactory.CSharp.Expression>("0x2GF", expectErrors: true);
+			ParseUtilCSharp.ParseExpression<ICSharpCode.NRefactory.CSharp.Expression>("0xG2F", expectErrors: true);
+			ParseUtilCSharp.ParseExpression<ICSharpCode.NRefactory.CSharp.Expression>("0x", expectErrors: true); // SD-457
 			// hexadecimal integer >ulong.MaxValue
 			ParseUtilCSharp.ParseExpression<PrimitiveExpression>("0xfedcba98765432100", expectErrors: true);
 		}