From d09dc0e10ae496bf0aa9d156a89faa42a8563c6b Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Wed, 8 May 2013 20:32:18 +0200
Subject: [PATCH] Fix compiler warnings

---
 .../Main.cs                                   |  4 +--
 ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs  |  2 +-
 ICSharpCode.NRefactory.CSharp/Ast/AstType.cs  |  9 +++++
 .../Completion/CSharpCompletionEngine.cs      |  2 +-
 .../Formatter/CSharpFormatter.cs              |  1 -
 .../OutputVisitor/CSharpAmbience.cs           |  4 +--
 .../Refactoring/CodeAction.cs                 |  5 +++
 .../Refactoring/CodeActions/AddUsingAction.cs |  2 +-
 .../ConvertAnonymousDelegateToLambdaAction.cs |  2 +-
 .../CreateClassDeclarationAction.cs           |  2 +-
 .../CodeActions/ExtractFieldAction.cs         |  4 +--
 .../FlipOperatorArgumentsAction.cs            |  2 +-
 .../SplitDeclarationAndAssignmentAction.cs    |  2 +-
 .../CodeActions/UseExplicitTypeAction.cs      |  6 ++--
 .../CodeActions/UseVarKeywordAction.cs        |  6 ++--
 .../CodeIssues/ConvertToStaticMethodIssue.cs  |  3 --
 .../ExplicitConversionInForEachIssue.cs       |  4 +--
 .../CodeIssues/GatherVisitorBase.cs           |  2 +-
 .../RedundantArrayInitializerCommaIssue.cs    |  2 +-
 .../CodeIssues/RedundantAssignmentIssue.cs    |  2 +-
 ...erenceToStaticMemberViaDerivedTypeIssue.cs |  2 +-
 .../CodeIssues/UseVarKeywordIssue.cs          |  2 +-
 .../Resolver/CSharpAstResolver.cs             |  2 +-
 .../Resolver/ResolveVisitor.cs                | 10 ++----
 ICSharpCode.NRefactory.Demo/CSDemo.cs         |  2 +-
 ICSharpCode.NRefactory.GtkDemo/MainWindow.cs  |  2 +-
 .../CodeCompletion/CodeCompletionBugTests.cs  |  6 ++--
 .../CSharp/Parser/Bugs/ParserBugTests.cs      | 34 +++++++++----------
 .../CSharp/Parser/ParseUtil.cs                |  2 +-
 .../CSharp/QueryExpressionExpanderTests.cs    |  2 +-
 30 files changed, 64 insertions(+), 66 deletions(-)

