From 0630068f58b85f145e9a74fbac0c47d964bb87ae Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 31 May 2009 19:04:11 +0000 Subject: [PATCH] Move code completion types into ICSharpCode.SharpDevelop.Editor.CodeCompletion. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4175 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Src/CodeCompletion/CompletionBinding.cs | 1 + .../CSharpBinding/Project/Src/CSharpCompletionBinding.cs | 1 + .../CSharpBinding/Tests/MockTextEditor.cs | 3 ++- .../CSharpBinding/Tests/OverrideCompletionTests.cs | 3 ++- .../Project/Src/PythonCodeCompletionBinding.cs | 1 + .../Test/Utils/DerivedPythonCodeCompletionBinding.cs | 5 +++-- .../VBNetBinding/Project/Src/VBNetCompletionBinding.cs | 1 + .../XamlBinding/XamlBinding/CompletionDataHelper.cs | 2 +- .../XamlBinding/XamlBinding/XamlCodeCompletionBinding.cs | 2 +- .../XamlBinding/XamlBinding/XamlCompletionItem.cs | 3 ++- .../XamlBinding/XamlBinding/XamlCompletionItemList.cs | 1 + .../DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs | 2 +- .../AvalonEdit.AddIn/Src/CodeEditorAdapter.cs | 2 +- .../AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.cs | 2 +- .../AvalonEdit.AddIn/Src/SharpDevelopInsightWindow.cs | 2 +- .../AbstractNRefactoryResourceCodeCompletionBinding.cs | 1 + .../ICSharpCodeCoreResourceCodeCompletionBinding.cs | 1 + .../Src/Editor/AvalonEdit/AvalonEditTextEditorAdapter.cs | 2 +- .../Src/Editor/CodeCompletion/AttributesItemProvider.cs | 2 +- .../Src/Editor/CodeCompletion/CodeCompletionBinding.cs | 2 +- .../CodeCompletion/CodeCompletionDataUsageCache.cs | 2 +- .../Editor/CodeCompletion/CodeCompletionItemProvider.cs | 2 +- .../CodeCompletion/CommentCompletionItemProvider.cs | 2 +- .../Src/Editor/CodeCompletion/CompletionContext.cs | 2 +- .../CodeCompletion/CtrlSpaceCompletionItemProvider.cs | 2 +- .../Project/Src/Editor/CodeCompletion/ICompletionItem.cs | 2 +- .../Src/Editor/CodeCompletion/ICompletionItemList.cs | 2 +- .../Project/Src/Editor/CodeCompletion/IInsightItem.cs | 2 +- .../Project/Src/Editor/CodeCompletion/IInsightWindow.cs | 2 +- .../Src/Editor/CodeCompletion/IndexerInsightProvider.cs | 2 +- .../Src/Editor/CodeCompletion/MethodInsightItem.cs | 2 +- .../Src/Editor/CodeCompletion/MethodInsightProvider.cs | 2 +- .../CodeCompletion/NRefactoryCodeCompletionBinding.cs | 2 +- .../Src/Editor/CodeCompletion/OverrideCompletionItem.cs | 9 ++------- .../CodeCompletion/OverrideCompletionItemProvider.cs | 7 ++----- .../CodeCompletion/TemplateCompletionItemProvider.cs | 2 +- .../Editor/CodeCompletion/TextCompletionItemProvider.cs | 2 +- src/Main/Base/Project/Src/Editor/ITextEditor.cs | 3 ++- src/Main/Base/Project/Src/TextEditor/Actions.cs | 2 +- .../CodeGenerators/OverrideMethodsCodeGenerator.cs | 3 ++- .../CodeGenerators/OverridePropertiesCodeGenerator.cs | 3 ++- .../Project/Src/TextEditor/Gui/Dialogs/GotoDialog.cs | 3 ++- .../Gui/Editor/CompletionWindow/CodeCompletionData.cs | 3 ++- .../TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs | 3 ++- .../TextEditor/Gui/OptionPanels/CodeCompletionPanel.cs | 2 +- .../Base/Project/Src/TextEditor/Gui/TextEditorAdapter.cs | 2 +- src/Main/Base/Test/MemberLookupHelperTests.cs | 3 ++- src/Main/Base/Test/OverridableMethodsTestFixture.cs | 3 ++- src/Main/Base/Test/OverridablePropertiesTestFixture.cs | 3 ++- 49 files changed, 65 insertions(+), 53 deletions(-) diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/CodeCompletion/CompletionBinding.cs b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/CodeCompletion/CompletionBinding.cs index 9eef4c0487..3088a39bd3 100644 --- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/CodeCompletion/CompletionBinding.cs +++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/CodeCompletion/CompletionBinding.cs @@ -5,6 +5,7 @@ // $Revision$ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor; diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpCompletionBinding.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpCompletionBinding.cs index c7f6013ba5..1b227879e1 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpCompletionBinding.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpCompletionBinding.cs @@ -5,6 +5,7 @@ // $Revision$ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using ICSharpCode.Core; using ICSharpCode.NRefactory; diff --git a/src/AddIns/BackendBindings/CSharpBinding/Tests/MockTextEditor.cs b/src/AddIns/BackendBindings/CSharpBinding/Tests/MockTextEditor.cs index adfacd4718..8e75a3f3b9 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Tests/MockTextEditor.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Tests/MockTextEditor.cs @@ -5,12 +5,13 @@ // $Revision$ // -using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Collections.Generic; using ICSharpCode.AvalonEdit; using ICSharpCode.Core; using ICSharpCode.SharpDevelop; +using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor; namespace CSharpBinding.Tests diff --git a/src/AddIns/BackendBindings/CSharpBinding/Tests/OverrideCompletionTests.cs b/src/AddIns/BackendBindings/CSharpBinding/Tests/OverrideCompletionTests.cs index c2d10fd2b8..fbd3672d93 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Tests/OverrideCompletionTests.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Tests/OverrideCompletionTests.cs @@ -5,9 +5,10 @@ // $Revision$ // -using ICSharpCode.SharpDevelop.Editor; +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Linq; +using ICSharpCode.SharpDevelop.Editor; using NUnit.Framework; namespace CSharpBinding.Tests diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonCodeCompletionBinding.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonCodeCompletionBinding.cs index 5c5b981296..ecf5ee493a 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonCodeCompletionBinding.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonCodeCompletionBinding.cs @@ -5,6 +5,7 @@ // $Revision$ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Dom; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedPythonCodeCompletionBinding.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedPythonCodeCompletionBinding.cs index a0555f6ef8..112cb0f334 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedPythonCodeCompletionBinding.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedPythonCodeCompletionBinding.cs @@ -5,11 +5,12 @@ // $Revision$ // -using ICSharpCode.SharpDevelop; +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Editor; +using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.TextEditor.Gui.CompletionWindow; namespace PythonBinding.Tests.Utils diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs index 796b2d8cdc..ec60be17ef 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs @@ -5,6 +5,7 @@ // $Revision$ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using ICSharpCode.Core; using ICSharpCode.NRefactory; diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs index 367e58d028..184394a7d4 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs @@ -5,13 +5,13 @@ // $Revision$ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; using System.Xml; - using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor; diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCodeCompletionBinding.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCodeCompletionBinding.cs index 67c9d04d9b..6362277233 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCodeCompletionBinding.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCodeCompletionBinding.cs @@ -5,10 +5,10 @@ // $Revision: 3731 $ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Collections.Generic; using System.Linq; - using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor; diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItem.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItem.cs index 622e9da248..ffb9d9bffa 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItem.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItem.cs @@ -5,9 +5,10 @@ // $Revision: 3731 $ // -using ICSharpCode.SharpDevelop; +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Linq; +using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor; diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs index 8d7bd2e5f2..b18882d19e 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs @@ -5,6 +5,7 @@ // $Revision: 3731 $ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Linq; using ICSharpCode.NRefactory.Ast; diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs index 83ce02ea27..4a0760826f 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs @@ -5,6 +5,7 @@ // $Revision$ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Collections.ObjectModel; using System.Diagnostics; @@ -15,7 +16,6 @@ using System.Windows.Data; using System.Windows.Input; using System.Windows.Media; using System.Windows.Threading; - using ICSharpCode.AvalonEdit.CodeCompletion; using ICSharpCode.AvalonEdit.Document; using ICSharpCode.AvalonEdit.Editing; diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorAdapter.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorAdapter.cs index 1ed944781c..a59d6d3617 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorAdapter.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorAdapter.cs @@ -5,10 +5,10 @@ // $Revision$ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Collections.Generic; using System.Linq; - using ICSharpCode.AvalonEdit.CodeCompletion; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Editor; diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.cs index a052e35ac8..bb482b4791 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.cs @@ -5,10 +5,10 @@ // $Revision$ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Windows.Input; using System.Windows.Media; - using ICSharpCode.AvalonEdit.CodeCompletion; using ICSharpCode.AvalonEdit.Document; using ICSharpCode.AvalonEdit.Editing; diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopInsightWindow.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopInsightWindow.cs index 6b4f447dd8..a7082a12a7 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopInsightWindow.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopInsightWindow.cs @@ -5,12 +5,12 @@ // $Revision$ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Collections.Specialized; using System.ComponentModel; - using ICSharpCode.AvalonEdit.CodeCompletion; using ICSharpCode.AvalonEdit.Editing; using ICSharpCode.SharpDevelop.Editor; diff --git a/src/AddIns/Misc/ResourceToolkit/Project/Src/CodeCompletion/AbstractNRefactoryResourceCodeCompletionBinding.cs b/src/AddIns/Misc/ResourceToolkit/Project/Src/CodeCompletion/AbstractNRefactoryResourceCodeCompletionBinding.cs index 10367d2acd..ea8c478f58 100644 --- a/src/AddIns/Misc/ResourceToolkit/Project/Src/CodeCompletion/AbstractNRefactoryResourceCodeCompletionBinding.cs +++ b/src/AddIns/Misc/ResourceToolkit/Project/Src/CodeCompletion/AbstractNRefactoryResourceCodeCompletionBinding.cs @@ -5,6 +5,7 @@ // $Revision$ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using Hornung.ResourceToolkit.Resolver; using Hornung.ResourceToolkit.ResourceFileContent; diff --git a/src/AddIns/Misc/ResourceToolkit/Project/Src/CodeCompletion/ICSharpCodeCoreResourceCodeCompletionBinding.cs b/src/AddIns/Misc/ResourceToolkit/Project/Src/CodeCompletion/ICSharpCodeCoreResourceCodeCompletionBinding.cs index 22a919c1f2..b2df761f90 100644 --- a/src/AddIns/Misc/ResourceToolkit/Project/Src/CodeCompletion/ICSharpCodeCoreResourceCodeCompletionBinding.cs +++ b/src/AddIns/Misc/ResourceToolkit/Project/Src/CodeCompletion/ICSharpCodeCoreResourceCodeCompletionBinding.cs @@ -5,6 +5,7 @@ // $Revision$ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using Hornung.ResourceToolkit.Resolver; using Hornung.ResourceToolkit.ResourceFileContent; diff --git a/src/Main/Base/Project/Src/Editor/AvalonEdit/AvalonEditTextEditorAdapter.cs b/src/Main/Base/Project/Src/Editor/AvalonEdit/AvalonEditTextEditorAdapter.cs index d6014e2b9d..5b2cca427f 100644 --- a/src/Main/Base/Project/Src/Editor/AvalonEdit/AvalonEditTextEditorAdapter.cs +++ b/src/Main/Base/Project/Src/Editor/AvalonEdit/AvalonEditTextEditorAdapter.cs @@ -5,11 +5,11 @@ // $Revision$ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Collections.Generic; using System.Diagnostics; using System.Windows; - using ICSharpCode.AvalonEdit.Editing; namespace ICSharpCode.SharpDevelop.Editor diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/AttributesItemProvider.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/AttributesItemProvider.cs index e75edfebad..08d0223336 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/AttributesItemProvider.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/AttributesItemProvider.cs @@ -9,7 +9,7 @@ using System; using System.Linq; using ICSharpCode.SharpDevelop.Dom; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { /// /// Provides code completion for attribute names. diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionBinding.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionBinding.cs index 3ac559545c..fe14543641 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionBinding.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionBinding.cs @@ -11,7 +11,7 @@ using System.IO; using ICSharpCode.Core; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { /// /// Interface that gives backend bindings the possibility to control what characters and diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionDataUsageCache.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionDataUsageCache.cs index 7f0c39eae6..d84b589cbf 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionDataUsageCache.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionDataUsageCache.cs @@ -12,7 +12,7 @@ using System.IO; using ICSharpCode.Core; using ICSharpCode.SharpDevelop.Project; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { /// /// Tracks the names of the top-used CodeCompletionData items and gives them higher diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionItemProvider.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionItemProvider.cs index cf3447443d..dc20b1c332 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionItemProvider.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionItemProvider.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using ICSharpCode.Core; using ICSharpCode.SharpDevelop.Dom; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { /// /// Base class for completion item providers. diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/CommentCompletionItemProvider.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/CommentCompletionItemProvider.cs index 1177c9c278..13dbe55b79 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/CommentCompletionItemProvider.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/CommentCompletionItemProvider.cs @@ -7,7 +7,7 @@ using System; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { /// /// Data provider for code completion. diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/CompletionContext.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/CompletionContext.cs index ac63f2e1bc..7b4313956c 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/CompletionContext.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/CompletionContext.cs @@ -7,7 +7,7 @@ using System; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { /// /// Container class for the parameters available to the Complete function. diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/CtrlSpaceCompletionItemProvider.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/CtrlSpaceCompletionItemProvider.cs index 3b93f5ee27..c2dbf43174 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/CtrlSpaceCompletionItemProvider.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/CtrlSpaceCompletionItemProvider.cs @@ -10,7 +10,7 @@ using System.Collections; using ICSharpCode.Core; using ICSharpCode.SharpDevelop.Dom; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { public class CtrlSpaceCompletionItemProvider : CodeCompletionItemProvider { diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/ICompletionItem.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/ICompletionItem.cs index 2b47227611..44a23bcdb9 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/ICompletionItem.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/ICompletionItem.cs @@ -7,7 +7,7 @@ using System; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { public interface ICompletionItem { diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/ICompletionItemList.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/ICompletionItemList.cs index d20417516c..a862947136 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/ICompletionItemList.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/ICompletionItemList.cs @@ -8,7 +8,7 @@ using System; using System.Collections.Generic; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { public interface ICompletionItemList { diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/IInsightItem.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/IInsightItem.cs index ee4770dea3..7b76da2700 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/IInsightItem.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/IInsightItem.cs @@ -7,7 +7,7 @@ using System; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { /// /// An item in the insight window. diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/IInsightWindow.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/IInsightWindow.cs index bde6d4848c..2c7cfc4313 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/IInsightWindow.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/IInsightWindow.cs @@ -8,7 +8,7 @@ using System; using System.Collections.Generic; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { /// /// Describes a set of insight items (e.g. multiple overloads of a method) to be displayed in the insight window. diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/IndexerInsightProvider.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/IndexerInsightProvider.cs index 99b45c0130..e8397c8f15 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/IndexerInsightProvider.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/IndexerInsightProvider.cs @@ -9,7 +9,7 @@ using System; using System.Linq; using ICSharpCode.SharpDevelop.Dom; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { /// /// Produces MethodInsightItem instances for showing the insight window on indexer calls. diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/MethodInsightItem.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/MethodInsightItem.cs index fa8aef4bdd..a0a829ea2e 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/MethodInsightItem.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/MethodInsightItem.cs @@ -8,7 +8,7 @@ using ICSharpCode.SharpDevelop.Dom; using System; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { /// /// An insight item that represents an entity. diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/MethodInsightProvider.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/MethodInsightProvider.cs index 18347a1540..554ff14e80 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/MethodInsightProvider.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/MethodInsightProvider.cs @@ -13,7 +13,7 @@ using System.Linq; using ICSharpCode.Core; using ICSharpCode.SharpDevelop.Dom; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { /// /// Produces MethodInsightItem instances for showing the insight window on method calls. diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/NRefactoryCodeCompletionBinding.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/NRefactoryCodeCompletionBinding.cs index 1f5cae305d..86f716d523 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/NRefactoryCodeCompletionBinding.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/NRefactoryCodeCompletionBinding.cs @@ -19,7 +19,7 @@ using ICSharpCode.TextEditor; using CSTokens = ICSharpCode.NRefactory.Parser.CSharp.Tokens; using VBTokens = ICSharpCode.NRefactory.Parser.VB.Tokens; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { /// /// Base class for C# and VB Code Completion Binding. diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/OverrideCompletionItem.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/OverrideCompletionItem.cs index 3b35dd74a6..37b8eb61bf 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/OverrideCompletionItem.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/OverrideCompletionItem.cs @@ -5,17 +5,12 @@ // $Revision$ // -using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; using System; -using System.Collections.Generic; -using System.Linq; +using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Dom.Refactoring; -using ICSharpCode.TextEditor; -using ICSharpCode.TextEditor.Document; -using ICSharpCode.TextEditor.Gui.CompletionWindow; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { public class OverrideCompletionItem : ICompletionItem { diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/OverrideCompletionItemProvider.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/OverrideCompletionItemProvider.cs index 636fdc8a42..fd90f1784c 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/OverrideCompletionItemProvider.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/OverrideCompletionItemProvider.cs @@ -8,13 +8,10 @@ using System; using System.Collections.Generic; using System.Linq; + using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.Refactoring; -using ICSharpCode.TextEditor; -using ICSharpCode.TextEditor.Document; -using ICSharpCode.TextEditor.Gui.CompletionWindow; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { public class OverrideCompletionItemProvider : AbstractCompletionItemProvider { diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/TemplateCompletionItemProvider.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/TemplateCompletionItemProvider.cs index a7026dbe46..b798d9bc03 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/TemplateCompletionItemProvider.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/TemplateCompletionItemProvider.cs @@ -9,7 +9,7 @@ using System; using ICSharpCode.Core; using ICSharpCode.SharpDevelop.Internal.Templates; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { public class TemplateCompletionItemProvider : AbstractCompletionItemProvider { diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/TextCompletionItemProvider.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/TextCompletionItemProvider.cs index 97047d1231..5b51e619b0 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/TextCompletionItemProvider.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/TextCompletionItemProvider.cs @@ -7,7 +7,7 @@ using System; -namespace ICSharpCode.SharpDevelop.Editor +namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion { /// /// Data provider for code completion. diff --git a/src/Main/Base/Project/Src/Editor/ITextEditor.cs b/src/Main/Base/Project/Src/Editor/ITextEditor.cs index 8d079db8fb..b8e4eae45a 100644 --- a/src/Main/Base/Project/Src/Editor/ITextEditor.cs +++ b/src/Main/Base/Project/Src/Editor/ITextEditor.cs @@ -5,9 +5,10 @@ // $Revision$ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; -using ICSharpCode.NRefactory; using System.Collections.Generic; +using ICSharpCode.NRefactory; namespace ICSharpCode.SharpDevelop.Editor { diff --git a/src/Main/Base/Project/Src/TextEditor/Actions.cs b/src/Main/Base/Project/Src/TextEditor/Actions.cs index 288037e874..53f4c07ce9 100644 --- a/src/Main/Base/Project/Src/TextEditor/Actions.cs +++ b/src/Main/Base/Project/Src/TextEditor/Actions.cs @@ -22,7 +22,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Actions SharpDevelopTextAreaControl sdtac = (SharpDevelopTextAreaControl)services.MotherTextEditorControl; services.AutoClearSelection = false; - new ICSharpCode.SharpDevelop.Editor.TemplateCompletionItemProvider().ShowCompletion(sdtac.Adapter); + new ICSharpCode.SharpDevelop.Editor.CodeCompletion.TemplateCompletionItemProvider().ShowCompletion(sdtac.Adapter); } } diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverrideMethodsCodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverrideMethodsCodeGenerator.cs index 8d887988e1..49526cca26 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverrideMethodsCodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverrideMethodsCodeGenerator.cs @@ -5,13 +5,14 @@ // $Revision$ // -using ICSharpCode.SharpDevelop.Editor; +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Collections; using System.Collections.Generic; using ICSharpCode.NRefactory.Ast; using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Editor; namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands { diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverridePropertiesCodeGenerator.cs b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverridePropertiesCodeGenerator.cs index f4111ef0c4..5b812ab59d 100644 --- a/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverridePropertiesCodeGenerator.cs +++ b/src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/OverridePropertiesCodeGenerator.cs @@ -5,13 +5,14 @@ // $Revision$ // -using ICSharpCode.SharpDevelop.Editor; +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Collections; using System.Collections.Generic; using ICSharpCode.NRefactory.Ast; using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Editor; namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands { diff --git a/src/Main/Base/Project/Src/TextEditor/Gui/Dialogs/GotoDialog.cs b/src/Main/Base/Project/Src/TextEditor/Gui/Dialogs/GotoDialog.cs index 1b3b8e431a..01ba13542c 100644 --- a/src/Main/Base/Project/Src/TextEditor/Gui/Dialogs/GotoDialog.cs +++ b/src/Main/Base/Project/Src/TextEditor/Gui/Dialogs/GotoDialog.cs @@ -5,7 +5,7 @@ // $Revision$ // -using ICSharpCode.SharpDevelop.Editor; +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Collections; using System.Collections.Generic; @@ -18,6 +18,7 @@ using System.Windows.Input; using ICSharpCode.Core; using ICSharpCode.Core.Presentation; using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.SharpDevelop.Gui diff --git a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/CompletionWindow/CodeCompletionData.cs b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/CompletionWindow/CodeCompletionData.cs index c6b84303c3..db0acee142 100644 --- a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/CompletionWindow/CodeCompletionData.cs +++ b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/CompletionWindow/CodeCompletionData.cs @@ -5,7 +5,7 @@ // $Revision$ // -using ICSharpCode.SharpDevelop.Editor; +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Drawing; using System.Text; @@ -13,6 +13,7 @@ using System.Text.RegularExpressions; using System.Xml; using ICSharpCode.Core; using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.TextEditor; using ICSharpCode.TextEditor.Gui.CompletionWindow; diff --git a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs index b4a89ba32a..af038fc774 100644 --- a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs +++ b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs @@ -5,13 +5,14 @@ // $Revision$ // -using ICSharpCode.SharpDevelop.Editor; +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Collections.Generic; using System.Windows.Forms; using ICSharpCode.Core; using ICSharpCode.Core.WinForms; using ICSharpCode.SharpDevelop.DefaultEditor.Actions; +using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Internal.Templates; using ICSharpCode.TextEditor; diff --git a/src/Main/Base/Project/Src/TextEditor/Gui/OptionPanels/CodeCompletionPanel.cs b/src/Main/Base/Project/Src/TextEditor/Gui/OptionPanels/CodeCompletionPanel.cs index b248ca348e..6039de6cff 100644 --- a/src/Main/Base/Project/Src/TextEditor/Gui/OptionPanels/CodeCompletionPanel.cs +++ b/src/Main/Base/Project/Src/TextEditor/Gui/OptionPanels/CodeCompletionPanel.cs @@ -34,7 +34,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels Get("dataUsageCacheItemCount").Value = CodeCompletionOptions.DataUsageCacheItemCount; ControlDictionary["clearDataUseCacheButton"].Click += delegate(object sender, EventArgs e) { - ICSharpCode.SharpDevelop.Editor.CodeCompletionDataUsageCache.ResetCache(); + ICSharpCode.SharpDevelop.Editor.CodeCompletion.CodeCompletionDataUsageCache.ResetCache(); }; Get("useTooltips").CheckedChanged += delegate(object sender, EventArgs e) { diff --git a/src/Main/Base/Project/Src/TextEditor/Gui/TextEditorAdapter.cs b/src/Main/Base/Project/Src/TextEditor/Gui/TextEditorAdapter.cs index 7044150653..171a740f4f 100644 --- a/src/Main/Base/Project/Src/TextEditor/Gui/TextEditorAdapter.cs +++ b/src/Main/Base/Project/Src/TextEditor/Gui/TextEditorAdapter.cs @@ -5,11 +5,11 @@ // $Revision$ // +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; - using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Refactoring; diff --git a/src/Main/Base/Test/MemberLookupHelperTests.cs b/src/Main/Base/Test/MemberLookupHelperTests.cs index da99ca4039..cd2158d108 100644 --- a/src/Main/Base/Test/MemberLookupHelperTests.cs +++ b/src/Main/Base/Test/MemberLookupHelperTests.cs @@ -5,12 +5,13 @@ // $Revision$ // -using ICSharpCode.SharpDevelop.Editor; +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Collections.Generic; using System.Linq; using ICSharpCode.Core; using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Project; using NUnit.Framework; diff --git a/src/Main/Base/Test/OverridableMethodsTestFixture.cs b/src/Main/Base/Test/OverridableMethodsTestFixture.cs index 70b6f7594c..9d6d5ad0be 100644 --- a/src/Main/Base/Test/OverridableMethodsTestFixture.cs +++ b/src/Main/Base/Test/OverridableMethodsTestFixture.cs @@ -5,11 +5,12 @@ // $Revision$ // -using ICSharpCode.SharpDevelop.Editor; +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Collections.Generic; using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Tests.Utils; using NUnit.Framework; diff --git a/src/Main/Base/Test/OverridablePropertiesTestFixture.cs b/src/Main/Base/Test/OverridablePropertiesTestFixture.cs index 995b858f41..ad7b09c1c2 100644 --- a/src/Main/Base/Test/OverridablePropertiesTestFixture.cs +++ b/src/Main/Base/Test/OverridablePropertiesTestFixture.cs @@ -5,11 +5,12 @@ // $Revision$ // -using ICSharpCode.SharpDevelop.Editor; +using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using System; using System.Collections.Generic; using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Tests.Utils; using NUnit.Framework;