Browse Source

Remove ICSharpCode.SharpDevelop.DefaultEditor namespace.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6033 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Daniel Grunwald 16 years ago
parent
commit
359e7bb4ac
  1. 29
      AddIns/ICSharpCode.SharpDevelop.addin
  2. 5
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj
  3. 15
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  4. 5
      src/Main/Base/Project/Src/Bookmarks/Commands/MenuCommands.cs
  5. 6
      src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs
  6. 3
      src/Main/Base/Project/Src/Commands/EditCommands.cs
  7. 7
      src/Main/Base/Project/Src/Editor/AvalonEdit/TextContentCondition.cs
  8. 2
      src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionPanel.cs
  9. 1
      src/Main/Base/Project/Src/Editor/CodeCompletion/OverrideCompletionItem.cs
  10. 2
      src/Main/Base/Project/Src/Editor/Commands/ClassBookmarkMenuBuilder.cs
  11. 2
      src/Main/Base/Project/Src/Editor/Commands/ClassMemberMenuBuilder.cs
  12. 2
      src/Main/Base/Project/Src/Editor/Commands/GotoLineNumber.cs
  13. 4
      src/Main/Base/Project/Src/Editor/Commands/PasteAsCommands.cs
  14. 2
      src/Main/Base/Project/Src/Editor/TextNavigationPoint.cs
  15. 2
      src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs
  16. 1
      src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs
  17. 1
      src/Main/Base/Project/Src/Internal/Templates/Project/ProjectDescriptor.cs
  18. 3
      src/Main/Base/Project/Src/Services/AmbienceService/CodeDOMGeneratorUtility.cs
  19. 6
      src/Main/Base/Project/Src/Services/ProjectService/ParseableFileContentEnumerator.cs
  20. 1
      src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs
  21. 350
      src/Main/Base/Project/Src/TextEditor/Gui/Editor/SharpDevelopTextEditorProperties.cs
  22. 2
      src/Main/Base/Project/Src/Util/SDWindowsFormsHost.cs
  23. 5
      src/Main/Base/Test/CollectionClassOverridesTestFixture.cs
  24. 5
      src/Main/Base/Test/ExceptionClassOverridesTestFixture.cs

29
AddIns/ICSharpCode.SharpDevelop.addin

