From 22f7e306781fabfd4b1d2dfb3ebb9ade1e34028c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Thu, 9 Feb 2012 08:11:57 +0100 Subject: [PATCH] Take correct type for override completion. --- .../Completion/CSharpCompletionEngine.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs index 133e645fcc..d96cdea403 100644 --- a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs +++ b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs @@ -1114,10 +1114,9 @@ namespace ICSharpCode.NRefactory.CSharp.Completion } if (!IsLineEmptyUpToEol ()) return null; - var overrideCls = CSharpParsedFile.GetInnermostTypeDefinition (location); - if (overrideCls != null && (overrideCls.Kind == TypeKind.Class || overrideCls.Kind == TypeKind.Struct)) { + if (currentType != null && (currentType.Kind == TypeKind.Class || currentType.Kind == TypeKind.Struct)) { string modifiers = document.GetText (firstMod, wordStart - firstMod); - return GetOverrideCompletionData (overrideCls, modifiers); + return GetOverrideCompletionData (currentType, modifiers); } return null; case "partial":