Merge NRefactory changes from SharpDevelop repository:

* TypeSystemAstBuilder: show async modifier only if ShowModifiers is set.
* remove wrong null-check in VariableReference implementation
* add ISymbolReference implementation
* fix icsharpcode/sharpdevelop#299: Declare local variable: Automatic variable naming

1 files changed, 2 insertions, 0 deletions

diff --git a/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/DeclareLocalVariableAction.cs b/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/DeclareLocalVariableAction.cs
index da4564c7..6e68019f 100644
--- a/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/DeclareLocalVariableAction.cs
+++ b/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/DeclareLocalVariableAction.cs
@@ -72,6 +72,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 					guessedType = GetDelegateType(context, ((MethodGroupResolveResult)resolveResult).Methods.First(), expr);
 				}
 				var name = CreateMethodDeclarationAction.CreateBaseName(expr, guessedType);
+				name = context.GetLocalNameProposal(name, expr.StartLocation);
 				var type = context.UseExplicitTypes ? context.CreateShortType(guessedType) : new SimpleType("var");
 				var varDecl = new VariableDeclarationStatement(type, name, expr.Clone());
 				var replaceNode = visitor.Matches.First () as Expression;
@@ -100,6 +101,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 					}
 					var linkedNodes = new List<AstNode>();
 					var name = CreateMethodDeclarationAction.CreateBaseName(expr, guessedType);
+					name = context.GetLocalNameProposal(name, expr.StartLocation);
 					var type = context.UseExplicitTypes ? context.CreateShortType(guessedType) : new SimpleType("var");
 					var varDecl = new VariableDeclarationStatement(type, name, expr.Clone());
 					linkedNodes.Add(varDecl.Variables.First().NameToken);