@ -23,7 +23,7 @@
<ConditionEvaluator name="WriteableProject" class="ICSharpCode.SharpDevelop.WriteableProjectConditionEvaluator"/> <ConditionEvaluator name="WriteableProject" class="ICSharpCode.SharpDevelop.WriteableProjectConditionEvaluator"/>
<ConditionEvaluator name="WriteableSolution" class="ICSharpCode.SharpDevelop.WriteableSolutionConditionEvaluator"/> <ConditionEvaluator name="WriteableSolution" class="ICSharpCode.SharpDevelop.WriteableSolutionConditionEvaluator"/>
<ConditionEvaluator name="ProjectActive" class="ICSharpCode.SharpDevelop.ProjectActiveConditionEvaluator"/> <ConditionEvaluator name="ProjectActive" class="ICSharpCode.SharpDevelop.ProjectActiveConditionEvaluator"/>
<ConditionEvaluator name="TextContent" class="ICSharpCode.SharpDevelop.DefaultEditor.Conditions.TextContentConditionEvaluator"/> <ConditionEvaluator name="TextContent" class="ICSharpCode.SharpDevelop.Editor.AvalonEdit.TextContentConditionEvaluator"/>
<ConditionEvaluator name="BrowserLocation" class="ICSharpCode.SharpDevelop.BrowserDisplayBinding.BrowserLocationConditionEvaluator"/> <ConditionEvaluator name="BrowserLocation" class="ICSharpCode.SharpDevelop.BrowserDisplayBinding.BrowserLocationConditionEvaluator"/>
<ConditionEvaluator name="RefactoringProviderSupports" class="ICSharpCode.SharpDevelop.Refactoring.RefactoringProviderSupportsConditionEvaluator"/> <ConditionEvaluator name="RefactoringProviderSupports" class="ICSharpCode.SharpDevelop.Refactoring.RefactoringProviderSupportsConditionEvaluator"/>
<ConditionEvaluator name="CanNavigateBack" class="ICSharpCode.SharpDevelop.CanNavigateBackConditionEvaluator"/> <ConditionEvaluator name="CanNavigateBack" class="ICSharpCode.SharpDevelop.CanNavigateBackConditionEvaluator"/>
@ -1552,7 +1552,7 @@
<MenuItem id = "GotoLineNr" <MenuItem id = "GotoLineNr"
label = "${res:XML.MainMenu.SearchMenu.Goto}" label = "${res:XML.MainMenu.SearchMenu.Goto}"
shortcut = "Control|G" shortcut = "Control|G"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.GotoLineNumber"/> class = "ICSharpCode.SharpDevelop.Editor.Commands.GotoLineNumber"/>
<MenuItem id = "GotoDefinition" <MenuItem id = "GotoDefinition"
label = "${res:ICSharpCode.NAntAddIn.GotoDefinitionMenuLabel}" label = "${res:ICSharpCode.NAntAddIn.GotoDefinitionMenuLabel}"
shortcut = "Control|Return" shortcut = "Control|Return"
@ -1699,19 +1699,19 @@
</Path> </Path>
<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/ClassMemberContextMenu"> <Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/ClassMemberContextMenu">
<MenuItem id = "MenuBuilder" type="Builder" class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.ClassMemberMenuBuilder" /> <MenuItem id = "MenuBuilder" type="Builder" class = "ICSharpCode.SharpDevelop.Editor.Commands.ClassMemberMenuBuilder" />
</Path> </Path>
<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/ClassBookmarkContextMenu"> <Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/ClassBookmarkContextMenu">
<MenuItem id = "MenuBuilder" type="Builder" class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.ClassBookmarkMenuBuilder" /> <MenuItem id = "MenuBuilder" type="Builder" class = "ICSharpCode.SharpDevelop.Editor.Commands.ClassBookmarkMenuBuilder" />
</Path> </Path>
<Path name = "/SharpDevelop/Pads/ClassBrowser/MemberContextMenu"> <Path name = "/SharpDevelop/Pads/ClassBrowser/MemberContextMenu">
<MenuItem id = "MenuBuilder" type="Builder" class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.ClassMemberMenuBuilder" /> <MenuItem id = "MenuBuilder" type="Builder" class = "ICSharpCode.SharpDevelop.Editor.Commands.ClassMemberMenuBuilder" />
</Path> </Path>
<Path name = "/SharpDevelop/Pads/ClassBrowser/ClassContextMenu"> <Path name = "/SharpDevelop/Pads/ClassBrowser/ClassContextMenu">
<MenuItem id = "MenuBuilder" type="Builder" class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.ClassBookmarkMenuBuilder" /> <MenuItem id = "MenuBuilder" type="Builder" class = "ICSharpCode.SharpDevelop.Editor.Commands.ClassBookmarkMenuBuilder" />
</Path> </Path>
<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/Refactoring/Common"> <Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/Refactoring/Common">
@ -1833,21 +1833,6 @@
<MenuItem insertbefore = "SelectAll" id = "Separator3" type = "Separator" /> <MenuItem insertbefore = "SelectAll" id = "Separator3" type = "Separator" />
</Path> </Path>
<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/OptionsDialog">
<OptionPanel id = "General"
label = "${res:Dialog.Options.IDEOptions.General}"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels.GeneralTextEditorPanel"/>
<OptionPanel id = "Markers"
label = "${res:Dialog.Options.IDEOptions.TextEditor.Markers.PanelName}"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels.MarkersTextEditorPanel"/>
<OptionPanel id = "Behavior"
label = "${res:Dialog.Options.IDEOptions.TextEditor.Behaviour.PanelName}"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels.BehaviorTextEditorPanel"/>
<OptionPanel id = "CodeCompletion"
label = "${res:Dialog.Options.IDEOptions.TextEditor.CodeCompletion.PanelName}"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels.CodeCompletionPanel"/>
</Path>
<Path name = "/SharpDevelop/ViewContent/Browser/Toolbar"> <Path name = "/SharpDevelop/ViewContent/Browser/Toolbar">
<ToolbarItem id = "Back" <ToolbarItem id = "Back"
icon = "Icons.16x16.BrowserBefore" icon = "Icons.16x16.BrowserBefore"
@ -1896,7 +1881,7 @@
<OptionPanel id = "CodeCompletion" <OptionPanel id = "CodeCompletion"
insertafter="Behavior" insertafter="Behavior"
label = "${res:Dialog.Options.IDEOptions.TextEditor.CodeCompletion.PanelName}" label = "${res:Dialog.Options.IDEOptions.TextEditor.CodeCompletion.PanelName}"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels.CodeCompletionPanel"/> class = "ICSharpCode.SharpDevelop.Editor.CodeCompletion.CodeCompletionPanel"/>
</Path> </Path>
<Path name = "/SharpDevelop/Pads/BookmarkPad/Toolbar"> <Path name = "/SharpDevelop/Pads/BookmarkPad/Toolbar">

