diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs index 9cd1b17a3e..e24914287b 100644 --- a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs +++ b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs @@ -691,7 +691,6 @@ namespace ICSharpCode.NRefactory.CSharp.Completion void AddTypesAndNamespaces (CompletionDataWrapper wrapper, CSharpResolver state, AstNode node, Predicate typePred = null, Predicate memberPred = null) { - var currentType = state.CurrentTypeDefinition ?? this.currentType; var currentMember = state.CurrentMember ?? this.currentMember; if (currentType != null) { for (var ct = currentType; ct != null; ct = ct.DeclaringTypeDefinition) { diff --git a/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs index e96cf73410..b053aeb4fd 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/CodeCompletionBugTests.cs @@ -892,6 +892,39 @@ namespace MyNamespace Assert.IsNotNull (provider.Find ("Bar"), "method 'Bar' not found."); } + /// + /// Bug 1932 - [new resolver] fields don't show up unless prefixed with 'this.' + /// + [Test()] + public void TestBug1932 () + { + CombinedProviderTest ( +@" +namespace MyNamespace +{ + partial class FormMain + { + int field1; + string field2; + } +} + +namespace MyNamespace +{ + public partial class FormMain + { + private void Bar() + { + $f$ + } + } +} +", provider => { + Assert.IsNotNull (provider.Find ("field1"), "field 'field1' not found."); + Assert.IsNotNull (provider.Find ("field2"), "field 'field2' not found."); + }); + } + /// /// Bug 432434 - Code completion doesn't work with subclasses ///