diff options
author | Mike Krüger <mkrueger@novell.com> | 2011-05-10 12:22:40 +0400 |
---|---|---|
committer | Mike Krüger <mkrueger@novell.com> | 2011-05-10 12:23:06 +0400 |
commit | da55ba82e6a69cade40b1de419c2c4f5611160b4 (patch) | |
tree | 8210d418b373e38a669d693748012712690ffcfa /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content | |
parent | b1762ac16c89239258b02a8cbd5bd2d3f6cfd358 (diff) |
Completion data can now do more complex actions / moved the skipchar
system to texteditordata.
To demonstrate it I've implemented automatic brackets for methods when
automatic brackets are turned on.
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content')
-rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/CompletionTextEditorExtension.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/CompletionTextEditorExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/CompletionTextEditorExtension.cs index d06a9bd3a8..563fd118bd 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/CompletionTextEditorExtension.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/CompletionTextEditorExtension.cs @@ -74,9 +74,8 @@ namespace MonoDevelop.Ide.Gui.Content KeyActions ka = KeyActions.None; if (currentCompletionContext != null) { - autoHideCompletionWindow = false; if (CompletionWindowManager.PreProcessKeyEvent (key, keyChar, modifier, out ka)) { - CompletionWindowManager.PostProcessKeyEvent (ka); + CompletionWindowManager.PostProcessKeyEvent (ka, key, keyChar, modifier); autoHideCompletionWindow = true; return false; } @@ -94,7 +93,7 @@ namespace MonoDevelop.Ide.Gui.Content res = base.KeyPress (key, keyChar, modifier); - CompletionWindowManager.PostProcessKeyEvent (ka); + CompletionWindowManager.PostProcessKeyEvent (ka, key, keyChar, modifier); var ignoreMods = Gdk.ModifierType.ControlMask | Gdk.ModifierType.MetaMask | Gdk.ModifierType.Mod1Mask | Gdk.ModifierType.SuperMask; @@ -130,8 +129,7 @@ namespace MonoDevelop.Ide.Gui.Content ref triggerWordLength); if (triggerWordLength > 0 && (triggerWordLength < Editor.Caret.Offset - || (triggerWordLength == 1 && Editor.Caret.Offset == 1))) - { + || (triggerWordLength == 1 && Editor.Caret.Offset == 1))) { currentCompletionContext = CompletionWidget.CreateCodeCompletionContext (Editor.Caret.Offset - triggerWordLength); currentCompletionContext.TriggerWordLength = triggerWordLength; |