5
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj

@ -76,11 +76,6 @@
<Compile Include="Src\WpfViewContent.cs" /> <Compile Include="Src\WpfViewContent.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">
<Project>{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}</Project>
<Name>ICSharpCode.TextEditor</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj"> <ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
<Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project> <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
<Name>ICSharpCode.SharpDevelop</Name> <Name>ICSharpCode.SharpDevelop</Name>

15
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@ -92,8 +92,14 @@
<Compile Include="Src\Editor\AvalonEdit\IndentationStrategyAdapter.cs" /> <Compile Include="Src\Editor\AvalonEdit\IndentationStrategyAdapter.cs" />
<Compile Include="Src\Editor\AvalonEdit\ISnippetElementProvider.cs" /> <Compile Include="Src\Editor\AvalonEdit\ISnippetElementProvider.cs" />
<Compile Include="Src\Editor\AvalonEdit\TextContentCondition.cs" /> <Compile Include="Src\Editor\AvalonEdit\TextContentCondition.cs" />
<Compile Include="Src\Editor\CodeCompletion\CodeCompletionPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Editor\CodeCompletion\ICompletionItemHandler.cs" /> <Compile Include="Src\Editor\CodeCompletion\ICompletionItemHandler.cs" />
<Compile Include="Src\Editor\CodeCompletion\NRefactoryCompletionItemList.cs" /> <Compile Include="Src\Editor\CodeCompletion\NRefactoryCompletionItemList.cs" />
<Compile Include="Src\Editor\Commands\ClassBookmarkMenuBuilder.cs" />
<Compile Include="Src\Editor\Commands\ClassMemberMenuBuilder.cs" />
<Compile Include="Src\Editor\Commands\GotoLineNumber.cs" />
<Compile Include="Src\Editor\IEditorControlService.cs" /> <Compile Include="Src\Editor\IEditorControlService.cs" />
<Compile Include="Src\Editor\IEditorUIService.cs" /> <Compile Include="Src\Editor\IEditorUIService.cs" />
<Compile Include="Src\Editor\CodeCompletion\AttributesItemProvider.cs" /> <Compile Include="Src\Editor\CodeCompletion\AttributesItemProvider.cs" />
@ -151,6 +157,7 @@
<Compile Include="Src\Editor\Search\SearchResultsPad.cs" /> <Compile Include="Src\Editor\Search\SearchResultsPad.cs" />
<Compile Include="Src\Editor\Search\SearchResultPadToolbarCommands.cs" /> <Compile Include="Src\Editor\Search\SearchResultPadToolbarCommands.cs" />
<Compile Include="Src\Editor\TextChangeEventArgs.cs" /> <Compile Include="Src\Editor\TextChangeEventArgs.cs" />
<Compile Include="Src\Editor\TextNavigationPoint.cs" />
<Compile Include="Src\Editor\ToolTipRequestEventArgs.cs"> <Compile Include="Src\Editor\ToolTipRequestEventArgs.cs">
<DependentUpon>ToolTipService.cs</DependentUpon> <DependentUpon>ToolTipService.cs</DependentUpon>
</Compile> </Compile>
@ -609,8 +616,6 @@
<Compile Include="Src\Bookmarks\BookmarkEventHandler.cs" /> <Compile Include="Src\Bookmarks\BookmarkEventHandler.cs" />
<Compile Include="Src\Bookmarks\BookmarkManager.cs" /> <Compile Include="Src\Bookmarks\BookmarkManager.cs" />
<Compile Include="Src\Bookmarks\SDMarkerBookmark.cs" /> <Compile Include="Src\Bookmarks\SDMarkerBookmark.cs" />
<Compile Include="Src\TextEditor\Commands\SearchCommands.cs" />
<Compile Include="Src\TextEditor\Gui\Editor\SharpDevelopTextEditorProperties.cs" />
<Compile Include="Src\Services\Tasks\TaskEventHandler.cs" /> <Compile Include="Src\Services\Tasks\TaskEventHandler.cs" />
<Compile Include="Src\Gui\Pads\DefinitionViewPad.cs" /> <Compile Include="Src\Gui\Pads\DefinitionViewPad.cs" />
<Compile Include="Src\Project\MSBuildEnums.cs" /> <Compile Include="Src\Project\MSBuildEnums.cs" />
@ -645,18 +650,13 @@
</Compile> </Compile>
<Compile Include="Src\Bookmarks\BookmarkConverter.cs" /> <Compile Include="Src\Bookmarks\BookmarkConverter.cs" />
<Compile Include="Src\Bookmarks\ClassMemberBookmark.cs" /> <Compile Include="Src\Bookmarks\ClassMemberBookmark.cs" />
<Compile Include="Src\TextEditor\Commands\ClassMemberMenuBuilder.cs" />
<Compile Include="Src\Services\RefactoringService\RefactoringService.cs" /> <Compile Include="Src\Services\RefactoringService\RefactoringService.cs" />
<Compile Include="Src\Services\RefactoringService\Reference.cs" /> <Compile Include="Src\Services\RefactoringService\Reference.cs" />
<Compile Include="Src\Services\ProjectService\ParseableFileContentEnumerator.cs" /> <Compile Include="Src\Services\ProjectService\ParseableFileContentEnumerator.cs" />
<Compile Include="Src\Services\ParserService\ParseProjectContent.cs" /> <Compile Include="Src\Services\ParserService\ParseProjectContent.cs" />
<Compile Include="Src\Project\Items\ImportProjectItem.cs" /> <Compile Include="Src\Project\Items\ImportProjectItem.cs" />
<EmbeddedResource Include="Resources\CodeCompletionOptionPanel.xfrm" /> <EmbeddedResource Include="Resources\CodeCompletionOptionPanel.xfrm" />
<Compile Include="Src\TextEditor\Gui\OptionPanels\CodeCompletionPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Services\Debugger\CurrentLineBookmark.cs" /> <Compile Include="Src\Services\Debugger\CurrentLineBookmark.cs" />
<Compile Include="Src\TextEditor\Commands\ClassBookmarkMenuBuilder.cs" />
<Compile Include="Src\Gui\BrowserDisplayBinding\BrowserCommands.cs" /> <Compile Include="Src\Gui\BrowserDisplayBinding\BrowserCommands.cs" />
<Compile Include="Src\Gui\BrowserDisplayBinding\BrowserLocationConditionEvaluator.cs" /> <Compile Include="Src\Gui\BrowserDisplayBinding\BrowserLocationConditionEvaluator.cs" />
<Compile Include="Src\Services\Debugger\DebuggerDoozer.cs" /> <Compile Include="Src\Services\Debugger\DebuggerDoozer.cs" />
@ -722,7 +722,6 @@
<Compile Include="Src\Services\NavigationService\NavigationService.cs" /> <Compile Include="Src\Services\NavigationService\NavigationService.cs" />
<Compile Include="Src\Commands\NavigationCommands.cs" /> <Compile Include="Src\Commands\NavigationCommands.cs" />
<Compile Include="Src\Internal\ConditionEvaluators\NavigationConditionEvaluators.cs" /> <Compile Include="Src\Internal\ConditionEvaluators\NavigationConditionEvaluators.cs" />
<Compile Include="Src\TextEditor\Gui\Editor\TextNavigationPoint.cs" />
<Compile Include="Src\Project\BuildResults.cs" /> <Compile Include="Src\Project\BuildResults.cs" />
<Compile Include="Src\Project\BuildError.cs" /> <Compile Include="Src\Project\BuildError.cs" />
<Compile Include="Src\Services\HelpProvider.cs" /> <Compile Include="Src\Services\HelpProvider.cs" />

