Merge pull request #2298 from mono/master-fix55706

Fixed 'Bug 55706 - CompletionTextEditorExtension.TriggerCompletion ha…

1 files changed, 2 insertions, 4 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 99fecd0ea8..6e53da2cfb 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
@@ -154,8 +154,8 @@ namespace MonoDevelop.Ide.Editor.Extension
 				return res;
 			// Handle code completion
 			if (descriptor.KeyChar != '\0' && CompletionWidget != null && !CompletionWindowManager.IsVisible) {
-				CurrentCompletionContext = CompletionWidget.CurrentCodeCompletionContext;
 				completionTokenSrc.Cancel ();
+				CurrentCompletionContext = CompletionWidget.CurrentCodeCompletionContext;
 				completionTokenSrc = new CancellationTokenSource ();
 				var caretOffset = Editor.CaretOffset;
 				var token = completionTokenSrc.Token;
@@ -177,7 +177,7 @@ namespace MonoDevelop.Ide.Editor.Extension
 							if (result != null) {
 								int triggerWordLength = result.TriggerWordLength + (Editor.CaretOffset - caretOffset);
 								if (triggerWordLength > 0 && (triggerWordLength < Editor.CaretOffset
-								                              || (triggerWordLength == 1 && Editor.CaretOffset == 1))) {
+															  || (triggerWordLength == 1 && Editor.CaretOffset == 1))) {
 									CurrentCompletionContext = CompletionWidget.CreateCodeCompletionContext (Editor.CaretOffset - triggerWordLength);
 									if (result.TriggerWordStart >= 0)
 										CurrentCompletionContext.TriggerOffset = result.TriggerWordStart;
@@ -195,9 +195,7 @@ namespace MonoDevelop.Ide.Editor.Extension
 						CurrentCompletionContext = null;
 					}
 				} catch (TaskCanceledException) {
-					CurrentCompletionContext = null;
 				} catch (AggregateException) {
-					CurrentCompletionContext = null;
 				}
 			}