diff options
author | Mike Krüger <mkrueger@xamarin.com> | 2015-04-16 15:17:48 +0300 |
---|---|---|
committer | Mike Krüger <mkrueger@xamarin.com> | 2015-04-16 15:17:48 +0300 |
commit | 0884080b90465d5fe42803ecf1f869f68dc27d57 (patch) | |
tree | 3e22b822db469d4a0fba48912652e2675595d8cf | |
parent | 544008910059af7ec6abf1e9dd96f56fcaf517e5 (diff) |
[SourceEditor] Narrow down public source editor API. The old source
editor infrastructure is now covered by the Ide and the SourceEditor
project has become the mono.texteditor glue code -> that shouldn't
provide ANY API of some sort.
21 files changed, 28 insertions, 25 deletions
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/AssemblyInfo.cs b/main/src/addins/MonoDevelop.SourceEditor2/AssemblyInfo.cs index f9f893a74a..f4bee85833 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/AssemblyInfo.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/AssemblyInfo.cs @@ -8,3 +8,5 @@ using System.Runtime.CompilerServices; [assembly: AssemblyDescription ("Provides a text editor for the MonoDevelop based on Mono.TextEditor")] [assembly: AssemblyVersion ("2.6")] [assembly: InternalsVisibleTo("UnitTests")] +[assembly: InternalsVisibleTo("MonoDevelop.VersionControl")] +[assembly: InternalsVisibleTo("MonoDevelop.Refactoring")] diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionCharactersPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionCharactersPanel.cs index 175d8528ed..83f4b36617 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionCharactersPanel.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionCharactersPanel.cs @@ -32,7 +32,7 @@ using System.Collections.Generic; namespace MonoDevelop.SourceEditor.OptionPanels { - public class CompletionCharactersPanel : VBox, IOptionsPanel + class CompletionCharactersPanel : VBox, IOptionsPanel { ListView list; ListStore store; diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs index 3d0fc92a74..1d851cee49 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs @@ -37,7 +37,7 @@ using MonoDevelop.Components; namespace MonoDevelop.SourceEditor.QuickTasks { - public class QuickTaskMiniMapMode : HBox + class QuickTaskMiniMapMode : HBox { QuickTaskOverviewMode rightMap; @@ -50,7 +50,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks PackStart (rightMap, true, true, 0); } - public class Minimpap : QuickTaskOverviewMode + class Minimpap : QuickTaskOverviewMode { const double lineHeight = 2; diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs index 7da06bce40..e206c5c6c3 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs @@ -40,7 +40,7 @@ using Microsoft.CodeAnalysis; namespace MonoDevelop.SourceEditor.QuickTasks { - public class QuickTaskOverviewMode : DrawingArea + class QuickTaskOverviewMode : DrawingArea { static Xwt.Drawing.Image searchImage = Xwt.Drawing.Image.FromResource ("issues-busy-16.png"); static Xwt.Drawing.Image okImage = Xwt.Drawing.Image.FromResource ("issues-ok-16.png"); diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs index 7654f88f56..9c5dfec002 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs @@ -41,7 +41,7 @@ using Microsoft.CodeAnalysis; namespace MonoDevelop.SourceEditor.QuickTasks { - public class QuickTaskStrip : VBox + class QuickTaskStrip : VBox { // move that one to AnalysisOptions when the new features are enabled by default. public readonly static PropertyWrapper<bool> EnableFancyFeatures = new PropertyWrapper<bool> ("MonoDevelop.AnalysisCore.AnalysisEnabled", true); diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/FoldSegmentWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/FoldSegmentWrapper.cs index 2f93a7df92..8d1ba6cf48 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/FoldSegmentWrapper.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/FoldSegmentWrapper.cs @@ -29,7 +29,7 @@ using MonoDevelop.Ide.Editor; namespace MonoDevelop.SourceEditor.Wrappers { - public class FoldSegmentWrapper : Mono.TextEditor.FoldSegment, IFoldSegment + class FoldSegmentWrapper : Mono.TextEditor.FoldSegment, IFoldSegment { bool IFoldSegment.IsCollapsed { get { diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ITextDocumentWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ITextDocumentWrapper.cs index 2ae70f5e74..21f09028b6 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ITextDocumentWrapper.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ITextDocumentWrapper.cs @@ -33,7 +33,7 @@ using Atk; namespace MonoDevelop.SourceEditor.Wrappers { - public class TextDocumentWrapper : ITextDocument + class TextDocumentWrapper : ITextDocument { readonly TextDocument document; diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs index b2e4e24551..8b6d08b8fe 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs @@ -251,7 +251,7 @@ namespace MonoDevelop.SourceEditor OnUsagesUpdated (EventArgs.Empty); } - public class UsageMarker : TextLineMarker + class UsageMarker : TextLineMarker { List<UsageSegment> usages = new List<UsageSegment> (); @@ -324,7 +324,7 @@ namespace MonoDevelop.SourceEditor } } - public class UsageSegment + class UsageSegment { public readonly ReferenceUsageType UsageType; public readonly TextSegment TextSegment; diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs index 66bfc48972..9bb7863700 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs @@ -38,7 +38,7 @@ using MonoDevelop.Ide.Editor; namespace MonoDevelop.SourceEditor { - public class BaseWindow : Gtk.Window + class BaseWindow : Gtk.Window { public BaseWindow () : base(Gtk.WindowType.Toplevel) { @@ -65,7 +65,7 @@ namespace MonoDevelop.SourceEditor } } - public class DebugValueWindow : PopoverWindow + class DebugValueWindow : PopoverWindow { ObjectValueTreeView tree; ScrolledWindow sw; diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs index 5d1a4f8369..bda75e6a0a 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs @@ -29,7 +29,7 @@ using System.Linq; namespace MonoDevelop.SourceEditor { - public class TabAction + class TabAction { ExtensibleTextEditor editor; diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ErrorText.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ErrorText.cs index 44fb24dce2..53219debb7 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ErrorText.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ErrorText.cs @@ -38,7 +38,7 @@ using MonoDevelop.Components; namespace MonoDevelop.SourceEditor { - public class ErrorText + class ErrorText { public TaskListEntry Task { get; set; } public bool IsError { get; set; } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs index 01de2f834e..faae8d9a62 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs @@ -52,7 +52,7 @@ using MonoDevelop.SourceEditor.Wrappers; namespace MonoDevelop.SourceEditor { - public class ExtensibleTextEditor : Mono.TextEditor.MonoTextEditor + class ExtensibleTextEditor : Mono.TextEditor.MonoTextEditor { internal object MemoryProbe = Counters.EditorsInMemory.CreateMemoryProbe (); diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs index 0284769bc6..e63b93c8d3 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs @@ -29,7 +29,7 @@ using Gdk; namespace MonoDevelop.SourceEditor { - public class HoverCloseButton : EventBox + class HoverCloseButton : EventBox { bool hovered; diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/IdeViMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/IdeViMode.cs index d7dcbada63..5905336f38 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/IdeViMode.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/IdeViMode.cs @@ -34,7 +34,7 @@ using MonoDevelop.Ide; namespace MonoDevelop.SourceEditor { - public class NewIdeViMode : Mono.TextEditor.Vi.NewViEditMode + class NewIdeViMode : Mono.TextEditor.Vi.NewViEditMode { public NewIdeViMode (ExtensibleTextEditor editor) { @@ -48,7 +48,7 @@ namespace MonoDevelop.SourceEditor } } - public class IdeViMode : Mono.TextEditor.Vi.ViEditMode + class IdeViMode : Mono.TextEditor.Vi.ViEditMode { new ExtensibleTextEditor editor; TabAction tabAction; diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs index 10172f1446..f659b77a2b 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs @@ -39,7 +39,7 @@ using ICSharpCode.NRefactory.Semantics; namespace MonoDevelop.SourceEditor { - public class LanguageItemWindow: MonoDevelop.Components.TooltipWindow + class LanguageItemWindow: MonoDevelop.Components.TooltipWindow { public bool IsEmpty { get; set; } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MarkerOperationsHandler.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MarkerOperationsHandler.cs index 1aab3dd990..7d9f239948 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MarkerOperationsHandler.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MarkerOperationsHandler.cs @@ -35,7 +35,7 @@ using MonoDevelop.Ide; namespace MonoDevelop.SourceEditor { - public class MarkerOperationsHandler : CommandHandler + class MarkerOperationsHandler : CommandHandler { protected override void Run (object data) { diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs index eff06f4f2b..13752b4b1c 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs @@ -31,7 +31,7 @@ using Gdk; namespace MonoDevelop.SourceEditor { - public class OverlayMessageWindow : Gtk.EventBox + class OverlayMessageWindow : Gtk.EventBox { const int border = 8; diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/PinnedWatchWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/PinnedWatchWidget.cs index 1af5115d23..343a2e43d5 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/PinnedWatchWidget.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/PinnedWatchWidget.cs @@ -37,7 +37,7 @@ using Gtk; namespace MonoDevelop.SourceEditor { - public class PinnedWatchWidget : Gtk.EventBox + class PinnedWatchWidget : Gtk.EventBox { readonly ObjectValueTreeView valueTree; ObjectValue objectValue; diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs index a04271048e..dba695282b 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs @@ -62,7 +62,7 @@ using MonoDevelop.Ide.Editor.Highlighting; namespace MonoDevelop.SourceEditor { - public partial class SourceEditorView : AbstractViewContent, IBookmarkBuffer, IClipboardHandler, ITextFile, + partial class SourceEditorView : AbstractViewContent, IBookmarkBuffer, IClipboardHandler, ITextFile, ICompletionWidget, ISplittable, IFoldable, IToolboxDynamicProvider, ICustomFilteringToolboxConsumer, IZoomable, ITextEditorResolver, ITextEditorDataProvider, ICodeTemplateHandler, ICodeTemplateContextProvider, ISupportsProjectReload, IPrintable, @@ -106,7 +106,8 @@ namespace MonoDevelop.SourceEditor lastSaveTimeUtc = value; } } - public ExtensibleTextEditor TextEditor { + + internal ExtensibleTextEditor TextEditor { get { return widget.TextEditor; } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs index 2a6499e953..a5856a784e 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs @@ -187,7 +187,7 @@ namespace MonoDevelop.SourceEditor return false; } - public class Border : Gtk.DrawingArea + class Border : Gtk.DrawingArea { protected override bool OnExposeEvent (Gdk.EventExpose evnt) { diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/LinkMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/LinkMarker.cs index c0f970ae3d..93cbd06d87 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/LinkMarker.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/LinkMarker.cs @@ -29,7 +29,7 @@ using Mono.TextEditor; namespace MonoDevelop.SourceEditor { - public class LinkMarker : Mono.TextEditor.UnderlineTextSegmentMarker, ITextSegmentMarker + class LinkMarker : Mono.TextEditor.UnderlineTextSegmentMarker, ITextSegmentMarker { static readonly Cairo.Color linkColor = new Cairo.Color (0, 0, 1.0); Action<LinkRequest> activateLink; |