diff --git a/ICSharpCode.NRefactory.CSharp.AstVerifier/Main.cs b/ICSharpCode.NRefactory.CSharp.AstVerifier/Main.cs
index 54ac57b80a..9fa2877a46 100644
--- a/ICSharpCode.NRefactory.CSharp.AstVerifier/Main.cs
+++ b/ICSharpCode.NRefactory.CSharp.AstVerifier/Main.cs
@@ -56,13 +56,13 @@ namespace ICSharpCode.NRefactory.CSharp.AstVerifier
 			int failed = 0, passed = 0;
 			Console.WriteLine ("search in " + directory);
 			foreach (var file in Directory.GetFileSystemEntries (directory, "*", SearchOption.AllDirectories)) {
-				if (!file.EndsWith (".cs"))
+				if (!file.EndsWith (".cs", StringComparison.Ordinal))
 					continue;
 				string text = File.ReadAllText (file);
 				var unit = SyntaxTree.Parse (text, file);
 				if (unit == null)
 					continue;
-				string generated = unit.GetText ();
+				string generated = unit.ToString ();
 				int i, j;
 				if (!IsMatch (text, generated, out i, out j)) {
 					if (i > 0 && j > 0 && verboseOutput) {
diff --git a/ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs b/ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs
index 114cb780c6..4f57eab320 100644
--- a/ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs
+++ b/ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs
@@ -958,7 +958,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		{
 			if (IsNull)
 				return "Null";
-			string text = GetText();
+			string text = ToString();
 			text = text.TrimEnd().Replace("\t", "").Replace(Environment.NewLine, " ");
 			if (text.Length > 100)
 				return text.Substring(0, 97) + "...";
diff --git a/ICSharpCode.NRefactory.CSharp/Ast/AstType.cs b/ICSharpCode.NRefactory.CSharp/Ast/AstType.cs
index 3ffe410abe..e120d0cdbb 100644
--- a/ICSharpCode.NRefactory.CSharp/Ast/AstType.cs
+++ b/ICSharpCode.NRefactory.CSharp/Ast/AstType.cs
@@ -125,6 +125,15 @@ namespace ICSharpCode.NRefactory.CSharp
 			return (AstType)base.Clone();
 		}
 		
+		/// <summary>
+		/// Gets whether this type is a SimpleType "var".
+		/// </summary>
+		public bool IsVar()
+		{
+			SimpleType st = this as SimpleType;
+			return st != null && st.Identifier == "var" && st.TypeArguments.Count == 0;
+		}
+		
 		/// <summary>
 		/// Create an ITypeReference for this AstType.
 		/// Uses the context (ancestors of this node) to determine the correct <see cref="NameLookupMode"/>.
diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
index a791e1cd7a..c526f6d8e5 100644
--- a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
+++ b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
@@ -2210,7 +2210,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 				var convertedParameter = builder.ConvertParameter(delegateMethod.Parameters [k]);
 				if (convertedParameter.ParameterModifier == ParameterModifier.Params)
 					convertedParameter.ParameterModifier = ParameterModifier.None;
-				sb.Append(convertedParameter.GetText(FormattingPolicy));
+				sb.Append(convertedParameter.ToString(FormattingPolicy));
 				sbWithoutTypes.Append(delegateMethod.Parameters [k].Name);
 			}
 			
diff --git a/ICSharpCode.NRefactory.CSharp/Formatter/CSharpFormatter.cs b/ICSharpCode.NRefactory.CSharp/Formatter/CSharpFormatter.cs
index fe9f83fc5a..a6969fea7e 100644
--- a/ICSharpCode.NRefactory.CSharp/Formatter/CSharpFormatter.cs
+++ b/ICSharpCode.NRefactory.CSharp/Formatter/CSharpFormatter.cs
@@ -90,7 +90,6 @@ namespace ICSharpCode.NRefactory.CSharp
 		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.CSharpFormatter"/> class.
 		/// </summary>
 		/// <param name="policy">The formatting policy to use.</param>
-		/// <param name="document">The text document to work upon.</param>
 		/// <param name="options">The text editor options (optional). Default is: TextEditorOptions.Default</param>
 		public CSharpFormatter(CSharpFormattingOptions policy, TextEditorOptions options = null)
 		{
diff --git a/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpAmbience.cs b/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpAmbience.cs
index ac7f6234e3..1cd38fc354 100644
--- a/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpAmbience.cs
+++ b/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpAmbience.cs
@@ -247,7 +247,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		{
 			TypeSystemAstBuilder astBuilder = CreateAstBuilder();
 			AstNode astNode = astBuilder.ConvertVariable(v);
-			return astNode.GetText().TrimEnd(';', '\r', '\n');
+			return astNode.ToString().TrimEnd(';', '\r', '\n');
 		}
 		
 		public string ConvertType(IType type)
@@ -257,7 +257,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			
 			TypeSystemAstBuilder astBuilder = CreateAstBuilder();
 			AstType astType = astBuilder.ConvertType(type);
-			return astType.GetText();
+			return astType.ToString();
 		}
 		
 		public void ConvertType(IType type, IOutputFormatter formatter, CSharpFormattingOptions formattingPolicy)
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeAction.cs
index 5a056314e9..7658a9e071 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeAction.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeAction.cs
@@ -73,6 +73,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		/// <param name='action'>
 		/// The code transformation.
 		/// </param>
+		/// <param name='astNode'>
+		/// A node that specifies the start/end positions for the code action.
+		/// </param>
 		public CodeAction (string description, Action<Script> action, AstNode astNode)
 		{
 			if (action == null)
@@ -96,6 +99,8 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		/// <param name='action'>
 		/// The code transformation.
 		/// </param>
+		/// <param name='start'>Start position for the code action.</param>
+		/// <param name='end'>End position for the code action.</param>
 		public CodeAction (string description, Action<Script> action, TextLocation start, TextLocation end)
 		{
 			if (action == null)
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddUsingAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddUsingAction.cs
index 8c4cee7994..b2f34ee227 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddUsingAction.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/AddUsingAction.cs
@@ -91,7 +91,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		CodeAction ReplaceWithFullTypeNameAction(RefactoringContext context, AstNode node, ITypeDefinition typeDefinition)
 		{
 			AstType astType = context.CreateShortType(typeDefinition);
-			string textWithoutGenerics = astType.GetText();
+			string textWithoutGenerics = astType.ToString();
 			foreach (var typeArg in node.GetChildrenByRole(Roles.TypeArgument)) {
 				astType.AddChild(typeArg.Clone(), Roles.TypeArgument);
 			}
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs
index b1e4ae5c2f..d838033d9d 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs
@@ -43,7 +43,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 				var parent = node.Parent;
 				while (!(parent is Statement))
 					parent = parent.Parent;
-				bool explicitLambda = parent is VariableDeclarationStatement && ((VariableDeclarationStatement)parent).Type.GetText() == "var";
+				bool explicitLambda = parent is VariableDeclarationStatement && ((VariableDeclarationStatement)parent).Type.IsVar();
 				var lambda = new LambdaExpression {	Body = node.Body.Clone() };
 				foreach (var parameter in node.Parameters) {
 					if (explicitLambda) {
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateClassDeclarationAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateClassDeclarationAction.cs
index 93b902f08f..4cf9f68ed6 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateClassDeclarationAction.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateClassDeclarationAction.cs
@@ -188,7 +188,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		static TypeDeclaration CreateClassFromObjectCreation(RefactoringContext context, ObjectCreateExpression createExpression)
 		{
 			TypeDeclaration result;
-			string className = createExpression.Type.GetText();
+			string className = createExpression.Type.ToString();
 			if (!createExpression.Arguments.Any()) {
 				result = new TypeDeclaration { Name = className };
 			} else {
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractFieldAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractFieldAction.cs
index 973b90e8e9..a2fbfbe2a4 100755
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractFieldAction.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractFieldAction.cs
@@ -35,8 +35,6 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 	[ContextAction("Extract field", Description = "Extracts a field from a local variable declaration.")]
 	public class ExtractFieldAction : ICodeActionProvider
 	{
-		static readonly AstType varType = new SimpleType ("var");
-
 		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
 		{
 			//TODO: implement variable assignment & ctor param
@@ -51,7 +49,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 					var name = varInit.Name;
 
 					AstType extractedType;
-					if (type.IsMatch (varType)) {
+					if (type.IsVar()) {
 						IType resolvedType = context.Resolve(varInit.Initializer).Type;
 						extractedType = context.CreateShortType(resolvedType);
 					}
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/FlipOperatorArgumentsAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/FlipOperatorArgumentsAction.cs
index 74a18c0f46..ba1806c194 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/FlipOperatorArgumentsAction.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/FlipOperatorArgumentsAction.cs
@@ -40,7 +40,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			}
 
 
-			yield return new CodeAction(string.Format(context.TranslateString("Flip '{0}' operator arguments"), binop.OperatorToken.GetText()), script => {
+			yield return new CodeAction(string.Format(context.TranslateString("Flip '{0}' operator arguments"), binop.OperatorToken.ToString()), script => {
 				script.Replace(binop.Left, binop.Right.Clone());
 				script.Replace(binop.Right, binop.Left.Clone());
 			}, binop.OperatorToken);
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitDeclarationAndAssignmentAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitDeclarationAndAssignmentAction.cs
index 50705906b8..cf195e7f78 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitDeclarationAndAssignmentAction.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/SplitDeclarationAndAssignmentAction.cs
@@ -51,7 +51,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 				var newVarDecl = (VariableDeclarationStatement)varDecl.Clone();
 				newVarDecl.Role = BlockStatement.StatementRole;
 				
-				if (newVarDecl.Type.IsMatch(new SimpleType ("var"))) {
+				if (newVarDecl.Type.IsVar()) {
 					newVarDecl.Type = type;
 				}
 				
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseExplicitTypeAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseExplicitTypeAction.cs
index e86be91879..9e3987a7ed 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseExplicitTypeAction.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseExplicitTypeAction.cs
@@ -74,12 +74,10 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			return arrayType != null && ContainsAnonymousType (arrayType.ElementType);
 		}
 
-		static readonly AstType varType = new SimpleType ("var");
-
 		static VariableDeclarationStatement GetVariableDeclarationStatement (RefactoringContext context)
 		{
 			var result = context.GetNode<VariableDeclarationStatement> ();
-			if (result != null && result.Variables.Count == 1 && !result.Variables.First ().Initializer.IsNull && result.Type.Contains (context.Location.Line, context.Location.Column) && result.Type.IsMatch (varType)) {
+			if (result != null && result.Variables.Count == 1 && !result.Variables.First ().Initializer.IsNull && result.Type.Contains (context.Location.Line, context.Location.Column) && result.Type.IsVar ()) {
 				if (context.Resolve (result.Variables.First ().Initializer) == null)
 					return null;
 				return result;
@@ -90,7 +88,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		static ForeachStatement GetForeachStatement (RefactoringContext context)
 		{
 			var result = context.GetNode<ForeachStatement> ();
-			if (result != null && result.VariableType.Contains (context.Location) && result.VariableType.IsMatch (varType))
+			if (result != null && result.VariableType.Contains (context.Location) && result.VariableType.IsVar ())
 				return result;
 			return null;
 		}
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseVarKeywordAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseVarKeywordAction.cs
index 1039a3eaae..b47c312f64 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseVarKeywordAction.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/UseVarKeywordAction.cs
@@ -52,12 +52,10 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			}, (AstNode)varDecl ?? foreachStmt);
 		}
 		
-		static readonly AstType varType = new SimpleType ("var");
-
 		static VariableDeclarationStatement GetVariableDeclarationStatement (RefactoringContext context)
 		{
 			var result = context.GetNode<VariableDeclarationStatement> ();
-			if (result != null && result.Variables.Count == 1 && !result.Variables.First ().Initializer.IsNull && result.Type.Contains (context.Location) && !result.Type.IsMatch (varType))
+			if (result != null && result.Variables.Count == 1 && !result.Variables.First ().Initializer.IsNull && result.Type.Contains (context.Location) && !result.Type.IsVar ())
 				return result;
 			return null;
 		}
@@ -65,7 +63,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		static ForeachStatement GetForeachStatement (RefactoringContext context)
 		{
 			var result = context.GetNode<ForeachStatement> ();
-			if (result != null && result.VariableType.Contains (context.Location) && !result.VariableType.IsMatch (varType))
+			if (result != null && result.VariableType.Contains (context.Location) && !result.VariableType.IsVar ())
 				return result;
 			return null;
 		}
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConvertToStaticMethodIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConvertToStaticMethodIssue.cs
index 9d26bb84df..dff0b63dcb 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConvertToStaticMethodIssue.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConvertToStaticMethodIssue.cs
@@ -43,9 +43,6 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 
 		private class GatherVisitor : GatherVisitorBase<ConvertToStaticMethodIssue>
 		{
-			bool initializerInvoked;
-			ConstructorInitializer initializer;
-
 			public GatherVisitor(BaseRefactoringContext context)
                 : base(context)
 			{
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExplicitConversionInForEachIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExplicitConversionInForEachIssue.cs
index b99dc4ef3c..fa8095cbe4 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExplicitConversionInForEachIssue.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExplicitConversionInForEachIssue.cs
@@ -65,9 +65,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 				AstType variableType = foreachStatement.VariableType;
 				string issueText = ctx.TranslateString("Collection element type '{0}' is not implicitly convertible to '{1}'");
 				string fixText = ctx.TranslateString("Use type '{0}'");
-				AddIssue(variableType, string.Format(issueText, elementType.GetText(), variableType.GetText()),
+				AddIssue(variableType, string.Format(issueText, elementType.ToString(), variableType.ToString()),
 				         new CodeAction(
-								string.Format(fixText, elementType.GetText()),
+								string.Format(fixText, elementType.ToString()),
 								script => script.Replace(variableType, elementType),
 								foreachStatement));
 			}
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/GatherVisitorBase.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/GatherVisitorBase.cs
index 76a019f096..a9771d2912 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/GatherVisitorBase.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/GatherVisitorBase.cs
@@ -79,7 +79,7 @@ namespace ICSharpCode.NRefactory.CSharp
 		}
 
 		/// <summary>
-		/// Initializes a new instance of the <see cref="ICSharpCode.NRefactory.CSharp.GatherVisitorBase"/> class.
+		/// Initializes a new instance of the <see cref="GatherVisitorBase{T}"/> class.
 		/// </summary>
 		/// <param name='ctx'>
 		/// The refactoring context.
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantArrayInitializerCommaIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantArrayInitializerCommaIssue.cs
index a684f21b4f..47340bee7f 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantArrayInitializerCommaIssue.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantArrayInitializerCommaIssue.cs
@@ -55,7 +55,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 					return;
 
 				var commaToken = arrayInitializerExpression.RBraceToken.PrevSibling as CSharpTokenNode;
-				if (commaToken == null || commaToken.GetText () != ",")
+				if (commaToken == null || commaToken.ToString () != ",")
 					return;
 				string initializerType;
 				if (arrayInitializerExpression.Parent is ObjectCreateExpression) {
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantAssignmentIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantAssignmentIssue.cs
index d34793db52..2847f7915c 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantAssignmentIssue.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantAssignmentIssue.cs
@@ -256,7 +256,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
                     var varDecl = node.Parent as VariableDeclarationStatement;
 
                     var isDeclareStatement = varDecl != null;
-                    var isUsingVar = isDeclareStatement && (varDecl.Type.ToString() == "var");
+                    var isUsingVar = isDeclareStatement && varDecl.Type.IsVar();
 
                     var expressionType = ctx.Resolve(node).Type;
 
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceToStaticMemberViaDerivedTypeIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceToStaticMemberViaDerivedTypeIssue.cs
index ab80bd9eba..6e5670eea1 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceToStaticMemberViaDerivedTypeIssue.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ReferenceToStaticMemberViaDerivedTypeIssue.cs
@@ -105,7 +105,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			{
 				var builder = context.CreateTypeSytemAstBuilder(targetExpression);
 				var newType = builder.ConvertType(member.DeclaringType);
-				string description = string.Format("{0} '{1}'", context.TranslateString("Use base class"), newType.GetText());
+				string description = string.Format("{0} '{1}'", context.TranslateString("Use base class"), newType.ToString());
 				return new CodeAction(description, script => {
 					script.Replace(targetExpression, newType);
 				}, targetExpression);
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs
index 5fedeca936..b633d2f8a6 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs
@@ -61,7 +61,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 				if (variableDeclarationStatement.Type is PrimitiveType) {
 					return;
 				}
-				if (variableDeclarationStatement.Type is SimpleType && ((SimpleType)variableDeclarationStatement.Type).Identifier == "var") { 
+				if (variableDeclarationStatement.Type.IsVar()) {
 					return;
 				}
 				if (variableDeclarationStatement.Variables.Count != 1) {
diff --git a/ICSharpCode.NRefactory.CSharp/Resolver/CSharpAstResolver.cs b/ICSharpCode.NRefactory.CSharp/Resolver/CSharpAstResolver.cs
index b2af066702..390eb766df 100644
--- a/ICSharpCode.NRefactory.CSharp/Resolver/CSharpAstResolver.cs
+++ b/ICSharpCode.NRefactory.CSharp/Resolver/CSharpAstResolver.cs
@@ -166,7 +166,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 				try {
 					ResolveResult rr = resolveVisitor.GetResolveResult(node);
 					if (rr == null)
-						Debug.Fail (node.GetType () + " resolved to null.", node.StartLocation + ":'" + node.GetText () + "'");
+						Debug.Fail (node.GetType () + " resolved to null.", node.StartLocation + ":'" + node.ToString () + "'");
 					return rr;
 				} finally {
 					resolveVisitor.cancellationToken = CancellationToken.None;
diff --git a/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs b/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs
index 13bbef3bac..b16b5200a2 100644
--- a/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs
+++ b/ICSharpCode.NRefactory.CSharp/Resolver/ResolveVisitor.cs
@@ -2759,7 +2759,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		{
 			var compilation = resolver.Compilation;
 			ResolveResult expression = Resolve(foreachStatement.InExpression);
-			bool isImplicitlyTypedVariable = IsVar(foreachStatement.VariableType);
+			bool isImplicitlyTypedVariable = foreachStatement.VariableType.IsVar();
 			var memberLookup = resolver.CreateMemberLookup();
 			
 			IType collectionType, enumeratorType, elementType;
@@ -2934,7 +2934,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		ResolveResult IAstVisitor<ResolveResult>.VisitVariableDeclarationStatement(VariableDeclarationStatement variableDeclarationStatement)
 		{
 			bool isConst = (variableDeclarationStatement.Modifiers & Modifiers.Const) != 0;
-			if (!isConst && IsVar(variableDeclarationStatement.Type) && variableDeclarationStatement.Variables.Count == 1) {
+			if (!isConst && variableDeclarationStatement.Type.IsVar() && variableDeclarationStatement.Variables.Count == 1) {
 				VariableInitializer vi = variableDeclarationStatement.Variables.Single();
 				StoreCurrentState(variableDeclarationStatement.Type);
 				IType type = Resolve(vi.Initializer).Type;
@@ -3120,12 +3120,6 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
 		#endregion
 		
 		#region Local Variable Type Inference
-		static bool IsVar(AstNode returnType)
-		{
-			SimpleType st = returnType as SimpleType;
-			return st != null && st.Identifier == "var" && st.TypeArguments.Count == 0;
-		}
-		
 		IVariable MakeVariable(IType type, Identifier variableName)
 		{
 			return new SimpleVariable(MakeRegion(variableName), type, variableName.Name);
diff --git a/ICSharpCode.NRefactory.Demo/CSDemo.cs b/ICSharpCode.NRefactory.Demo/CSDemo.cs
index e6db1206f8..08f3d62bde 100644
--- a/ICSharpCode.NRefactory.Demo/CSDemo.cs
+++ b/ICSharpCode.NRefactory.Demo/CSDemo.cs
@@ -148,7 +148,7 @@ namespace ICSharpCode.NRefactory.Demo
 		
 		void CSharpGenerateCodeButtonClick(object sender, EventArgs e)
 		{
-			csharpCodeTextBox.Text = syntaxTree.GetText();
+			csharpCodeTextBox.Text = syntaxTree.ToString();
 		}
 		
 		int GetOffset(TextBox textBox, TextLocation location)
diff --git a/ICSharpCode.NRefactory.GtkDemo/MainWindow.cs b/ICSharpCode.NRefactory.GtkDemo/MainWindow.cs
index abb346dde1..43ab541256 100644
--- a/ICSharpCode.NRefactory.GtkDemo/MainWindow.cs
+++ b/ICSharpCode.NRefactory.GtkDemo/MainWindow.cs
@@ -107,7 +107,7 @@ namespace ICSharpCode.NRefactory.GtkDemo
 
 		void CSharpGenerateCodeButtonClick(object sender, EventArgs e)
 		{
-			this.textview1.Buffer.Text = unit.GetText();
+			this.textview1.Buffer.Text = unit.ToString();
 		}
 		
 		void SelectionChanged (object sender, EventArgs e)
diff --git a/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs
index 52e7f0e7ef..b41f00682a 100644
--- a/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs
+++ b/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs
@@ -209,8 +209,8 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 
 			public ICompletionData CreateTypeCompletionData (ICSharpCode.NRefactory.TypeSystem.IType type, bool fullName, bool isInAttributeContext)
 			{
-				string name = fullName ? builder.ConvertType(type).GetText() : type.Name; 
-				if (isInAttributeContext && name.EndsWith("Attribute") && name.Length > "Attribute".Length) {
+				string name = fullName ? builder.ConvertType(type).ToString() : type.Name; 
+				if (isInAttributeContext && name.EndsWith("Attribute", StringComparison.Ordinal) && name.Length > "Attribute".Length) {
 					name = name.Substring(0, name.Length - "Attribute".Length);
 				}
 				return new CompletionData (name);
@@ -218,7 +218,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeCompletion
 
 			public ICompletionData CreateMemberCompletionData(IType type, IEntity member)
 			{
-				string name = builder.ConvertType(type).GetText(); 
+				string name = builder.ConvertType(type).ToString(); 
 				return new EntityCompletionData (member, name + "."+ member.Name);
 			}
 
diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Bugs/ParserBugTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Bugs/ParserBugTests.cs
index 45e899875a..02ae4df20c 100644
--- a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Bugs/ParserBugTests.cs
+++ b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Bugs/ParserBugTests.cs
@@ -58,7 +58,7 @@ class Foo
 			var passed = !constructor.HasModifier(Modifiers.Override);
 			if (!passed) {
 				Console.WriteLine("Expected:" + code);
-				Console.WriteLine("Was:" + unit.GetText());
+				Console.WriteLine("Was:" + unit);
 			}
 			Assert.IsTrue(passed);
 		}
@@ -83,7 +83,7 @@ class Stub
 			bool passed = method.Body.Statements.FirstOrDefault() is ReturnStatement;
 			if (!passed) {
 				Console.WriteLine("Expected:" + code);
-				Console.WriteLine("Was:" + unit.GetText());
+				Console.WriteLine("Was:" + unit);
 			}
 			Assert.IsTrue(passed);
 		}
@@ -108,7 +108,7 @@ class TestClass
 			bool passed = constructor.GetNodeAt<AttributeSection>(constructor.LParToken.StartLocation.Line, constructor.LParToken.StartLocation.Column + 1) != null;
 			if (!passed) {
 				Console.WriteLine("Expected:" + code);
-				Console.WriteLine("Was:" + unit.GetText());
+				Console.WriteLine("Was:" + unit);
 			}
 			Assert.IsTrue(passed);
 		}
@@ -137,7 +137,7 @@ class Foo
 			bool passed = !method.Body.IsNull;
 			if (!passed) {
 				Console.WriteLine("Expected:" + code);
-				Console.WriteLine("Was:" + unit.GetText());
+				Console.WriteLine("Was:" + unit);
 			}
 			Assert.IsTrue(passed);
 		}
@@ -164,10 +164,10 @@ class Foo
 	{
 		for (int i = 0; i < foo.bar;)
 	}
-}" == unit.GetText ().Trim ();
+}" == unit.ToString().Trim ();
 			if (!passed) {
 				Console.WriteLine("Expected:" + code);
-				Console.WriteLine("Was:" + unit.GetText());
+				Console.WriteLine("Was:" + unit);
 			}
 			Assert.IsTrue(passed);
 		}
@@ -196,7 +196,7 @@ class Foo
 			
 			if (!passed) {
 				Console.WriteLine("Expected:" + code);
-				Console.WriteLine("Was:" + unit.GetText());
+				Console.WriteLine("Was:" + unit);
 			}
 			Assert.IsTrue(passed);
 		}
@@ -222,7 +222,7 @@ class Foo
 			
 			if (!passed) {
 				Console.WriteLine("Expected:" + code);
-				Console.WriteLine("Was:" + unit.GetText());
+				Console.WriteLine("Was:" + unit);
 			}
 			Assert.IsTrue(passed);
 		}
@@ -248,7 +248,7 @@ class Foo
 			bool passed = !method.Body.IsNull;
 			if (!passed) {
 				Console.WriteLine("Expected:" + code);
-				Console.WriteLine("Was:" + unit.GetText());
+				Console.WriteLine("Was:" + unit);
 			}
 			Assert.IsTrue(passed);
 		}
@@ -275,7 +275,7 @@ class Foo
 			bool passed = method.Body.Statements.FirstOrDefault() is TryCatchStatement;
 			if (!passed) {
 				Console.WriteLine("Expected:" + code);
-				Console.WriteLine("Was:" + unit.GetText());
+				Console.WriteLine("Was:" + unit);
 			}
 			Assert.IsTrue(passed);
 		}
@@ -301,7 +301,7 @@ class Test
 ";
 			var unit = SyntaxTree.Parse(code);
 			
-			bool passed = unit.GetText().Trim() == @"using System;
+			bool passed = unit.ToString().Trim() == @"using System;
 class Test
 {
 	void Foo ()
@@ -312,7 +312,7 @@ class Test
 }";
 			if (!passed) {
 				Console.WriteLine("Expected:" + code);
-				Console.WriteLine("Was:" + unit.GetText());
+				Console.WriteLine("Was:" + unit);
 			}
 			Assert.IsTrue(passed);
 		}
@@ -340,7 +340,7 @@ class Foo
 			bool passed = !method.Body.IsNull;
 			if (!passed) {
 				Console.WriteLine("Expected:" + code);
-				Console.WriteLine("Was:" + unit.GetText());
+				Console.WriteLine("Was:" + unit);
 			}
 			Assert.IsTrue(passed);
 		}
@@ -361,7 +361,7 @@ class Foo
 }";
 			var unit = SyntaxTree.Parse(code);
 			
-			string text = unit.GetText().Trim();
+			string text = unit.ToString().Trim();
 			string expected = @"public class Bar
 {
 	public IEnumerable<Foo> GetFoos()
@@ -387,7 +387,7 @@ class Foo
 			bool passed = i == text.Length && j == expected.Length;
 			if (!passed) {
 				Console.WriteLine("Expected:" + expected);
-				Console.WriteLine("Was:" + unit.GetText());
+				Console.WriteLine("Was:" + unit);
 			}
 			Assert.IsTrue(passed);
 		}
@@ -418,7 +418,7 @@ class Foo
 			bool passed = stmt.Expression is ObjectCreateExpression;
 			if (!passed) {
 				Console.WriteLine("Expected:" + code);
-				Console.WriteLine("Was:" + unit.GetText());
+				Console.WriteLine("Was:" + unit);
 			}
 			Assert.IsTrue(passed);
 		}
@@ -439,7 +439,7 @@ class Foo
 			bool passed = method.Parameters.Count == 1;
 			if (!passed) {
 				Console.WriteLine("Expected:" + code);
-				Console.WriteLine("Was:" + unit.GetText());
+				Console.WriteLine("Was:" + unit);
 			}
 			Assert.IsTrue(passed);
 		}
diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs b/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs
index a016cac544..ac771072d3 100644
--- a/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs
+++ b/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs
@@ -143,7 +143,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser
 		
 		static string ToCSharp(AstNode node)
 		{
-			return node.GetText();
+			return node.ToString();
 		}
 	}
 }
diff --git a/ICSharpCode.NRefactory.Tests/CSharp/QueryExpressionExpanderTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/QueryExpressionExpanderTests.cs
index 031135acab..6ddadda8a4 100644
--- a/ICSharpCode.NRefactory.Tests/CSharp/QueryExpressionExpanderTests.cs
+++ b/ICSharpCode.NRefactory.Tests/CSharp/QueryExpressionExpanderTests.cs
@@ -40,7 +40,7 @@ namespace ICSharpCode.NRefactory.CSharp {
 		}
 
 		private void AssertCorrect(AstNode actual, string expected) {
-			Assert.That(Regex.Replace(actual.GetText(), @"\s+", "").Replace("<>", ""), Is.EqualTo(Regex.Replace(expected, @"\s+", "")));
+			Assert.That(Regex.Replace(actual.ToString(), @"\s+", "").Replace("<>", ""), Is.EqualTo(Regex.Replace(expected, @"\s+", "")));
 		}
 
 		private void AssertLookupCorrect<T, U>(IEnumerable<KeyValuePair<T, U>> actual, IList<Tuple<TextLocation, AstNode>> expected) where T : AstNode where U : AstNode {