diff options
| author | Mike Krüger <mkrueger@novell.com> | 2010-06-23 19:08:51 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@novell.com> | 2010-06-23 19:08:51 +0400 |
| commit | 1164ceee8d1e60dcb093392ec9b403fad3b76799 (patch) | |
| tree | a91b3d1065bd3613252f1237e74f757c7a5f2ed1 /main/src/core | |
| parent | 009a7859313bedf6a3c76b1077294b65e3701b8f (diff) | |
* MonoDevelop.Ide.CodeCompletion/CompletionData.cs:
* MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs: Fixed 'Bug
616653 - "import symbol" does not resolve full typenames'.
svn path=/trunk/monodevelop/; revision=159430
Diffstat (limited to 'main/src/core')
3 files changed, 9 insertions, 5 deletions
diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog index f3882cc134..c76f9c24f7 100644 --- a/main/src/core/MonoDevelop.Ide/ChangeLog +++ b/main/src/core/MonoDevelop.Ide/ChangeLog @@ -1,3 +1,10 @@ +2010-06-23 Mike Krüger <mkrueger@novell.com> + + * MonoDevelop.Ide.CodeCompletion/CompletionData.cs: + * MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs: + Fixed 'Bug 616653 - "import symbol" does not resolve full + typenames'. + 2010-06-21 Lluis Sanchez Gual <lluis@novell.com> * MonoDevelop.Ide.Commands/CustomStringTagProvider.cs: Add diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionData.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionData.cs index c127082bb2..f99dedc4f9 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionData.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionData.cs @@ -78,6 +78,8 @@ namespace MonoDevelop.Ide.CodeCompletion public virtual void InsertCompletionText (CompletionListWindow window) { + if (CompletionText == GetCurrentWord (window)) + return; window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, GetCurrentWord (window), CompletionText); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs index ffd57cd87d..55e3bee5ef 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs @@ -326,11 +326,6 @@ namespace MonoDevelop.Ide.CodeCompletion CompletionData item = completionDataList[SelectionIndex]; if (item == null) return false; - if (item.CompletionText == CompletionData.GetCurrentWord (this)) { - AddWordToHistory (item.CompletionText); - OnWordCompleted (new CodeCompletionContextEventArgs (CompletionWidget, CodeCompletionContext, item.CompletionText)); - return false; - } item.InsertCompletionText (this); AddWordToHistory (item.CompletionText); OnWordCompleted (new CodeCompletionContextEventArgs (CompletionWidget, CodeCompletionContext, item.CompletionText)); |