From 4e801c8d99a5ab479308509b40db41c53e7428cd Mon Sep 17 00:00:00 2001 From: Mike <@fe80::348f:8ff6:a34c:c566%10> Date: Tue, 7 Feb 2012 09:15:22 +0100 Subject: [PATCH] Fixed tuple parameter index. --- .../Completion/CSharpParameterCompletionEngine.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CSharpParameterCompletionEngine.cs b/ICSharpCode.NRefactory.CSharp/Completion/CSharpParameterCompletionEngine.cs index 087c50654b..e0809eb73c 100644 --- a/ICSharpCode.NRefactory.CSharp/Completion/CSharpParameterCompletionEngine.cs +++ b/ICSharpCode.NRefactory.CSharp/Completion/CSharpParameterCompletionEngine.cs @@ -260,7 +260,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion { SetOffset (triggerOffset); var text = GetMemberTextToCaret (); - if (text.Item1.EndsWith ("(")) + if (text.Item1.EndsWith ("(") || text.Item1.EndsWith ("<")) return 0; var parameter = new Stack (); @@ -282,6 +282,17 @@ namespace ICSharpCode.NRefactory.CSharp.Completion if (parameter.Count > 0) parameter.Pop (); break; + case '<': + if (inString || inChar || inVerbatimString || inSingleComment || inMultiLineComment) + break; + parameter.Push (0); + break; + case '>': + if (inString || inChar || inVerbatimString || inSingleComment || inMultiLineComment) + break; + if (parameter.Count > 0) + parameter.Pop (); + break; case ',': if (inString || inChar || inVerbatimString || inSingleComment || inMultiLineComment) break;