From c919c50647353d050f122def27ea9c42d512d7c7 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Tue, 6 Apr 2010 14:14:40 +0000 Subject: [PATCH] fixed XAML CC unit tests git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5671 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../XamlBinding.Tests/TextEditorBasedTests.cs | 4 ++-- .../XamlBinding/XamlBinding/CompletionDataHelper.cs | 2 +- .../XamlBinding/XamlCodeCompletionBinding.cs | 10 ---------- .../XamlBinding/XamlBinding/XamlCompletionItemList.cs | 6 +++--- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/TextEditorBasedTests.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/TextEditorBasedTests.cs index 91cbe689d2..8722f3ff68 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/TextEditorBasedTests.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/TextEditorBasedTests.cs @@ -28,7 +28,7 @@ namespace ICSharpCode.XamlBinding.Tests this.textEditor.Caret.Offset = fileHeader.Length; this.textEditor.CreateParseInformation(); - bool invoked = XamlCodeCompletionBinding.Instance.CtrlSpace(textEditor); + bool invoked = new XamlCodeCompletionBinding().CtrlSpace(textEditor); Assert.AreEqual(expected, invoked); @@ -43,7 +43,7 @@ namespace ICSharpCode.XamlBinding.Tests this.textEditor.Caret.Offset = fileHeader.Length; this.textEditor.CreateParseInformation(); - CodeCompletionKeyPressResult result = XamlCodeCompletionBinding.Instance.HandleKeyPress(textEditor, keyPressed); + CodeCompletionKeyPressResult result = new XamlCodeCompletionBinding().HandleKeyPress(textEditor, keyPressed); Assert.AreEqual(keyPressResult, result); diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs index c83026fbf8..2fef80ef74 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs @@ -533,7 +533,7 @@ namespace ICSharpCode.XamlBinding DebugTimer.Stop("CreateListForContext - InTag"); break; case XamlContextDescription.InAttributeValue: - XamlCodeCompletionBinding.Instance.CtrlSpace(editor); + new XamlCodeCompletionBinding().CtrlSpace(editor); break; } diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCodeCompletionBinding.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCodeCompletionBinding.cs index 40e3c1fbfe..f0c592d25b 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCodeCompletionBinding.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCodeCompletionBinding.cs @@ -16,18 +16,8 @@ namespace ICSharpCode.XamlBinding { public class XamlCodeCompletionBinding : ICodeCompletionBinding { - static XamlCodeCompletionBinding instance; bool trackForced = true; - public static XamlCodeCompletionBinding Instance { - get { - if (instance == null) - instance = new XamlCodeCompletionBinding(); - - return instance; - } - } - public CodeCompletionKeyPressResult HandleKeyPress(ITextEditor editor, char ch) { XamlCompletionContext context = CompletionDataHelper.ResolveCompletionContext(editor, ch); diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs index 990b68edc2..4b201162a3 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs @@ -76,7 +76,7 @@ namespace ICSharpCode.XamlBinding context.Editor.Document.Insert(context.EndOffset, "=\"\""); context.CompletionCharHandled = context.CompletionChar == '='; context.Editor.Caret.Offset--; - XamlCodeCompletionBinding.Instance.CtrlSpace(context.Editor); + new XamlCodeCompletionBinding().CtrlSpace(context.Editor); } else if (xamlContext.Description == XamlContextDescription.InMarkupExtension && !string.IsNullOrEmpty(xamlContext.RawAttributeValue)) { string valuePart = xamlContext.RawAttributeValue.Substring(0, xamlContext.ValueStartOffset); AttributeValue value = MarkupExtensionParser.ParseValue(valuePart); @@ -100,7 +100,7 @@ namespace ICSharpCode.XamlBinding } if (cItem.Text.EndsWith("=", StringComparison.OrdinalIgnoreCase)) - XamlCodeCompletionBinding.Instance.CtrlSpace(context.Editor); + new XamlCodeCompletionBinding().CtrlSpace(context.Editor); } } } @@ -121,7 +121,7 @@ namespace ICSharpCode.XamlBinding if (item is XamlCompletionItem && xamlContext.Description == XamlContextDescription.InTag) { context.Editor.Document.Insert(context.EndOffset, "=\"\""); context.Editor.Caret.Offset--; - XamlCodeCompletionBinding.Instance.CtrlSpace(context.Editor); + new XamlCodeCompletionBinding().CtrlSpace(context.Editor); } switch (item.Text) {