5
src/Main/Base/Project/Src/Bookmarks/Commands/MenuCommands.cs

@ -5,13 +5,12 @@
// <version>$Revision$</version> // <version>$Revision$</version>
// </file> // </file>
using ICSharpCode.SharpDevelop.Editor;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.DefaultEditor.Commands; using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.SharpDevelop.Bookmarks namespace ICSharpCode.SharpDevelop.Bookmarks

6
src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs

@ -7,12 +7,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.DefaultEditor.Commands;
using ICSharpCode.SharpDevelop.Gui;
using System.Windows.Forms; using System.Windows.Forms;
using ICSharpCode.Core;
namespace ICSharpCode.SharpDevelop.Bookmarks namespace ICSharpCode.SharpDevelop.Bookmarks
{ {
#region Goto Commands #region Goto Commands

3
src/Main/Base/Project/Src/Commands/EditCommands.cs

@ -5,11 +5,8 @@
// <version>$Revision$</version> // <version>$Revision$</version>
// </file> // </file>
using ICSharpCode.SharpDevelop.DefaultEditor;
using System; using System;
using System.Windows.Forms;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.Core.WinForms;
using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.SharpDevelop.Commands namespace ICSharpCode.SharpDevelop.Commands

7
src/Main/Base/Project/Src/Editor/AvalonEdit/TextContentCondition.cs

@ -5,12 +5,11 @@
// <version>$Revision$</version> // <version>$Revision$</version>
// </file> // </file>
using ICSharpCode.SharpDevelop.Gui;
using System; using System;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Conditions namespace ICSharpCode.SharpDevelop.Editor.AvalonEdit
{ {
/// <summary> /// <summary>
/// Tests the name of the highlighting strategy of the text editor. /// Tests the name of the highlighting strategy of the text editor.
@ -28,7 +27,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Conditions
string textcontent = condition.Properties["textcontent"]; string textcontent = condition.Properties["textcontent"];
IViewContent content = WorkbenchSingleton.Workbench.ActiveViewContent; IViewContent content = WorkbenchSingleton.Workbench.ActiveViewContent;
if (content is ITextEditorProvider) { if (content is ITextEditorProvider) {
var ctrl = (content as ITextEditorProvider).TextEditor.GetService(typeof(AvalonEdit.TextEditor)) as AvalonEdit.TextEditor; var ctrl = (content as ITextEditorProvider).TextEditor.GetService(typeof(ICSharpCode.AvalonEdit.TextEditor)) as ICSharpCode.AvalonEdit.TextEditor;
if (ctrl != null && ctrl.SyntaxHighlighting != null) { if (ctrl != null && ctrl.SyntaxHighlighting != null) {
return string.Equals(textcontent, ctrl.SyntaxHighlighting.Name, StringComparison.OrdinalIgnoreCase); return string.Equals(textcontent, ctrl.SyntaxHighlighting.Name, StringComparison.OrdinalIgnoreCase);
} }

2
src/Main/Base/Project/Src/TextEditor/Gui/OptionPanels/CodeCompletionPanel.cs → src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionPanel.cs

@ -10,7 +10,7 @@ using System;
using System.Windows.Forms; using System.Windows.Forms;
using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion
{ {
public class CodeCompletionPanel : XmlFormsOptionPanel public class CodeCompletionPanel : XmlFormsOptionPanel
{ {

1
src/Main/Base/Project/Src/Editor/CodeCompletion/OverrideCompletionItem.cs

@ -8,7 +8,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Dom.Refactoring; using ICSharpCode.SharpDevelop.Dom.Refactoring;

2
src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs → src/Main/Base/Project/Src/Editor/Commands/ClassBookmarkMenuBuilder.cs

@ -24,7 +24,7 @@ using ICSharpCode.SharpDevelop.Gui.ClassBrowser;
using ICSharpCode.SharpDevelop.Project; using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Refactoring; using ICSharpCode.SharpDevelop.Refactoring;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands namespace ICSharpCode.SharpDevelop.Editor.Commands
{ {
/// <summary> /// <summary>
/// Build context menu for class members in the text editor. /// Build context menu for class members in the text editor.

2
src/Main/Base/Project/Src/TextEditor/Commands/ClassMemberMenuBuilder.cs → src/Main/Base/Project/Src/Editor/Commands/ClassMemberMenuBuilder.cs

@ -25,7 +25,7 @@ using ICSharpCode.SharpDevelop.Gui.ClassBrowser;
using ICSharpCode.SharpDevelop.Refactoring; using ICSharpCode.SharpDevelop.Refactoring;
using Ast = ICSharpCode.NRefactory.Ast; using Ast = ICSharpCode.NRefactory.Ast;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands namespace ICSharpCode.SharpDevelop.Editor.Commands
{ {
/// <summary> /// <summary>
/// Build context menu for class members in the text editor. /// Build context menu for class members in the text editor.

2
src/Main/Base/Project/Src/TextEditor/Commands/SearchCommands.cs → src/Main/Base/Project/Src/Editor/Commands/GotoLineNumber.cs

@ -9,7 +9,7 @@ using System;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands namespace ICSharpCode.SharpDevelop.Editor.Commands
{ {
public class GotoLineNumber : AbstractMenuCommand public class GotoLineNumber : AbstractMenuCommand
{ {

4
src/Main/Base/Project/Src/Editor/Commands/PasteAsCommands.cs

@ -5,19 +5,15 @@
// <version>$Revision$</version> // <version>$Revision$</version>
// </file> // </file>
using ICSharpCode.SharpDevelop.Editor;
using System; using System;
using System.IO; using System.IO;
using System.Text;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.Core.WinForms; using ICSharpCode.Core.WinForms;
using ICSharpCode.NRefactory.Ast; using ICSharpCode.NRefactory.Ast;
using ICSharpCode.NRefactory.AstBuilder; using ICSharpCode.NRefactory.AstBuilder;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Dom.Refactoring; using ICSharpCode.SharpDevelop.Dom.Refactoring;
using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
namespace ICSharpCode.SharpDevelop.Editor.Commands namespace ICSharpCode.SharpDevelop.Editor.Commands
{ {

2
src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextNavigationPoint.cs → src/Main/Base/Project/Src/Editor/TextNavigationPoint.cs

@ -9,7 +9,7 @@ using System;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
namespace ICSharpCode.SharpDevelop namespace ICSharpCode.SharpDevelop.Editor
{ {
/// <summary> /// <summary>
/// Description of TextNavigationPoint. /// Description of TextNavigationPoint.

2
src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs

@ -13,8 +13,8 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Gui.XmlForms; using ICSharpCode.SharpDevelop.Gui.XmlForms;
using ICSharpCode.SharpDevelop.Internal.Templates; using ICSharpCode.SharpDevelop.Internal.Templates;

1
src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs

@ -11,7 +11,6 @@ using System.Windows.Forms;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.Core.WinForms; using ICSharpCode.Core.WinForms;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Project; using ICSharpCode.SharpDevelop.Project;

1
src/Main/Base/Project/Src/Internal/Templates/Project/ProjectDescriptor.cs

@ -13,7 +13,6 @@ using System.Text;
using System.Xml; using System.Xml;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project; using ICSharpCode.SharpDevelop.Project;

3
src/Main/Base/Project/Src/Services/AmbienceService/CodeDOMGeneratorUtility.cs

@ -9,10 +9,7 @@ using System;
using System.CodeDom; using System.CodeDom;
using System.CodeDom.Compiler; using System.CodeDom.Compiler;
using System.Collections; using System.Collections;
using System.Text;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor;
namespace ICSharpCode.SharpDevelop namespace ICSharpCode.SharpDevelop

6
src/Main/Base/Project/Src/Services/ProjectService/ParseableFileContentEnumerator.cs

@ -6,16 +6,10 @@
// </file> // </file>
using System; using System;
using System.Collections;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Dom.Refactoring;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.SharpDevelop.Project namespace ICSharpCode.SharpDevelop.Project

1
src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs

@ -11,7 +11,6 @@ using System.IO;
using System.Text; using System.Text;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Editor.Search; using ICSharpCode.SharpDevelop.Editor.Search;

350
src/Main/Base/Project/Src/TextEditor/Gui/Editor/SharpDevelopTextEditorProperties.cs

@ -1,350 +0,0 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <author name="unknown"/>
// <version>$Revision$</version>
// </file>
using System;
using System.Drawing;
using System.Drawing.Text;
using System.Text;
using ICSharpCode.Core;
using ICSharpCode.Core.WinForms;
using ICSharpCode.SharpDevelop.Gui.OptionPanels;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
{
/*
public sealed class SharpDevelopTextEditorProperties : ITextEditorProperties
{
static SharpDevelopTextEditorProperties textEditorProperties;
Properties properties;
FontContainer fontContainer;
public static SharpDevelopTextEditorProperties Instance {
get {
if (textEditorProperties == null) {
textEditorProperties = new SharpDevelopTextEditorProperties();
}
return textEditorProperties;
}
}
private SharpDevelopTextEditorProperties()
{
properties = PropertyService.Get("ICSharpCode.TextEditor.Document.Document.DefaultDocumentAggregatorProperties", new Properties());
fontContainer = new FontContainer(FontContainer.ParseFont(properties.Get("DefaultFont", WinFormsResourceService.DefaultMonospacedFont.ToString())));
properties.PropertyChanged += new PropertyChangedEventHandler(CheckFontChange);
}
void CheckFontChange(object sender, PropertyChangedEventArgs e)
{
if (e.Key == "DefaultFont") {
fontContainer.DefaultFont = FontContainer.ParseFont(e.NewValue.ToString());
}
}
public int TabIndent {
get {
return properties.Get("TabIndent", 4);
}
set {
// FIX: don't allow to set tab size to zero as this will cause divide by zero exceptions in the text control.
// Zero isn't a setting that makes sense, anyway.
if (value < 1) value = 1;
properties.Set("TabIndent", value);
}
}
public int IndentationSize {
get { return properties.Get("IndentationSize", 4); }
set {
if (value < 1) value = 1;
properties.Set("IndentationSize", value);
indentationString = null;
}
}
string indentationString;
public string IndentationString {
get {
if (indentationString == null) {
if (ConvertTabsToSpaces)
return new string(' ', IndentationSize);
else
return "\t";
}
return indentationString;
}
}
public IndentStyle IndentStyle {
get {
return properties.Get("IndentStyle", IndentStyle.Smart);
}
set {
properties.Set("IndentStyle", value);
}
}
public DocumentSelectionMode DocumentSelectionMode {
get {
return properties.Get("DocumentSelectionMode", DocumentSelectionMode.Normal);
}
set {
properties.Set("DocumentSelectionMode", value);
}
}
public bool CaretLine {
get {
return properties.Get("CaretLine", false);
}
set {
properties.Set("CaretLine", value);
}
}
public bool ShowQuickClassBrowserPanel {
get {
return properties.Get("ShowQuickClassBrowserPanel", true);
}
set {
properties.Set("ShowQuickClassBrowserPanel", value);
}
}
public bool AllowCaretBeyondEOL {
get {
return properties.Get("CursorBehindEOL", false);
}
set {
properties.Set("CursorBehindEOL", value);
}
}
public bool UnderlineErrors {
get {
return properties.Get("ShowErrors", true);
}
set {
properties.Set("ShowErrors", value);
}
}
public bool ShowMatchingBracket {
get {
return properties.Get("ShowBracketHighlight", true);
}
set {
properties.Set("ShowBracketHighlight", value);
}
}
public bool ShowLineNumbers {
get {
return properties.Get("ShowLineNumbers", true);
}
set {
properties.Set("ShowLineNumbers", value);
}
}
public bool ShowSpaces {
get {
return properties.Get("ShowSpaces", false);
}
set {
properties.Set("ShowSpaces", value);
}
}
public bool ShowTabs {
get {
return properties.Get("ShowTabs", false);
}
set {
properties.Set("ShowTabs", value);
}
}
public bool ShowEOLMarker {
get {
return properties.Get("ShowEOLMarkers", false);
}
set {
properties.Set("ShowEOLMarkers", value);
}
}
public bool ShowInvalidLines {
get {
return properties.Get("ShowInvalidLines", false);
}
set {
properties.Set("ShowInvalidLines", value);
}
}
public bool IsIconBarVisible {
get {
return properties.Get("IconBarVisible", true);
}
set {
properties.Set("IconBarVisible", value);
}
}
public bool EnableFolding {
get {
return properties.Get("EnableFolding", true);
}
set {
properties.Set("EnableFolding", value);
}
}
public bool ShowHorizontalRuler {
get {
return properties.Get("ShowHRuler", false);
}
set {
properties.Set("ShowHRuler", value);
}
}
public bool ShowVerticalRuler {
get {
return properties.Get("ShowVRuler", false);
}
set {
properties.Set("ShowVRuler", value);
}
}
public bool ConvertTabsToSpaces {
get {
return properties.Get("TabsToSpaces", false);
}
set {
properties.Set("TabsToSpaces", value);
indentationString = null;
}
}
public bool MouseWheelScrollDown {
get {
return properties.Get("MouseWheelScrollDown", true);
}
set {
properties.Set("MouseWheelScrollDown", value);
}
}
public bool MouseWheelTextZoom {
get {
return properties.Get("MouseWheelTextZoom", true);
}
set {
properties.Set("MouseWheelTextZoom", value);
}
}
public bool HideMouseCursor {
get {
return properties.Get("HideMouseCursor", false);
}
set {
properties.Set("HideMouseCursor", value);
}
}
public bool CutCopyWholeLine {
get {
return properties.Get("CutCopyWholeLine", true);
}
set {
properties.Set("CutCopyWholeLine", value);
}
}
public Encoding Encoding {
get {
return Encoding.GetEncoding(this.EncodingCodePage);
}
set {
this.EncodingCodePage = value.CodePage;
}
}
public int EncodingCodePage {
get { return properties.Get("Encoding", 65001); }
set { properties.Set("Encoding", value); }
}
public int VerticalRulerRow {
get {
return properties.Get("VRulerRow", 80);
}
set {
properties.Set("VRulerRow", value);
}
}
public LineViewerStyle LineViewerStyle {
get {
return properties.Get("LineViewerStyle", LineViewerStyle.None);
}
set {
properties.Set("LineViewerStyle", value);
}
}
public string LineTerminator {
get {
return "\r\n";
}
set {
throw new System.NotImplementedException();
}
}
public bool AutoInsertCurlyBracket {
get {
return properties.Get("AutoInsertCurlyBracket", true);
}
set {
properties.Set("AutoInsertCurlyBracket", value);
}
}
public bool AutoInsertTemplates {
get {
return properties.Get("AutoInsertTemplates", false);
}
set {
properties.Set("AutoInsertTemplates", value);
}
}
public Font Font {
get {
return fontContainer.DefaultFont;
}
set {
properties.Set("DefaultFont", value.ToString());
fontContainer.DefaultFont = value;
}
}
public FontContainer FontContainer {
get {
return fontContainer;
}
}
public BracketMatchingStyle BracketMatchingStyle {
get {
return properties.Get("BracketMatchingStyle", BracketMatchingStyle.After);
}
set {
properties.Set("BracketMatchingStyle", value);
}
}
public bool SupportReadOnlySegments { get; set; }
public TextRenderingHint TextRenderingHint {
get {
return properties.Get("TextRenderingHint", TextRenderingHint.SystemDefault);
}
set {
LoggingService.Debug("Setting TextRenderingHint to " + value);
properties.Set("TextRenderingHint", value);
}
}
}*/
}

2
src/Main/Base/Project/Src/Util/SDWindowsFormsHost.cs

@ -5,11 +5,11 @@
// <version>$Revision$</version> // <version>$Revision$</version>
// </file> // </file>
using ICSharpCode.SharpDevelop.DefaultEditor;
using System; using System;
using System.Windows.Forms; using System.Windows.Forms;
using System.Windows.Forms.Integration; using System.Windows.Forms.Integration;
using System.Windows.Input; using System.Windows.Input;
using ICSharpCode.Core.WinForms; using ICSharpCode.Core.WinForms;
using ICSharpCode.SharpDevelop.Util; using ICSharpCode.SharpDevelop.Util;

5
src/Main/Base/Test/CollectionClassOverridesTestFixture.cs

@ -7,16 +7,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.DefaultEditor.Commands;
using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Dom.CSharp;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Tests.Utils;
using NUnit.Framework; using NUnit.Framework;
namespace ICSharpCode.SharpDevelop.Tests namespace ICSharpCode.SharpDevelop.Tests

5
src/Main/Base/Test/ExceptionClassOverridesTestFixture.cs

@ -7,16 +7,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.DefaultEditor.Commands;
using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Dom.CSharp;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Tests.Utils;
using NUnit.Framework; using NUnit.Framework;
namespace ICSharpCode.SharpDevelop.Tests namespace ICSharpCode.SharpDevelop.Tests

Loading…
Cancel
Save