From ecdb366bdb4b61707c7fe4d8943c37e7e2bce30e Mon Sep 17 00:00:00 2001 From: Eusebiu Marcu Date: Thu, 14 Apr 2011 22:25:34 +0300 Subject: [PATCH] Some cleaning; Make some types internal. --- .../ILSpy.Debugger/AvalonEdit/IToolTip.cs | 2 +- .../AvalonEdit/TextEditorWeakEventManager.cs | 17 +------------- Debugger/ILSpy.Debugger/DebuggedData.cs | 17 +------------- .../ILSpy.Debugger/Models/RunningProcess.cs | 17 +------------- .../Models/TreeModel/ArrayRangeNode.cs | 4 ++-- .../Models/TreeModel/ChildNodesOfObject.cs | 3 +-- .../Models/TreeModel/ExpressionNode.cs | 2 +- .../Models/TreeModel/ICorDebug.cs | 2 +- .../Models/TreeModel/IEnumerableNode.cs | 2 +- .../Models/TreeModel/IListNode.cs | 2 +- .../Models/TreeModel/ISetText.cs | 2 +- .../Models/TreeModel/ITreeNode.cs | 2 +- .../Models/TreeModel/IVisualizerCommand.cs | 2 +- .../Models/TreeModel/SavedTreeNode.cs | 2 +- .../Models/TreeModel/StackFrameNode.cs | 2 +- .../Models/TreeModel/TreeNode.cs | 2 +- .../ILSpy.Debugger/Models/TreeModel/Utils.cs | 10 +-------- .../Services/Debugger/DebuggerService.cs | 2 +- .../Services/Debugger/WindowsDebugger.cs | 2 +- .../Services/ImageService/ImageService.cs | 17 +------------- .../Services/ParserService/ParserService.cs | 22 +++++-------------- .../ILSpy.Debugger/ToolTips/DebuggerPopup.cs | 2 +- .../ToolTips/DebuggerTooltipControl.xaml | 3 ++- .../ToolTips/DebuggerTooltipControl.xaml.cs | 2 +- .../ToolTips/LazyItemsControl.cs | 2 +- .../Models/ToolTipRequestEventArgs.cs | 4 ++-- .../ToolTips/TextEditorListener.cs | 7 ++---- .../ToolTips/VirtualizingIEnumerable.cs | 2 +- ILSpy/Commands/DebuggerCommands.cs | 2 +- ILSpy/TextView/DecompilerTextView.cs | 2 +- 30 files changed, 38 insertions(+), 121 deletions(-) diff --git a/Debugger/ILSpy.Debugger/AvalonEdit/IToolTip.cs b/Debugger/ILSpy.Debugger/AvalonEdit/IToolTip.cs index 6970bfd62..956c36ed8 100644 --- a/Debugger/ILSpy.Debugger/AvalonEdit/IToolTip.cs +++ b/Debugger/ILSpy.Debugger/AvalonEdit/IToolTip.cs @@ -10,7 +10,7 @@ namespace ILSpy.Debugger.AvalonEdit /// Content of text editor tooltip (used as ), /// specifying whether it should be displayed in a WPF Popup. /// - public interface ITooltip + internal interface ITooltip { /// /// If true, this ITooltip will be displayed in a WPF Popup. diff --git a/Debugger/ILSpy.Debugger/AvalonEdit/TextEditorWeakEventManager.cs b/Debugger/ILSpy.Debugger/AvalonEdit/TextEditorWeakEventManager.cs index e652831d1..537fb17ec 100644 --- a/Debugger/ILSpy.Debugger/AvalonEdit/TextEditorWeakEventManager.cs +++ b/Debugger/ILSpy.Debugger/AvalonEdit/TextEditorWeakEventManager.cs @@ -1,20 +1,5 @@ // Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this -// software and associated documentation files (the "Software"), to deal in the Software -// without restriction, including without limitation the rights to use, copy, modify, merge, -// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. +// This code is distributed under MIT X11 license (for details please see \doc\license.txt) using System; using System.Windows; diff --git a/Debugger/ILSpy.Debugger/DebuggedData.cs b/Debugger/ILSpy.Debugger/DebuggedData.cs index a2923e432..b471e6fd5 100644 --- a/Debugger/ILSpy.Debugger/DebuggedData.cs +++ b/Debugger/ILSpy.Debugger/DebuggedData.cs @@ -1,20 +1,5 @@ // Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this -// software and associated documentation files (the "Software"), to deal in the Software -// without restriction, including without limitation the rights to use, copy, modify, merge, -// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. +// This code is distributed under MIT X11 license (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/Debugger/ILSpy.Debugger/Models/RunningProcess.cs b/Debugger/ILSpy.Debugger/Models/RunningProcess.cs index da2e57c48..7625520d6 100644 --- a/Debugger/ILSpy.Debugger/Models/RunningProcess.cs +++ b/Debugger/ILSpy.Debugger/Models/RunningProcess.cs @@ -1,20 +1,5 @@ // Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this -// software and associated documentation files (the "Software"), to deal in the Software -// without restriction, including without limitation the rights to use, copy, modify, merge, -// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. +// This code is distributed under MIT X11 license (for details please see \doc\license.txt) using System; using System.Diagnostics; diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/ArrayRangeNode.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/ArrayRangeNode.cs index 9cbb41c3c..e7127bd51 100644 --- a/Debugger/ILSpy.Debugger/Models/TreeModel/ArrayRangeNode.cs +++ b/Debugger/ILSpy.Debugger/Models/TreeModel/ArrayRangeNode.cs @@ -10,7 +10,7 @@ using ICSharpCode.NRefactory.CSharp; namespace ILSpy.Debugger.Models.TreeModel { - public partial class Utils + internal static partial class Utils { public static IEnumerable LazyGetChildNodesOfArray(Expression expression, ArrayDimensions dimensions) { @@ -22,7 +22,7 @@ namespace ILSpy.Debugger.Models.TreeModel } /// This is a partent node for all elements within a given bounds - public class ArrayRangeNode: TreeNode + internal class ArrayRangeNode: TreeNode { const int MaxElementCount = 100; diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/ChildNodesOfObject.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/ChildNodesOfObject.cs index b262d396c..88d633f8c 100644 --- a/Debugger/ILSpy.Debugger/Models/TreeModel/ChildNodesOfObject.cs +++ b/Debugger/ILSpy.Debugger/Models/TreeModel/ChildNodesOfObject.cs @@ -14,7 +14,7 @@ using Module = Debugger.Module; namespace ILSpy.Debugger.Models.TreeModel { - public partial class Utils + internal partial class Utils { public static IEnumerable LazyGetChildNodesOfObject(Expression targetObject, DebugType shownType) { @@ -94,7 +94,6 @@ namespace ILSpy.Debugger.Models.TreeModel return nodes; } - public static IEnumerable LazyGetItemsOfIList(Expression targetObject) { // This is needed for expanding IEnumerable diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/ExpressionNode.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/ExpressionNode.cs index 1889fedf0..9d380f28c 100644 --- a/Debugger/ILSpy.Debugger/Models/TreeModel/ExpressionNode.cs +++ b/Debugger/ILSpy.Debugger/Models/TreeModel/ExpressionNode.cs @@ -19,7 +19,7 @@ using ILSpy.Debugger.Services.Debugger; namespace ILSpy.Debugger.Models.TreeModel { - public class ExpressionNode: TreeNode, ISetText, INotifyPropertyChanged + internal class ExpressionNode: TreeNode, ISetText, INotifyPropertyChanged { bool evaluated; diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/ICorDebug.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/ICorDebug.cs index 001547d0d..3e5332534 100644 --- a/Debugger/ILSpy.Debugger/Models/TreeModel/ICorDebug.cs +++ b/Debugger/ILSpy.Debugger/Models/TreeModel/ICorDebug.cs @@ -7,7 +7,7 @@ using Debugger; namespace ILSpy.Debugger.Models.TreeModel { - public class ICorDebug + internal class ICorDebug { public class InfoNode: TreeNode { diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/IEnumerableNode.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/IEnumerableNode.cs index cbd25969d..5f8aeb82c 100644 --- a/Debugger/ILSpy.Debugger/Models/TreeModel/IEnumerableNode.cs +++ b/Debugger/ILSpy.Debugger/Models/TreeModel/IEnumerableNode.cs @@ -10,7 +10,7 @@ namespace ILSpy.Debugger.Models.TreeModel /// /// IEnumerable node in the variable tree. /// - public class IEnumerableNode : TreeNode + internal class IEnumerableNode : TreeNode { Expression targetObject; Expression debugListExpression; diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/IListNode.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/IListNode.cs index b43f77470..ec28ba6aa 100644 --- a/Debugger/ILSpy.Debugger/Models/TreeModel/IListNode.cs +++ b/Debugger/ILSpy.Debugger/Models/TreeModel/IListNode.cs @@ -4,7 +4,7 @@ using ICSharpCode.NRefactory.CSharp; namespace ILSpy.Debugger.Models.TreeModel { - public class IListNode : TreeNode + internal class IListNode : TreeNode { Expression targetObject; int count; diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/ISetText.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/ISetText.cs index ec52873d2..39560194f 100644 --- a/Debugger/ILSpy.Debugger/Models/TreeModel/ISetText.cs +++ b/Debugger/ILSpy.Debugger/Models/TreeModel/ISetText.cs @@ -4,7 +4,7 @@ using System; namespace ILSpy.Debugger.Models.TreeModel { - public interface ISetText + internal interface ISetText { bool CanSetText { get; } diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/ITreeNode.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/ITreeNode.cs index 270dcb0b5..077114d8e 100644 --- a/Debugger/ILSpy.Debugger/Models/TreeModel/ITreeNode.cs +++ b/Debugger/ILSpy.Debugger/Models/TreeModel/ITreeNode.cs @@ -10,7 +10,7 @@ namespace ILSpy.Debugger.Models.TreeModel /// /// Node that can be bound to . /// - public interface ITreeNode : IComparable + internal interface ITreeNode : IComparable { string Name { get; } diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/IVisualizerCommand.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/IVisualizerCommand.cs index f1ab16f33..1cba07697 100644 --- a/Debugger/ILSpy.Debugger/Models/TreeModel/IVisualizerCommand.cs +++ b/Debugger/ILSpy.Debugger/Models/TreeModel/IVisualizerCommand.cs @@ -10,7 +10,7 @@ namespace ILSpy.Debugger.Models.TreeModel /// /// Command called from . /// - public interface IVisualizerCommand + internal interface IVisualizerCommand { /// /// Can this command execute? diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/SavedTreeNode.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/SavedTreeNode.cs index 818b7335f..baea2df51 100644 --- a/Debugger/ILSpy.Debugger/Models/TreeModel/SavedTreeNode.cs +++ b/Debugger/ILSpy.Debugger/Models/TreeModel/SavedTreeNode.cs @@ -5,7 +5,7 @@ using System.Windows.Media; namespace ILSpy.Debugger.Models.TreeModel { - public class SavedTreeNode : TreeNode + internal class SavedTreeNode : TreeNode { public override bool CanSetText { get { return true; } diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/StackFrameNode.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/StackFrameNode.cs index 547d8db44..7cd84b42a 100644 --- a/Debugger/ILSpy.Debugger/Models/TreeModel/StackFrameNode.cs +++ b/Debugger/ILSpy.Debugger/Models/TreeModel/StackFrameNode.cs @@ -8,7 +8,7 @@ using ICSharpCode.NRefactory.CSharp; namespace ILSpy.Debugger.Models.TreeModel { - public class StackFrameNode: TreeNode + internal class StackFrameNode: TreeNode { StackFrame stackFrame; diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/TreeNode.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/TreeNode.cs index fd264110f..1b5a0d014 100644 --- a/Debugger/ILSpy.Debugger/Models/TreeModel/TreeNode.cs +++ b/Debugger/ILSpy.Debugger/Models/TreeModel/TreeNode.cs @@ -13,7 +13,7 @@ namespace ILSpy.Debugger.Models.TreeModel /// A node in the variable tree. /// The node is imutable. /// - public class TreeNode : ITreeNode + internal class TreeNode : ITreeNode { string text = string.Empty; diff --git a/Debugger/ILSpy.Debugger/Models/TreeModel/Utils.cs b/Debugger/ILSpy.Debugger/Models/TreeModel/Utils.cs index 167f4573b..7f327bb09 100644 --- a/Debugger/ILSpy.Debugger/Models/TreeModel/Utils.cs +++ b/Debugger/ILSpy.Debugger/Models/TreeModel/Utils.cs @@ -7,7 +7,7 @@ using Debugger; namespace ILSpy.Debugger.Models.TreeModel { - public static partial class Utils + internal static partial class Utils { /// Process on which to track debuggee state public static void DoEvents(Process process) @@ -38,14 +38,6 @@ namespace ILSpy.Debugger.Models.TreeModel } } - public class PrintTimes: PrintTime - { - public PrintTimes(string text): base(text + " - end") - { - //LoggingService.InfoFormatted("{0} - start", text); - } - } - public class PrintTime: IDisposable { string text; diff --git a/Debugger/ILSpy.Debugger/Services/Debugger/DebuggerService.cs b/Debugger/ILSpy.Debugger/Services/Debugger/DebuggerService.cs index f37645d8e..8a841015d 100644 --- a/Debugger/ILSpy.Debugger/Services/Debugger/DebuggerService.cs +++ b/Debugger/ILSpy.Debugger/Services/Debugger/DebuggerService.cs @@ -7,7 +7,7 @@ using ICSharpCode.AvalonEdit.Document; using ICSharpCode.Decompiler; using ICSharpCode.NRefactory.CSharp.Resolver; using ILSpy.Debugger.Bookmarks; -using ILSpy.Debugger.ToolTips; +using ILSpy.Debugger.Tooltips; using Mono.Cecil; namespace ILSpy.Debugger.Services diff --git a/Debugger/ILSpy.Debugger/Services/Debugger/WindowsDebugger.cs b/Debugger/ILSpy.Debugger/Services/Debugger/WindowsDebugger.cs index 84dfeb1bf..98fee2cdf 100644 --- a/Debugger/ILSpy.Debugger/Services/Debugger/WindowsDebugger.cs +++ b/Debugger/ILSpy.Debugger/Services/Debugger/WindowsDebugger.cs @@ -472,7 +472,7 @@ namespace ILSpy.Debugger.Services } } - public ITreeNode GetNode(string variable, string currentImageName = null) + internal ITreeNode GetNode(string variable, string currentImageName = null) { try { var expression = GetExpression(variable); diff --git a/Debugger/ILSpy.Debugger/Services/ImageService/ImageService.cs b/Debugger/ILSpy.Debugger/Services/ImageService/ImageService.cs index 9646c312b..491e148f4 100644 --- a/Debugger/ILSpy.Debugger/Services/ImageService/ImageService.cs +++ b/Debugger/ILSpy.Debugger/Services/ImageService/ImageService.cs @@ -1,20 +1,5 @@ // Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this -// software and associated documentation files (the "Software"), to deal in the Software -// without restriction, including without limitation the rights to use, copy, modify, merge, -// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. +// This code is distributed under MIT X11 license (for details please see \doc\license.txt) using System; using System.Windows.Media; diff --git a/Debugger/ILSpy.Debugger/Services/ParserService/ParserService.cs b/Debugger/ILSpy.Debugger/Services/ParserService/ParserService.cs index eded96638..9e917ed21 100644 --- a/Debugger/ILSpy.Debugger/Services/ParserService/ParserService.cs +++ b/Debugger/ILSpy.Debugger/Services/ParserService/ParserService.cs @@ -1,27 +1,15 @@ // Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this -// software and associated documentation files (the "Software"), to deal in the Software -// without restriction, including without limitation the rights to use, copy, modify, merge, -// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. +// This code is distributed under MIT X11 license (for details please see \doc\license.txt) using System; using System.Collections.Generic; namespace ILSpy.Debugger.Services { - public static class ParserService + /// + /// Very naive parser. + /// + static class ParserService { static HashSet mySet = new HashSet(); diff --git a/Debugger/ILSpy.Debugger/ToolTips/DebuggerPopup.cs b/Debugger/ILSpy.Debugger/ToolTips/DebuggerPopup.cs index 2dd6ab930..cd64781af 100644 --- a/Debugger/ILSpy.Debugger/ToolTips/DebuggerPopup.cs +++ b/Debugger/ILSpy.Debugger/ToolTips/DebuggerPopup.cs @@ -13,7 +13,7 @@ namespace ILSpy.Debugger.Tooltips /// /// Popup containing . /// - public class DebuggerPopup : Popup + internal class DebuggerPopup : Popup { internal DebuggerTooltipControl contentControl; diff --git a/Debugger/ILSpy.Debugger/ToolTips/DebuggerTooltipControl.xaml b/Debugger/ILSpy.Debugger/ToolTips/DebuggerTooltipControl.xaml index 3ddc298de..308ae6c24 100644 --- a/Debugger/ILSpy.Debugger/ToolTips/DebuggerTooltipControl.xaml +++ b/Debugger/ILSpy.Debugger/ToolTips/DebuggerTooltipControl.xaml @@ -1,6 +1,7 @@  /// Default Control used as content of SharpDevelop debugger tooltips. /// - public partial class DebuggerTooltipControl : UserControl, ITooltip + internal partial class DebuggerTooltipControl : UserControl, ITooltip { private const double ChildPopupOpenXOffet = 16; private const double ChildPopupOpenYOffet = 15; diff --git a/Debugger/ILSpy.Debugger/ToolTips/LazyItemsControl.cs b/Debugger/ILSpy.Debugger/ToolTips/LazyItemsControl.cs index 003d31e45..092988a4f 100644 --- a/Debugger/ILSpy.Debugger/ToolTips/LazyItemsControl.cs +++ b/Debugger/ILSpy.Debugger/ToolTips/LazyItemsControl.cs @@ -13,7 +13,7 @@ namespace ILSpy.Debugger.Tooltips /// ItemsControl wrapper that takes VirtualizingIEnumerable as source, /// and adds additional items from the source to underlying ItemsControl when scrolled to bottom. /// - public class LazyItemsControl + internal class LazyItemsControl { private ItemsControl itemsControl; private int initialItemsCount; diff --git a/Debugger/ILSpy.Debugger/ToolTips/Models/ToolTipRequestEventArgs.cs b/Debugger/ILSpy.Debugger/ToolTips/Models/ToolTipRequestEventArgs.cs index 800cf41df..cd04a9734 100644 --- a/Debugger/ILSpy.Debugger/ToolTips/Models/ToolTipRequestEventArgs.cs +++ b/Debugger/ILSpy.Debugger/ToolTips/Models/ToolTipRequestEventArgs.cs @@ -5,9 +5,9 @@ using System; using ICSharpCode.AvalonEdit; using ICSharpCode.NRefactory.CSharp; -namespace ILSpy.Debugger.ToolTips +namespace ILSpy.Debugger.Tooltips { - public class ToolTipRequestEventArgs : EventArgs + internal class ToolTipRequestEventArgs : EventArgs { /// /// Gets whether the tool tip request was handled. diff --git a/Debugger/ILSpy.Debugger/ToolTips/TextEditorListener.cs b/Debugger/ILSpy.Debugger/ToolTips/TextEditorListener.cs index 78d683d37..810eb96a2 100644 --- a/Debugger/ILSpy.Debugger/ToolTips/TextEditorListener.cs +++ b/Debugger/ILSpy.Debugger/ToolTips/TextEditorListener.cs @@ -13,12 +13,9 @@ using ICSharpCode.NRefactory.CSharp; using ILSpy.Debugger.AvalonEdit; using ILSpy.Debugger.Services; -namespace ILSpy.Debugger.ToolTips +namespace ILSpy.Debugger.Tooltips { - /// - /// Description of TextEditorListener. - /// - public class TextEditorListener : IWeakEventListener + public sealed class TextEditorListener : IWeakEventListener { private static readonly TextEditorListener instance; diff --git a/Debugger/ILSpy.Debugger/ToolTips/VirtualizingIEnumerable.cs b/Debugger/ILSpy.Debugger/ToolTips/VirtualizingIEnumerable.cs index 1e5686005..1d204ee7d 100644 --- a/Debugger/ILSpy.Debugger/ToolTips/VirtualizingIEnumerable.cs +++ b/Debugger/ILSpy.Debugger/ToolTips/VirtualizingIEnumerable.cs @@ -12,7 +12,7 @@ namespace ILSpy.Debugger.Tooltips /// from underlying IEnumerable<T>. /// Can be used as source for . /// - public class VirtualizingIEnumerable : ObservableCollection + internal class VirtualizingIEnumerable : ObservableCollection { private IEnumerator originalSourceEnumerator; diff --git a/ILSpy/Commands/DebuggerCommands.cs b/ILSpy/Commands/DebuggerCommands.cs index f2f4c05d5..bb313d77b 100644 --- a/ILSpy/Commands/DebuggerCommands.cs +++ b/ILSpy/Commands/DebuggerCommands.cs @@ -220,7 +220,7 @@ namespace ICSharpCode.ILSpy.Commands var settings = ILSpySettings.Load(); XElement e = settings["DebuggerSettings"]; var showWarnings = (bool?)e.Attribute("showWarnings"); - if (showWarnings.HasValue && showWarnings.Value) + if ((showWarnings.HasValue && showWarnings.Value) || !showWarnings.HasValue) MessageBox.Show("Warning: When attaching to an application, some local variables might not be available. If possible, use the \"Start Executable\" command.", "Attach to a process", MessageBoxButton.OK, MessageBoxImage.Warning); diff --git a/ILSpy/TextView/DecompilerTextView.cs b/ILSpy/TextView/DecompilerTextView.cs index 38c21a940..c0c017b68 100644 --- a/ILSpy/TextView/DecompilerTextView.cs +++ b/ILSpy/TextView/DecompilerTextView.cs @@ -45,7 +45,7 @@ using ICSharpCode.NRefactory.Documentation; using ILSpy.Debugger; using ILSpy.Debugger.AvalonEdit; using ILSpy.Debugger.Bookmarks; -using ILSpy.Debugger.ToolTips; +using ILSpy.Debugger.Tooltips; using Microsoft.Win32; using TextEditorWeakEventManager = ILSpy.Debugger.AvalonEdit.TextEditorWeakEventManager;