Move some editor classes to new folder structure.

TODOnewNR.txt

@@ -200,3 +200,7 @@ Context Actions vs. Member Context Menu:
 	Refactorings that don't make sense without opening the file shouldn't be in the member menu.
 	
 	The context actions menu should show all refactorings (even those that are also in the members context menu).
+
+Automatic Translation:
+	WorkbenchSingleton.AssertMainThread() -> SD.MainThread.VerifyAccess()
+	AbstractMenuCommand-derived classes that do not override IsEnabled -> SimpleCommand

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/AnchorSnippetElementProvider.cs

@@ -3,7 +3,7 @@
 
 using System;
 using ICSharpCode.AvalonEdit.Snippets;
-using ICSharpCode.SharpDevelop.Editor.AvalonEdit;
+using ICSharpCode.SharpDevelop.Editor;
 
 namespace ICSharpCode.AvalonEdit.AddIn.Snippets
 {

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/DefaultSnippetElementProvider.cs

@@ -3,7 +3,7 @@
 
 using System;
 using ICSharpCode.AvalonEdit.Snippets;
-using ICSharpCode.SharpDevelop.Editor.AvalonEdit;
+using ICSharpCode.SharpDevelop.Editor;
 
 namespace ICSharpCode.AvalonEdit.AddIn.Snippets
 {

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/SnippetManager.cs

@@ -8,7 +8,7 @@ using System.Linq;
 
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Editor.AvalonEdit;
+using ICSharpCode.SharpDevelop.Editor;
 
 namespace ICSharpCode.AvalonEdit.AddIn.Snippets
 {

src/Main/Base/Project/Editor/AvalonEditTextEditorAdapter.cs

@@ -15,7 +15,7 @@ using ICSharpCode.NRefactory;
 using ICSharpCode.NRefactory.Editor;
 using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
 
-namespace ICSharpCode.SharpDevelop.Editor.AvalonEdit
+namespace ICSharpCode.SharpDevelop.Editor
 {
 	using ICSharpCode.AvalonEdit;
 	

src/Main/Base/Project/Editor/IDocumentVersionProvider.cs

@@ -0,0 +1,51 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Gui;
+
+namespace ICSharpCode.SharpDevelop.Editor
+{
+	/// <summary>
+	/// Provides the BASE-version for a given file - the original unmodified
+	/// copy from the last commit.
+	/// This interface is implemented by the version control AddIns.
+	/// </summary>
+	public interface IDocumentVersionProvider
+	{
+		/// <summary>
+		/// Provides the BASE-Version for a file. This can be either the file saved
+		/// to disk or a base version provided by any VCS.
+		/// </summary>
+		Stream OpenBaseVersion(string fileName);
+		
+		/// <summary>
+		/// Starts watching for changes to the BASE-version of the specified file.
+		/// The callback delegate gets called whenever the BASE-version has changed.
+		/// </summary>
+		/// <returns>Returns a disposable that can be used to stop watching for changes.
+		/// You must dispose the disposable to prevent a memory leak, the GC will
+		/// not help out in this case!</returns>
+		IDisposable WatchBaseVersionChanges(string fileName, EventHandler callback);
+	}
+	
+	public class VersioningServices
+	{
+		public static readonly VersioningServices Instance = new VersioningServices();
+		
+		List<IDocumentVersionProvider> baseVersionProviders;
+		
+		public List<IDocumentVersionProvider> DocumentVersionProviders {
+			get {
+				if (baseVersionProviders == null)
+					baseVersionProviders = AddInTree.BuildItems<IDocumentVersionProvider>("/Workspace/DocumentVersionProviders", this, false);
+				
+				return baseVersionProviders;
+			}
+		}
+	}
+}

src/Main/Base/Project/Editor/ISnippetElementProvider.cs

@@ -4,7 +4,7 @@
 using System;
 using ICSharpCode.AvalonEdit.Snippets;
 
-namespace ICSharpCode.SharpDevelop.Editor.AvalonEdit
+namespace ICSharpCode.SharpDevelop.Editor
 {
 	/// <summary>
 	/// Used in "/SharpDevelop/ViewContent/AvalonEdit/SnippetElementProviders" to allow AddIns to provide custom snippet elements.

src/Main/Base/Project/Editor/RepoChangeWatcher.cs

@@ -10,33 +10,15 @@ using ICSharpCode.SharpDevelop.Gui;
 
 namespace ICSharpCode.SharpDevelop.Editor
 {
-	public interface IDocumentVersionProvider
-	{
-		/// <summary>
-		/// Provides the BASE-Version for a file. This can be either the file saved
-		/// to disk or a base version provided by any VCS.
-		/// </summary>
-		Stream OpenBaseVersion(string fileName);
-		
-		IDisposable WatchBaseVersionChanges(string fileName, EventHandler callback);
-	}
-	
-	public class VersioningServices
-	{
-		public static readonly VersioningServices Instance = new VersioningServices();
-		
-		List<IDocumentVersionProvider> baseVersionProviders;
-		
-		public List<IDocumentVersionProvider> DocumentVersionProviders {
-			get {
-				if (baseVersionProviders == null)
-					baseVersionProviders = AddInTree.BuildItems<IDocumentVersionProvider>("/Workspace/DocumentVersionProviders", this, false);
-				
-				return baseVersionProviders;
-			}
-		}
-	}
-	
+	/// <summary>
+	/// A helper class that can be used to register an action to be called
+	/// when the contents of a directory change.
+	/// The action is called only once if there were multiple changes,
+	/// and the call may wait until SharpDevelop gets the focus.
+	/// If multiple actions are registered for the same directory, the underlying
+	/// FileSystemWatcher will be reused.
+	/// This class is usually used to watch a .svn or .git directory.
+	/// </summary>
 	public class RepoChangeWatcher
 	{
 		static readonly Dictionary<string, RepoChangeWatcher> watchers
@@ -58,7 +40,7 @@ namespace ICSharpCode.SharpDevelop.Editor
 			watcher.Changed += FileChanged;
 			watcher.Renamed += FileChanged;
 			
-//			watcher.IncludeSubdirectories = true;
+	//			watcher.IncludeSubdirectories = true;
 			watcher.EnableRaisingEvents = true;
 		}
 	

src/Main/Base/Project/ICSharpCode.SharpDevelop.addin

@@ -23,14 +23,14 @@
 			<ConditionEvaluator name="WriteableProject" class="ICSharpCode.SharpDevelop.WriteableProjectConditionEvaluator"/>
 			<ConditionEvaluator name="WriteableSolution" class="ICSharpCode.SharpDevelop.WriteableSolutionConditionEvaluator"/>
 			<ConditionEvaluator name="ProjectActive" class="ICSharpCode.SharpDevelop.ProjectActiveConditionEvaluator"/>
-			<ConditionEvaluator name="TextContent" class="ICSharpCode.SharpDevelop.Editor.AvalonEdit.TextContentConditionEvaluator"/>
+			<ConditionEvaluator name="TextContent" class="ICSharpCode.SharpDevelop.Editor.TextContentConditionEvaluator"/>
 			<ConditionEvaluator name="BrowserLocation" class="ICSharpCode.SharpDevelop.BrowserDisplayBinding.BrowserLocationConditionEvaluator"/>
 			<ConditionEvaluator name="RefactoringProviderSupports" class="ICSharpCode.SharpDevelop.Refactoring.RefactoringProviderSupportsConditionEvaluator"/>
 			<ConditionEvaluator name="CanNavigateBack" class="ICSharpCode.SharpDevelop.CanNavigateBackConditionEvaluator"/>
 			<ConditionEvaluator name="CanNavigateForward" class="ICSharpCode.SharpDevelop.CanNavigateForwardConditionEvaluator"/>
 			<ConditionEvaluator name="CompareProjectProperty" class="ICSharpCode.SharpDevelop.CompareProjectPropertyConditionEvaluator"/>
 			<ConditionEvaluator name="ProjectItem" class="ICSharpCode.SharpDevelop.Project.ProjectItemConditionEvaluator"/>
-			<ConditionEvaluator name="IsTextSelected" class="ICSharpCode.SharpDevelop.Editor.AvalonEdit.TextSelectedCondition"/>
+			<ConditionEvaluator name="IsTextSelected" class="ICSharpCode.SharpDevelop.Editor.TextSelectedCondition"/>
 			<ConditionEvaluator name="ViewInBrowser" class="ICSharpCode.SharpDevelop.ViewInBrowserConditionEvaluator"/>
 			<ConditionEvaluator name="ProjectBehaviorSupported" class="ICSharpCode.SharpDevelop.Project.ProjectBehaviorSupportedConditionEvaluator"/>
 			

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

@@ -107,6 +107,7 @@
     <Compile Include="Dom\IModelCollection.cs" />
     <Compile Include="Dom\ITreeNodeFactory.cs" />
     <Compile Include="Dom\SimpleModelCollection.cs" />
+    <Compile Include="Editor\AvalonEditTextEditorAdapter.cs" />
     <Compile Include="Editor\Bookmarks\BookmarkBase.cs" />
     <Compile Include="Editor\Bookmarks\BookmarkEventArgs.cs" />
     <Compile Include="Editor\Bookmarks\BookmarkPad.cs" />
@@ -119,13 +120,28 @@
     <Compile Include="Editor\Bookmarks\SDMarkerBookmark.cs" />
     <Compile Include="Editor\DocumentServiceAttribute.cs" />
     <Compile Include="Editor\DocumentUtilitites.cs" />
+    <Compile Include="Editor\IBracketSearcher.cs" />
+    <Compile Include="Editor\IDocumentVersionProvider.cs" />
     <Compile Include="Editor\IEditorControlService.cs" />
     <Compile Include="Editor\IEditorUIService.cs" />
     <Compile Include="Editor\IFileDocumentProvider.cs" />
+    <Compile Include="Editor\ISnippetElementProvider.cs" />
+    <Compile Include="Editor\ITextAreaToolTipProvider.cs">
+      <DependentUpon>ToolTipService.cs</DependentUpon>
+    </Compile>
     <Compile Include="Editor\ITextEditor.cs" />
     <Compile Include="Editor\ITextMarker.cs" />
+    <Compile Include="Editor\ITooltip.cs">
+      <DependentUpon>ToolTipService.cs</DependentUpon>
+    </Compile>
     <Compile Include="Editor\OnDiskTextSourceVersion.cs" />
     <Compile Include="Editor\HighlighterKnownSpanNames.cs" />
+    <Compile Include="Editor\PermanentAnchor.cs" />
+    <Compile Include="Editor\RepoChangeWatcher.cs" />
+    <Compile Include="Editor\ToolTipRequestEventArgs.cs">
+      <DependentUpon>ToolTipService.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Editor\ToolTipService.cs" />
     <Compile Include="Parser\DomAssemblyName.cs" />
     <Compile Include="Parser\IAssemblyParserService.cs" />
     <Compile Include="Parser\IGlobalAssemblyCacheService.cs" />
@@ -153,11 +169,7 @@
     <Compile Include="Src\Gui\FileService.cs" />
     <Compile Include="Src\Commands\SharpDevelopRoutedCommands.cs" />
     <Compile Include="Src\Commands\ViewInBrowser.cs" />
-    <Compile Include="Src\Editor\AvalonEdit\AvalonEditTextEditorAdapter.cs" />
     <Compile Include="Src\Editor\AvalonEdit\IndentationStrategyAdapter.cs" />
-    <Compile Include="Src\Editor\AvalonEdit\ISnippetElementProvider.cs" />
-    <Compile Include="Src\Editor\AvalonEdit\TextContentCondition.cs" />
-    <Compile Include="Src\Editor\AvalonEdit\TextSelectedCondition.cs" />
     <Compile Include="Editor\CodeCompletion\CodeCompletionPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -167,7 +179,6 @@
     <Compile Include="Src\Editor\Commands\FindReferencesCommand.cs" />
     <Compile Include="Src\Editor\Commands\GotoLineNumber.cs" />
     <Compile Include="Src\Editor\Commands\SymbolUnderCaretMenuCommand.cs" />
-    <Compile Include="Src\Editor\IDocumentBaseVersionProvider.cs" />
     <Compile Include="Editor\CodeCompletion\CodeCompletionBinding.cs" />
     <Compile Include="Editor\CodeCompletion\CodeCompletionDataUsageCache.cs" />
     <Compile Include="Editor\CodeCompletion\CompletionContext.cs" />
@@ -184,25 +195,13 @@
     <Compile Include="Src\Editor\Commands\InsertGuidCommand.cs" />
     <Compile Include="Src\Editor\Commands\PasteAsCommands.cs" />
     <Compile Include="Src\Editor\Commands\ShowColorDialog.cs" />
-    <Compile Include="Src\Editor\IBracketSearcher.cs" />
     <Compile Include="Src\Editor\IFormattingStrategy.cs" />
-    <Compile Include="Src\Editor\PermanentAnchor.cs" />
-    <Compile Include="Src\Editor\ITextAreaToolTipProvider.cs">
-      <DependentUpon>ToolTipService.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Src\Editor\ITooltip.cs">
-      <DependentUpon>ToolTipService.cs</DependentUpon>
-    </Compile>
     <Compile Include="Editor\Search\ISearchResult.cs" />
     <Compile Include="Editor\Search\ISearchResultFactory.cs" />
     <Compile Include="Editor\Search\SearchResultMatch.cs" />
     <Compile Include="Editor\Search\SearchResultsPad.cs" />
     <Compile Include="Editor\Search\SearchResultPadToolbarCommands.cs" />
     <Compile Include="Src\Editor\TextNavigationPoint.cs" />
-    <Compile Include="Src\Editor\ToolTipRequestEventArgs.cs">
-      <DependentUpon>ToolTipService.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Src\Editor\ToolTipService.cs" />
     <Compile Include="Src\Gui\BrowserDisplayBinding\BrowserDisplayBinding.cs" />
     <Compile Include="Src\Gui\Components\ColorPickerButton.xaml.cs">
       <DependentUpon>ColorPickerButton.xaml</DependentUpon>

src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs

@@ -39,7 +39,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		/// </summary>
 		public DefinitionViewPad()
 		{
-			ctl = Editor.AvalonEdit.AvalonEditTextEditorAdapter.CreateAvalonEditInstance();
+			ctl = Editor.AvalonEditTextEditorAdapter.CreateAvalonEditInstance();
 			ctl.IsReadOnly = true;
 			ctl.MouseDoubleClick += OnDoubleClick;
 			throw new NotImplementedException();

src/Main/SharpDevelop/Editor/TextContentCondition.cs

@@ -2,10 +2,11 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
+using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 
-namespace ICSharpCode.SharpDevelop.Editor.AvalonEdit
+namespace ICSharpCode.SharpDevelop.Editor
 {
 	/// <summary>
 	/// Tests the name of the highlighting strategy of the text editor.
@@ -16,7 +17,7 @@ namespace ICSharpCode.SharpDevelop.Editor.AvalonEdit
 	/// <example title="Test if any XML file is being edited">
 	/// &lt;Condition name = "TextContent" textcontent="XML"&gt;
 	/// </example>
-	public class TextContentConditionEvaluator : IConditionEvaluator
+	sealed class TextContentConditionEvaluator : IConditionEvaluator
 	{
 		public bool IsValid(object caller, Condition condition)
 		{

src/Main/SharpDevelop/Editor/TextSelectedCondition.cs

@@ -5,9 +5,9 @@ using System;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 
-namespace ICSharpCode.SharpDevelop.Editor.AvalonEdit
+namespace ICSharpCode.SharpDevelop.Editor
 {
-	public class TextSelectedCondition : IConditionEvaluator
+	sealed class TextSelectedCondition : IConditionEvaluator
 	{
 		public bool IsValid(object owner, Condition condition)
 		{

src/Main/SharpDevelop/SharpDevelop.csproj

@@ -88,6 +88,8 @@
     <Compile Include="Dom\TypeDefinitionModel.cs" />
     <Compile Include="Editor\Bookmarks\BookmarkManager.cs" />
     <Compile Include="Editor\Bookmarks\BookmarkMenuCommands.cs" />
+    <Compile Include="Editor\TextContentCondition.cs" />
+    <Compile Include="Editor\TextSelectedCondition.cs" />
     <Compile Include="OptionPanels\LoadSaveOptions.xaml.cs">
       <DependentUpon>LoadSaveOptions.xaml</DependentUpon>
       <SubType>Code</SubType>