Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Krüger <mkrueger@xamarin.com>2017-07-31 12:08:45 +0300
committerMike Krüger <mkrueger@xamarin.com>2017-07-31 12:08:45 +0300
commit9bdf0e1bef87aa48db2afb16662f11d019e29f40 (patch)
tree72cae1f455bf6ed26682b493aded96ba43905c55 /main/src/core/MonoDevelop.Ide
parentd46ac4c719781c15173b0b6bb6dee65019b611a4 (diff)
Fixed 'Bug 58473 - [VSFeedback Ticket] #460850 - Complete Word hotkey
doesn't work if "Show completion list after a character is typed" is unchecked' Command broke during API changes for the webtools team. I added a test for that option.
Diffstat (limited to 'main/src/core/MonoDevelop.Ide')
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs
index 6e53da2cfb..ead731077b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs
@@ -150,8 +150,9 @@ namespace MonoDevelop.Ide.Editor.Extension
return res;
// don't complete on block selection
- if (/*!EnableCodeCompletion ||*/ Editor.SelectionMode == MonoDevelop.Ide.Editor.SelectionMode.Block)
+ if (!IdeApp.Preferences.EnableAutoCodeCompletion || Editor.SelectionMode == MonoDevelop.Ide.Editor.SelectionMode.Block)
return res;
+
// Handle code completion
if (descriptor.KeyChar != '\0' && CompletionWidget != null && !CompletionWindowManager.IsVisible) {
completionTokenSrc.Cancel ();