From 8006f453095e9f3f8fda8c11d4725d62ab829eb3 Mon Sep 17 00:00:00 2001 From: Cyryl Plotnicki-Chudyk Date: Sun, 21 Nov 2010 19:35:09 +0100 Subject: [PATCH] disabling code completion in the options menu now works for the code editor see SD-1763 --- .../AvalonEdit.AddIn/Src/CodeCompletionEditorAdapter.cs | 4 ++++ .../AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.cs | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeCompletionEditorAdapter.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeCompletionEditorAdapter.cs index 057f9d40ba..c3b4d1ca4e 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeCompletionEditorAdapter.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeCompletionEditorAdapter.cs @@ -31,6 +31,10 @@ namespace ICSharpCode.AvalonEdit.AddIn { if (data == null || !data.Items.Any()) return null; + if(CodeCompletionOptions.EnableCodeCompletion == false) + { + return null; + } SharpDevelopCompletionWindow window = new SharpDevelopCompletionWindow(this, this.TextEditor.TextArea, data); textEditor.ShowCompletionWindow(window); return window; diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.cs index 40d2d85741..a44076f850 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.cs @@ -70,6 +70,11 @@ namespace ICSharpCode.AvalonEdit.AddIn if (itemList == null) throw new ArgumentNullException("itemList"); + if(CodeCompletionOptions.EnableCodeCompletion == false) + { + throw new InvalidOperationException("trying to construct SharpDevelopCompletionWindow while EnableCodeCompletion = false"); + } + if (!itemList.ContainsAllAvailableItems) { // If more items are available (Ctrl+Space wasn't pressed), show this hint this.EmptyText = StringParser.Parse("${res:ICSharpCode.AvalonEdit.AddIn.SharpDevelopCompletionWindow.EmptyText}");