pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

WIP

newNRvisualizers
Siegfried Pammer 13 years ago
parent
db35bad84f
commit
4671ad9828
18 changed files with 220 additions and 329 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      SharpDevelop.sln
  2. 12
      src/AddIns/Debugger/Debugger.AddIn/BreakpointChangeMenuBuilder.cs
  3. 172
      src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
  4. 3
      src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj.user
  5. 41
      src/AddIns/Debugger/Debugger.AddIn/NRefactory/ExpressionEvaluationVisitor.cs
  6. 45
      src/AddIns/Debugger/Debugger.AddIn/Pads/Common/AutoCompleteTextBox.cs
  7. 81
      src/AddIns/Debugger/Debugger.AddIn/Pads/ConsolePad.cs
  8. 1
      src/AddIns/Debugger/Debugger.AddIn/Pads/LoadedModulesPad.cs
  9. 2
      src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/ParallelStackPad.cs
  10. 2
      src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/SelectedFrameBookmark.cs
  11. 4
      src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/ThreadStack.xaml.cs
  12. 32
      src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPad.cs
  13. 19
      src/AddIns/Debugger/Debugger.AddIn/Service/EditBreakpointScriptWindow.xaml.cs
  14. 68
      src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs
  15. 2
      src/AddIns/Debugger/Debugger.AddIn/TreeModel/TreeNode.cs
  16. 1
      src/AddIns/Debugger/Debugger.AddIn/TreeModel/Utils.cs
  17. 33
      src/AddIns/Debugger/Debugger.AddIn/TreeModel/ValueNode.cs
  18. 2
      src/AddIns/DisplayBindings/IconEditor/IconEditor/IconEditor.csproj

29
SharpDevelop.sln
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
# SharpDevelop 4.3.0.8807-alpha
# SharpDevelop 4.2.0.8783
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@ -113,6 +113,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{70 @@ -113,6 +113,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{70
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Analysis\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{49CE38B8-0460-46BF-9DFF-5B33A0F9EB5E}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
EndProject
Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "src\Tools\Tools.build", "{3DF4060F-5EE0-41CF-8096-F27355FD5511}"
EndProject
Global
@ -411,6 +419,22 @@ Global @@ -411,6 +419,22 @@ Global
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|x86.ActiveCfg = Debug|Any CPU
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|x86.Build.0 = Release|Any CPU
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|x86.ActiveCfg = Release|Any CPU
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Debug|x86.Build.0 = Debug|Any CPU
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Debug|x86.ActiveCfg = Debug|Any CPU
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Release|Any CPU.Build.0 = Release|Any CPU
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Release|x86.Build.0 = Release|Any CPU
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Release|x86.ActiveCfg = Release|Any CPU
{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Debug|x86.Build.0 = Debug|Any CPU
{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Debug|x86.ActiveCfg = Debug|Any CPU
{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Release|Any CPU.Build.0 = Release|Any CPU
{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Release|x86.Build.0 = Release|Any CPU
{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -438,6 +462,7 @@ Global @@ -438,6 +462,7 @@ Global
{F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
{7019F43E-DFD7-4D1C-8C96-E75D55646DE7} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
{49CE38B8-0460-46BF-9DFF-5B33A0F9EB5E} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
{83F15BA7-8478-4664-81BB-A82F146D88B3} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E}
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E}
{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94}
@ -458,5 +483,7 @@ Global @@ -458,5 +483,7 @@ Global
{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
{DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
{1F261725-6318-4434-A1B1-6C70CE4CD324} = {7019F43E-DFD7-4D1C-8C96-E75D55646DE7}
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {49CE38B8-0460-46BF-9DFF-5B33A0F9EB5E}
{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {49CE38B8-0460-46BF-9DFF-5B33A0F9EB5E}
EndGlobalSection
EndGlobal

12
src/AddIns/Debugger/Debugger.AddIn/BreakpointChangeMenuBuilder.cs
Unescape View File

@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under the BSD license (for details please see \src\AddIns\Debugger\Debugger.AddIn\license.txt)
using ICSharpCode.SharpDevelop.Gui.Pads;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Windows.Forms;
using System.Windows.Controls;
using Debugger.AddIn.Service;
using ICSharpCode.Core;
using ICSharpCode.Core.Presentation;
using ICSharpCode.Core.WinForms;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Debugging;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Gui.Pads;
namespace Debugger.AddIn
{
@ -51,9 +51,9 @@ namespace Debugger.AddIn @@ -51,9 +51,9 @@ namespace Debugger.AddIn
void HandleItem(object sender)
{
ToolStripMenuItem item = null;
if (sender is ToolStripMenuItem)
item = (ToolStripMenuItem)sender;
MenuItem item = null;
if (sender is MenuItem)
item = (MenuItem)sender;
if (item != null) {
BreakpointBookmark bookmark = (BreakpointBookmark)item.Tag;

172
src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
Unescape View File

@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
<FileAlignment>4096</FileAlignment>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<RunPostBuildEvent>Always</RunPostBuildEvent>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<SourceAnalysisOverrideSettingsFile>"C:\Program Files\SharpDevelop\3.0\bin\..\AddIns\AddIns\Misc\SourceAnalysis\Settings.SourceAnalysis"</SourceAnalysisOverrideSettingsFile>
<SourceAnalysisOverrideSettingsFile>C:\Dokumente und Einstellungen\HP\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
<PublishUrl>http://localhost/Debugger.AddIn/</PublishUrl>
@ -97,8 +97,7 @@ @@ -97,8 +97,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="NRefactory\ExpressionEvaluator.cs" />
<Compile Include="NRefactory\ExpressionExtensionMethods.cs" />
<Compile Include="NRefactory\ExpressionEvaluationVisitor.cs" />
<Compile Include="Options\DebuggingOptionsPanel.xaml.cs">
<DependentUpon>DebuggingOptionsPanel.xaml</DependentUpon>
<SubType>Code</SubType>
@ -106,24 +105,10 @@ @@ -106,24 +105,10 @@
<Compile Include="Pads\CallStackPad.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Pads\Commands\ParallelStacksViewCommands.cs" />
<Compile Include="Pads\Commands\SelectLanguageCommand.cs" />
<Compile Include="Pads\Commands\WatchPadCommands.cs" />
<Compile Include="Pads\Common\AutoCompleteTextBox.cs" />
<Compile Include="Pads\ParallelPad\DrawSurface.xaml.cs">
<DependentUpon>DrawSurface.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Pads\ParallelPad\ParallelStackFrameModel.cs" />
<Compile Include="Pads\ParallelPad\ParallelStackPad.cs" />
<Compile Include="Pads\ParallelPad\ParallelStacksGraph.cs" />
<Compile Include="Pads\ParallelPad\SelectedFrameBookmark.cs" />
<Compile Include="Pads\ParallelPad\ThreadStack.xaml.cs">
<DependentUpon>ThreadStack.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="BreakpointChangeMenuBuilder.cs" />
<Compile Include="DisableBreakpointMenuCommand.cs" />
<Compile Include="EnableBreakpointMenuCommand.cs" />
<Compile Include="IsActiveBreakpointCondition.cs" />
@ -158,86 +143,8 @@ @@ -158,86 +143,8 @@
<DependentUpon>EditBreakpointScriptWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Tooltips\DebuggerTooltipControl.xaml.cs">
<DependentUpon>DebuggerTooltipControl.xaml</DependentUpon>
</Compile>
<Compile Include="Tooltips\VisualizerPicker.cs">
<DependentUpon>VisualizerPicker.xaml</DependentUpon>
</Compile>
<Compile Include="TreeModel\SharpTreeNodeAdapter.cs" />
<Compile Include="TreeModel\TreeNode.cs" />
<Compile Include="Visualizers\Commands\ExpressionVisualizerCommand.cs" />
<Compile Include="Visualizers\Commands\GridVisualizerCommand.cs" />
<Compile Include="Visualizers\Commands\IVisualizerDescriptor.cs" />
<Compile Include="Visualizers\Commands\ObjectGraphVisualizerCommand.cs" />
<Compile Include="Visualizers\Commands\GridVisualizerMenuCommand.cs" />
<Compile Include="Visualizers\Commands\ObjectGraphVisualizerMenuCommand.cs" />
<Compile Include="Visualizers\Commands\TextVisualizerCommand.cs" />
<Compile Include="Visualizers\Commands\VisualizerDescriptors.cs" />
<Compile Include="Visualizers\Commands\XmlVisualizerCommand.cs" />
<Compile Include="Visualizers\Common\DebuggerVisualizerException.cs" />
<Compile Include="Visualizers\Common\IEvaluate.cs" />
<Compile Include="Visualizers\Common\IVisualizerCommand.cs" />
<Compile Include="Visualizers\Common\ObjectProperty.cs" />
<Compile Include="Visualizers\Common\ObjectPropertyComparer.cs" />
<Compile Include="Visualizers\Common\VirtualizingCollection.cs" />
<Compile Include="Visualizers\Common\VirtualizingObservableCollection.cs" />
<Compile Include="Visualizers\Graph\Drawing\BoolToBoldConverter.cs" />
<Compile Include="Visualizers\Graph\Drawing\PositionedGraphNodeControl.xaml.cs">
<DependentUpon>PositionedGraphNodeControl.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Visualizers\Graph\ExpandedPaths\Expanded.cs" />
<Compile Include="Visualizers\Graph\ExpandedPaths\ExpandedContentNodes.cs" />
<Compile Include="Visualizers\Graph\ExpandedPaths\ExpandedExpressions.cs" />
<Compile Include="Visualizers\Graph\ExpandedPaths\ExpandedPaths.cs" />
<Compile Include="Visualizers\Graph\GraphExpression.cs" />
<Compile Include="Visualizers\Graph\Layout\GraphEdgeRouter.cs" />
<Compile Include="Visualizers\Graph\Layout\SplineRouting\Box.cs" />
<Compile Include="Visualizers\Graph\Layout\SplineRouting\Edge.cs" />
<Compile Include="Visualizers\Graph\Layout\SplineRouting\EdgeRouter.cs" />
<Compile Include="Visualizers\Graph\Layout\SplineRouting\GeomUtils.cs" />
<Compile Include="Visualizers\Graph\Layout\SplineRouting\IEdge.cs" />
<Compile Include="Visualizers\Graph\Layout\SplineRouting\IPoint.cs" />
<Compile Include="Visualizers\Graph\Layout\SplineRouting\IRect.cs" />
<Compile Include="Visualizers\Graph\Layout\SplineRouting\Point2D.cs" />
<Compile Include="Visualizers\Graph\Layout\SplineRouting\RouteGraph\EdgeStartEnd.cs" />
<Compile Include="Visualizers\Graph\Layout\SplineRouting\RouteGraph\RoutedEdge.cs" />
<Compile Include="Visualizers\Graph\Layout\SplineRouting\RouteGraph\RouteGraph.cs" />
<Compile Include="Visualizers\Graph\Layout\SplineRouting\RouteGraph\RouteGraphEdge.cs" />
<Compile Include="Visualizers\Graph\Layout\SplineRouting\RouteGraph\RouteVertex.cs" />
<Compile Include="Visualizers\Graph\Layout\SplineRouting\ShortestPath\DijkstraShortestPathFinder.cs" />
<Compile Include="Visualizers\Graph\Layout\TreeModel\ContentNode.cs" />
<Compile Include="Visualizers\Graph\Layout\TreeModel\ContentNodeEventArgs.cs" />
<Compile Include="Visualizers\Graph\Layout\TreeModel\ContentPropertyNode.cs" />
<Compile Include="Visualizers\Graph\ObjectGraphControl.xaml.cs">
<DependentUpon>ObjectGraphControl.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Visualizers\Graph\ObjectGraph\NamedEdge.cs" />
<Compile Include="Visualizers\Graph\ObjectGraph\PropertiesFirstComparer.cs" />
<Compile Include="Visualizers\Graph\ObjectGraph\TreeModel\AbstractNode.cs" />
<Compile Include="Visualizers\Graph\ObjectGraph\TreeModel\BaseClassNode.cs" />
<Compile Include="Visualizers\Graph\ObjectGraph\TreeModel\RawViewNode.cs" />
<Compile Include="Visualizers\Graph\ObjectGraph\TreeModel\ThisNode.cs" />
<Compile Include="Visualizers\Graph\ObjectGraph\TreeModel\NonPublicMembersNode.cs" />
<Compile Include="Visualizers\Graph\ObjectGraph\TreeModel\PropertyNode.cs" />
<Compile Include="Visualizers\PresentationBindings\DragScrollViewer.cs" />
<Compile Include="Visualizers\PresentationBindings\GridViewColumnHider.cs" />
<Compile Include="Visualizers\PresentationBindings\GridViewHideableColumn.cs" />
<Compile Include="Visualizers\PresentationBindings\TooltipVisibilityConverter.cs" />
<Compile Include="Visualizers\TextVisualizer\TextVisualizerWindow.xaml.cs">
<DependentUpon>TextVisualizerWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Visualizers\Utils\AtomicType.cs" />
<Compile Include="Visualizers\Utils\IEnumerableExtensions.cs" />
<Compile Include="Visualizers\Utils\ITreeNode.cs" />
<Compile Include="Visualizers\Utils\LinqUtils.cs" />
<Compile Include="Visualizers\Utils\ListHelper.cs" />
<Compile Include="Visualizers\Utils\StringHelper.cs" />
<Compile Include="Visualizers\Utils\TreeFlattener.cs" />
<Compile Include="Visualizers\Utils\TypeResolver.cs" />
<EmbeddedResource Include="Service\DebuggeeExceptionForm.resx">
<DependentUpon>DebuggeeExceptionForm.cs</DependentUpon>
</EmbeddedResource>
@ -252,34 +159,6 @@ @@ -252,34 +159,6 @@
</Compile>
<Compile Include="TreeModel\ValueNode.cs" />
<Compile Include="TreeModel\Utils.cs" />
<Compile Include="Visualizers\Graph\Drawing\CanvasLocationAdapter.cs" />
<Compile Include="Visualizers\Graph\Drawing\GraphDrawer.cs" />
<Compile Include="Visualizers\Graph\Layout\GraphDiff.cs" />
<Compile Include="Visualizers\Graph\Layout\GraphMatcher.cs" />
<Compile Include="Visualizers\Graph\Layout\PositionedEdge.cs" />
<Compile Include="Visualizers\Graph\Layout\PositionedGraph.cs" />
<Compile Include="Visualizers\Graph\Layout\PositionedNode.cs" />
<Compile Include="Visualizers\Graph\Layout\PositionedNodeProperty.cs" />
<Compile Include="Visualizers\Graph\Layout\PositionedPropertyEventArgs.cs" />
<Compile Include="Visualizers\Graph\Layout\Tree\LayoutDirection.cs" />
<Compile Include="Visualizers\Graph\Layout\Tree\TreeLayout.cs" />
<Compile Include="Visualizers\Graph\ObjectGraph\ObjectGraph.cs" />
<Compile Include="Visualizers\Graph\ObjectGraph\ObjectGraphBuilder.cs" />
<Compile Include="Visualizers\Graph\ObjectGraph\ObjectGraphNode.cs" />
<Compile Include="Visualizers\Graph\ObjectGraph\ObjectGraphProperty.cs" />
<Compile Include="Visualizers\GridVisualizer\GridVisualizerWindow.xaml.cs">
<DependentUpon>GridVisualizerWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Visualizers\Utils\DebuggerHelpers.cs" />
<Compile Include="Visualizers\Utils\DictionaryExtensions.cs" />
<Compile Include="Visualizers\Utils\Lookup.cs" />
<Compile Include="Visualizers\Utils\LookupValueCollection.cs" />
<Compile Include="Visualizers\Graph\ObjectGraphWindow.xaml.cs">
<DependentUpon>ObjectGraphWindow.xaml</DependentUpon>
</Compile>
<Compile Include="Visualizers\PresentationBindings\DisplayAttribute.cs" />
<Compile Include="Visualizers\PresentationBindings\EnumViewModel.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Debugger.AddIn.addin">
@ -295,6 +174,18 @@ @@ -295,6 +174,18 @@
<Name>Mono.Cecil</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Libraries\NewNRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
<Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
<Name>ICSharpCode.NRefactory.CSharp</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Libraries\NewNRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
<Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
<Name>ICSharpCode.NRefactory</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
<Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
<Name>ICSharpCode.NRefactory</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj">
<Project>{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}</Project>
<Name>ICSharpCode.TreeView</Name>
@ -335,22 +226,7 @@ @@ -335,22 +226,7 @@
<ItemGroup>
<Page Include="Options\DebuggingOptionsPanel.xaml" />
<Page Include="Pads\Common\CommonResources.xaml" />
<Page Include="Pads\ParallelPad\DrawSurface.xaml" />
<Page Include="Pads\ParallelPad\ThreadStack.xaml" />
<Page Include="Service\EditBreakpointScriptWindow.xaml" />
<Page Include="Tooltips\DebuggerTooltipControl.xaml" />
<Page Include="Tooltips\VisualizerPicker.xaml" />
<Page Include="Visualizers\Graph\Drawing\NodeControlResources.xaml" />
<Page Include="Visualizers\Graph\Drawing\PositionedGraphNodeControl.xaml" />
<Page Include="Visualizers\Graph\ObjectGraphControl.xaml" />
<Page Include="Visualizers\GridVisualizer\ColumnPicker.xaml" />
<Page Include="Visualizers\GridVisualizer\GridVisualizerWindow.xaml" />
<Page Include="Visualizers\TextVisualizer\TextVisualizerWindow.xaml" />
<ProjectReference Include="..\..\..\Libraries\NRefactory\Project\NRefactory.csproj">
<Project>{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}</Project>
<Name>NRefactory</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
<Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
<Name>ICSharpCode.Core.WinForms</Name>
@ -359,26 +235,6 @@ @@ -359,26 +235,6 @@
<Folder Include="NRefactory" />
<Folder Include="Pads\Commands" />
<Folder Include="Pads\Common" />
<Folder Include="Pads\ParallelPad" />
<Folder Include="Tooltips" />
<Folder Include="Visualizers\Graph" />
<Folder Include="Visualizers\Graph\Drawing" />
<Folder Include="Visualizers\Graph\Layout" />
<Folder Include="Visualizers\Graph\Layout\TreeModel" />
<Folder Include="Visualizers\Graph\Layout\SplineRouting" />
<Folder Include="Visualizers\Graph\Layout\SplineRouting\RouteGraph" />
<Folder Include="Visualizers\Graph\Layout\SplineRouting\ShortestPath" />
<Folder Include="Visualizers\Graph\Layout\Tree" />
<Folder Include="Visualizers\Graph\ExpandedPaths" />
<Folder Include="Visualizers\Graph\ObjectGraph\TreeModel" />
<Folder Include="Visualizers\Graph\ObjectGraph" />
<Folder Include="Visualizers\Common" />
<Folder Include="Visualizers\Commands" />
<Folder Include="Visualizers\TextVisualizer" />
<Folder Include="Visualizers\Utils" />
<Folder Include="Visualizers\GridVisualizer" />
<Folder Include="Visualizers\PresentationBindings" />
<Page Include="Visualizers\Graph\ObjectGraphWindow.xaml" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">

3
src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj.user
Unescape View File

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<LastOpenVersion>8.0.50215</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView>

41
src/AddIns/Debugger/Debugger.AddIn/NRefactory/ExpressionEvaluationVisitor.cs
Unescape View File

@ -0,0 +1,41 @@ @@ -0,0 +1,41 @@
// 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 ICSharpCode.NRefactory.Semantics;
namespace Debugger.AddIn
{
public enum SupportedLanguage
{
CSharp,
VBNet
}
public class ExpressionEvaluationVisitor
{
public ExpressionEvaluationVisitor()
{
}
public Value Convert(ResolveResult result)
{
return Visit((dynamic)result);
}
Value Visit(ResolveResult result)
{
return null;
}
Value Visit(ThisResolveResult result)
{
return null;
}
Value Visit(MemberResolveResult result)
{
return null;
}
}
}

45
src/AddIns/Debugger/Debugger.AddIn/Pads/Common/AutoCompleteTextBox.cs
Unescape View File

@ -9,8 +9,6 @@ using System.Windows.Media; @@ -9,8 +9,6 @@ using System.Windows.Media;
using System.Windows.Threading;
using ICSharpCode.AvalonEdit;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Dom.NRefactoryResolver;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
using ICSharpCode.SharpDevelop.Project;
@ -54,7 +52,7 @@ namespace Debugger.AddIn.Pads.Controls @@ -54,7 +52,7 @@ namespace Debugger.AddIn.Pads.Controls
public AutoCompleteTextBox()
{
object tmp;
this.editorAdapter = EditorControlService.CreateEditor(out tmp);
this.editorAdapter = SD.EditorControlService.CreateEditor(out tmp);
this.editor = (TextEditor)tmp;
this.editor.Background = Brushes.Transparent;
@ -95,26 +93,27 @@ namespace Debugger.AddIn.Pads.Controls @@ -95,26 +93,27 @@ namespace Debugger.AddIn.Pads.Controls
private void ShowDotCompletion(StackFrame frame, string currentText)
{
string language = ProjectService.CurrentProject == null ? "C#" : ProjectService.CurrentProject.Language;
NRefactoryResolver resolver = new NRefactoryResolver(LanguageProperties.GetLanguage(language));
var seg = frame.NextStatement;
var expressionFinder = ParserService.GetExpressionFinder(seg.Filename);
var info = ParserService.GetParseInformation(seg.Filename);
string text = ParserService.GetParseableFileContent(seg.Filename).Text;
int currentOffset = this.editor.CaretOffset;
var expr = expressionFinder.FindExpression(currentText, currentOffset);
expr.Region = new DomRegion(seg.StartLine, seg.StartColumn, seg.EndLine, seg.EndColumn);
var rr = resolver.Resolve(expr, info, text);
if (rr != null) {
editorAdapter.ShowCompletionWindow(new DotCodeCompletionItemProvider().GenerateCompletionListForResolveResult(rr, expr.Context));
}
#warning reimplement this!
// NRefactoryResolver resolver = new NRefactoryResolver(LanguageProperties.GetLanguage(language));
//
// var seg = frame.NextStatement;
//
// var expressionFinder = ParserService.GetExpressionFinder(seg.Filename);
// var info = ParserService.GetParseInformation(seg.Filename);
//
// string text = ParserService.GetParseableFileContent(seg.Filename).Text;
//
// int currentOffset = this.editor.CaretOffset;
//
// var expr = expressionFinder.FindExpression(currentText, currentOffset);
//
// expr.Region = new DomRegion(seg.StartLine, seg.StartColumn, seg.EndLine, seg.EndColumn);
//
// var rr = resolver.Resolve(expr, info, text);
//
// if (rr != null) {
// editorAdapter.ShowCompletionWindow(new DotCodeCompletionItemProvider().GenerateCompletionListForResolveResult(rr, expr.Context));
// }
}
}
}

81
src/AddIns/Debugger/Debugger.AddIn/Pads/ConsolePad.cs
Unescape View File

@ -6,12 +6,10 @@ using System.Windows.Controls; @@ -6,12 +6,10 @@ using System.Windows.Controls;
using System.Windows.Input;
using Debugger;
using Debugger.AddIn;
using ICSharpCode.Core.Presentation;
using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Visitors;
using ICSharpCode.SharpDevelop.Debugging;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Dom.NRefactoryResolver;
using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
using ICSharpCode.SharpDevelop.Services;
@ -20,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -20,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
public class ConsolePad : AbstractConsolePad
{
SupportedLanguage language;
NRefactoryResolver resolver;
// NRefactoryResolver resolver;
const string debuggerConsoleToolBarTreePath = "/SharpDevelop/Pads/ConsolePad/ToolBar";
@ -55,15 +53,17 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -55,15 +53,17 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
if (frame == null)
return "No current execution frame";
try {
object data = ((WindowsDebugger)DebuggerService.CurrentDebugger).debuggerDecompilerService.GetLocalVariableIndex(frame.MethodInfo.DeclaringType.MetadataToken,
frame.MethodInfo.MetadataToken,
code);
Value val = ExpressionEvaluator.Evaluate(code, SelectedLanguage, frame, data);
return ExpressionEvaluator.FormatValue(WindowsDebugger.EvalThread, val);
} catch (GetValueException e) {
return e.Message;
}
throw new NotImplementedException("");
// try {
// object data = ((WindowsDebugger)DebuggerService.CurrentDebugger).debuggerDecompilerService.GetLocalVariableIndex(frame.MethodInfo.DeclaringType.MetadataToken,
// frame.MethodInfo.MetadataToken,
// code);
// Value val = ExpressionEvaluator.Evaluate(code, SelectedLanguage, frame, data);
// return ExpressionEvaluator.FormatValue(WindowsDebugger.EvalThread, val);
// } catch (GetValueException e) {
// return e.Message;
// }
}
protected override string Prompt {
@ -80,16 +80,17 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -80,16 +80,17 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
void OnLanguageChanged()
{
switch (SelectedLanguage) {
case SupportedLanguage.CSharp:
resolver = new NRefactoryResolver(LanguageProperties.CSharp);
SetHighlighting("C#");
break;
case SupportedLanguage.VBNet:
resolver = new NRefactoryResolver(LanguageProperties.VBNet);
SetHighlighting("VBNET");
break;
}
#warning reimplement this!
// switch (SelectedLanguage) {
// case SupportedLanguage.CSharp:
// resolver = new NRefactoryResolver(LanguageProperties.CSharp);
// SetHighlighting("C#");
// break;
// case SupportedLanguage.VBNet:
// resolver = new NRefactoryResolver(LanguageProperties.VBNet);
// SetHighlighting("VBNET");
// break;
// }
}
public ConsolePad()
@ -109,23 +110,23 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -109,23 +110,23 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
var seg = frame.NextStatement;
if (seg == null)
return;
var expressionFinder = ParserService.GetExpressionFinder(seg.Filename);
var info = ParserService.GetParseInformation(seg.Filename);
string text = ParserService.GetParseableFileContent(seg.Filename).Text;
int currentOffset = TextEditor.Caret.Offset - console.CommandOffset - 1;
var expr = expressionFinder.FindExpression(currentText, currentOffset);
expr.Region = new DomRegion(seg.StartLine, seg.StartColumn, seg.EndLine, seg.EndColumn);
var rr = resolver.Resolve(expr, info, text);
if (rr != null) {
TextEditor.ShowCompletionWindow(new DotCodeCompletionItemProvider().GenerateCompletionListForResolveResult(rr, expr.Context));
}
#warning reimplement this!
// var expressionFinder = ParserService.GetExpressionFinder(seg.Filename);
// var info = ParserService.GetParseInformation(seg.Filename);
//
// string text = ParserService.GetParseableFileContent(seg.Filename).Text;
//
// int currentOffset = TextEditor.Caret.Offset - console.CommandOffset - 1;
//
// var expr = expressionFinder.FindExpression(currentText, currentOffset);
//
// expr.Region = new DomRegion(seg.StartLine, seg.StartColumn, seg.EndLine, seg.EndColumn);
//
// var rr = resolver.Resolve(expr, info, text);
//
// if (rr != null) {
// TextEditor.ShowCompletionWindow(new DotCodeCompletionItemProvider().GenerateCompletionListForResolveResult(rr, expr.Context));
// }
}
protected override ToolBar BuildToolBar()

1
src/AddIns/Debugger/Debugger.AddIn/Pads/LoadedModulesPad.cs
Unescape View File

@ -10,7 +10,6 @@ using System.Windows.Controls; @@ -10,7 +10,6 @@ using System.Windows.Controls;
using System.Windows.Data;
using Debugger;
using Debugger.AddIn.Pads.Controls;
using Debugger.AddIn.Pads.ParallelPad;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Services;

2
src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/ParallelStackPad.cs
Unescape View File

@ -552,7 +552,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -552,7 +552,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
return model;
}
void ToggleSelectedFrameBookmark(Location location)
void ToggleSelectedFrameBookmark(TextLocation location)
{
// remove all
BookmarkManager.RemoveAll(b => b is SelectedFrameBookmark);

2
src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/SelectedFrameBookmark.cs
Unescape View File

@ -14,7 +14,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks @@ -14,7 +14,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
{
public static readonly IImage SelectedFrameImage = new ResourceServiceImage("Icons.48x48.CurrentFrame");
public SelectedFrameBookmark(FileName fileName, Location location) : base(fileName, location)
public SelectedFrameBookmark(FileName fileName, TextLocation location) : base(fileName, location)
{
this.IsVisibleInBookmarkPad = false;
}

4
src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/ThreadStack.xaml.cs
Unescape View File

@ -25,12 +25,12 @@ namespace Debugger.AddIn.Pads.ParallelPad @@ -25,12 +25,12 @@ namespace Debugger.AddIn.Pads.ParallelPad
private set;
}
public Location Location {
public TextLocation Location {
get;
private set;
}
public FrameSelectedEventArgs(StackFrame item, Location location)
public FrameSelectedEventArgs(StackFrame item, TextLocation location)
{
Item = item;
Location = location;

32
src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPad.cs
Unescape View File

@ -13,7 +13,6 @@ using Debugger.AddIn.TreeModel; @@ -13,7 +13,6 @@ using Debugger.AddIn.TreeModel;
using ICSharpCode.Core;
using ICSharpCode.Core.Presentation;
using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Visitors;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Services;
using ICSharpCode.TreeView;
@ -64,24 +63,24 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -64,24 +63,24 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
void LoadNodes()
{
if (ProjectService.OpenSolution != null &&
ProjectService.OpenSolution.Preferences != null &&
ProjectService.OpenSolution.Preferences.Properties != null)
ProjectService.OpenSolution.Preferences != null &&
ProjectService.OpenSolution.Preferences.Properties != null)
{
var props = ProjectService.OpenSolution.Preferences.Properties.Get("Watches", new Properties());
foreach(var element in props.Elements) {
this.Items.Add(new TreeNode(element, null).ToSharpTreeNode());
}
var props = ProjectService.OpenSolution.Preferences.Properties.NestedProperties("Watches");
foreach (var key in props.Keys) {
this.Items.Add(new TreeNode(props.Get(key, ""), () => null).ToSharpTreeNode());
}
}
}
void SaveNodes()
{
if (ProjectService.OpenSolution != null &&
ProjectService.OpenSolution.Preferences != null &&
ProjectService.OpenSolution.Preferences.Properties != null)
ProjectService.OpenSolution.Preferences != null &&
ProjectService.OpenSolution.Preferences.Properties != null)
{
var props = new Properties();
ProjectService.OpenSolution.Preferences.Properties.Set("Watches", props);
ProjectService.OpenSolution.Preferences.Properties.SetNestedProperties("Watches", props);
foreach(var node in this.Items.OfType<TreeNode>()) {
props.Set(node.Name, (object)null);
}
@ -91,12 +90,13 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -91,12 +90,13 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
SharpTreeNodeAdapter MakeNode(string name)
{
LoggingService.Info("Evaluating watch: " + name);
TreeNode node;
try {
node = new ValueNode(null, name, () => ExpressionEvaluator.Evaluate(name, SupportedLanguage.CSharp, WindowsDebugger.CurrentStackFrame));
} catch (GetValueException e) {
node = new TreeNode("Icons.16x16.Error", name, e.Message, string.Empty, null);
}
TreeNode node = null;
#warning reimplement this!
// try {
// node = new ValueNode(null, name, () => ExpressionEvaluator.Evaluate(name, SupportedLanguage.CSharp, WindowsDebugger.CurrentStackFrame));
// } catch (GetValueException e) {
// node = new TreeNode("Icons.16x16.Error", name, e.Message, string.Empty, null);
// }
node.CanDelete = true;
node.CanSetName = true;
node.PropertyChanged += (s, e) => { if (e.PropertyName == "Name") WindowsDebugger.RefreshPads(); };

19
src/AddIns/Debugger/Debugger.AddIn/Service/EditBreakpointScriptWindow.xaml.cs
Unescape View File

@ -62,15 +62,16 @@ namespace Debugger.AddIn.Service @@ -62,15 +62,16 @@ namespace Debugger.AddIn.Service
bool CheckSyntax()
{
SupportedLanguage language = (SupportedLanguage)Enum.Parse(typeof(SupportedLanguage), this.cmbLanguage.SelectedItem.ToString(), true);
using (var parser = ParserFactory.CreateParser(language, new StringReader(this.codeEditor.Document.Text))) {
parser.ParseExpression();
if (parser.Errors.Count > 0) {
MessageService.ShowError(parser.Errors.ErrorOutput);
return false;
}
}
#warning reimplement this!
// SupportedLanguage language = (SupportedLanguage)Enum.Parse(typeof(SupportedLanguage), this.cmbLanguage.SelectedItem.ToString(), true);
// using (var parser = ParserFactory.CreateParser(language, new StringReader(this.codeEditor.Document.Text))) {
// parser.ParseExpression();
// if (parser.Errors.Count > 0) {
// MessageService.ShowError(parser.Errors.ErrorOutput);
// return false;
// }
// }
//
return true;
}

68
src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs
Unescape View File

@ -12,17 +12,16 @@ using System.Text; @@ -12,17 +12,16 @@ using System.Text;
using System.Windows.Forms;
using Debugger;
using Debugger.AddIn.Tooltips;
using Debugger.AddIn;
using Debugger.AddIn.TreeModel;
using Debugger.Interop.CorPublish;
using Debugger.MetaData;
using ICSharpCode.Core;
using ICSharpCode.Core.WinForms;
using ICSharpCode.NRefactory;
using ICSharpCode.NRefactory.Ast;
using ICSharpCode.NRefactory.Visitors;
using ICSharpCode.SharpDevelop.Bookmarks;
using ICSharpCode.SharpDevelop.Debugging;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Gui.OptionPanels;
using ICSharpCode.SharpDevelop.Project;
@ -350,25 +349,12 @@ namespace ICSharpCode.SharpDevelop.Services @@ -350,25 +349,12 @@ namespace ICSharpCode.SharpDevelop.Services
/// </summary>
public Value GetValueFromName(string variableName)
{
if (CurrentStackFrame != null) {
object data = debuggerDecompilerService.GetLocalVariableIndex(CurrentStackFrame.MethodInfo.DeclaringType.MetadataToken, CurrentStackFrame.MethodInfo.MetadataToken, variableName);
return ExpressionEvaluator.Evaluate(variableName, SupportedLanguage.CSharp, CurrentStackFrame, data);
}
#warning if (CurrentStackFrame != null) {
// object data = debuggerDecompilerService.GetLocalVariableIndex(CurrentStackFrame.MethodInfo.DeclaringType.MetadataToken, CurrentStackFrame.MethodInfo.MetadataToken, variableName);
// return ExpressionEvaluator.Evaluate(variableName, SupportedLanguage.CSharp, CurrentStackFrame, data);
// }
return null;
}
/// <summary>
/// Gets Expression for given variable. Can throw GetValueException.
/// <exception cref="GetValueException">Thrown when getting expression fails. Exception message explains reason.</exception>
/// </summary>
public Expression GetExpression(string variableName)
{
if (CurrentStackFrame != null) {
return ExpressionEvaluator.ParseExpression(variableName, SupportedLanguage.CSharp);
} else {
throw new GetValueException("Cannot evaluate now - debugged process is either null or running or has no selected stack frame");
}
}
public bool IsManaged(int processId)
{
@ -397,31 +383,6 @@ namespace ICSharpCode.SharpDevelop.Services @@ -397,31 +383,6 @@ namespace ICSharpCode.SharpDevelop.Services
}
}
/// <summary>
/// Gets the tooltip control that shows the value of given variable.
/// Return null if no tooltip is available.
/// </summary>
public object GetTooltipControl(Location logicalPosition, string variableName)
{
try {
var tooltipExpression = GetExpression(variableName);
var valueNode = new ValueNode("Icons.16x16.Local", variableName, () => tooltipExpression.Evaluate());
return new DebuggerTooltipControl(new TreeNode[] { valueNode });
} catch (System.Exception ex) {
LoggingService.Error("Error on GetTooltipControl: " + ex.Message);
return null;
}
}
public Debugger.AddIn.TreeModel.TreeNode GetNode(string variable, string currentImageName = null)
{
try {
return new ValueNode(currentImageName ?? "Icons.16x16.Local", variable, () => GetExpression(variable).Evaluate());
} catch (GetValueException) {
return null;
}
}
public bool SetInstructionPointer(string filename, int line, int column, bool dryRun)
{
if (CurrentStackFrame != null) {
@ -539,12 +500,12 @@ namespace ICSharpCode.SharpDevelop.Services @@ -539,12 +500,12 @@ namespace ICSharpCode.SharpDevelop.Services
bool Evaluate(string code, string language)
{
try {
SupportedLanguage supportedLanguage = (SupportedLanguage)Enum.Parse(typeof(SupportedLanguage), language, true);
Value val = ExpressionEvaluator.Evaluate(code, supportedLanguage, CurrentStackFrame);
if (val != null && val.Type.IsPrimitive && val.PrimitiveValue is bool)
return (bool)val.PrimitiveValue;
else
#warning SupportedLanguage supportedLanguage = (SupportedLanguage)Enum.Parse(typeof(SupportedLanguage), language, true);
// Value val = ExpressionEvaluator.Evaluate(code, supportedLanguage, CurrentStackFrame);
//
// if (val != null && val.Type.IsPrimitive && val.PrimitiveValue is bool)
// return (bool)val.PrimitiveValue;
// else
return false;
} catch (GetValueException e) {
string errorMessage = "Error while evaluating breakpoint condition " + code + ":\n" + e.Message + "\n";
@ -781,5 +742,10 @@ namespace ICSharpCode.SharpDevelop.Services @@ -781,5 +742,10 @@ namespace ICSharpCode.SharpDevelop.Services
.Where(p => e.Module.Name.IndexOf(p.Name) >= 0)
.ForEach(p => e.Module.LoadSymbolsFromDisk(new []{ Path.GetDirectoryName(p.OutputAssemblyFullPath) }));
}
public void HandleToolTipRequest(ToolTipRequestEventArgs e)
{
// throw new NotImplementedException();
}
}
}

2
src/AddIns/Debugger/Debugger.AddIn/TreeModel/TreeNode.cs
Unescape View File

@ -90,7 +90,7 @@ namespace Debugger.AddIn.TreeModel @@ -90,7 +90,7 @@ namespace Debugger.AddIn.TreeModel
get { return GetChildren != null; }
}
public IEnumerable<IVisualizerCommand> VisualizerCommands { get; protected set; }
// public IEnumerable<IVisualizerCommand> VisualizerCommands { get; protected set; }
public bool HasVisualizerCommands { get; protected set; }

1
src/AddIns/Debugger/Debugger.AddIn/TreeModel/Utils.cs
Unescape View File

@ -9,7 +9,6 @@ using System.Windows.Threading; @@ -9,7 +9,6 @@ using System.Windows.Threading;
using Debugger.AddIn.Pads.Controls;
using ICSharpCode.Core;
using ICSharpCode.NRefactory.Ast;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Services;

33
src/AddIns/Debugger/Debugger.AddIn/TreeModel/ValueNode.cs
Unescape View File

@ -12,8 +12,8 @@ using System.Reflection; @@ -12,8 +12,8 @@ using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;
using System.Windows.Forms;
using Debugger.AddIn.Visualizers;
using Debugger.AddIn.Visualizers.Utils;
//using Debugger.AddIn.Visualizers;
//using Debugger.AddIn.Visualizers.Utils;
using Debugger.MetaData;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Debugging;
@ -162,10 +162,10 @@ namespace Debugger.AddIn.TreeModel @@ -162,10 +162,10 @@ namespace Debugger.AddIn.TreeModel
this.Type = val.Type.Name;
if (!val.IsNull) {
this.VisualizerCommands = VisualizerDescriptors.GetAllDescriptors()
.Where(descriptor => descriptor.IsVisualizerAvailable(val.Type))
.Select(descriptor => descriptor.CreateVisualizerCommand(this.Name, this.GetValue))
.ToList();
#warning this.VisualizerCommands = VisualizerDescriptors.GetAllDescriptors()
// .Where(descriptor => descriptor.IsVisualizerAvailable(val.Type))
// .Select(descriptor => descriptor.CreateVisualizerCommand(this.Name, this.GetValue))
// .ToList();
}
LoggingService.InfoFormatted("Evaluated node '{0}' in {1} ms", this.Name, watch.ElapsedMilliseconds);
@ -175,7 +175,7 @@ namespace Debugger.AddIn.TreeModel @@ -175,7 +175,7 @@ namespace Debugger.AddIn.TreeModel
this.Value = e.Message;
this.Type = string.Empty;
this.GetChildren = null;
this.VisualizerCommands = null;
#warning this.VisualizerCommands = null;
return;
}
}
@ -348,15 +348,16 @@ namespace Debugger.AddIn.TreeModel @@ -348,15 +348,16 @@ namespace Debugger.AddIn.TreeModel
);
} else {
DebugType iEnumerableType, itemType;
if (shownType.ResolveIEnumerableImplementation(out iEnumerableType, out itemType)) {
yield return new TreeNode(
null,
"IEnumerable",
"Expanding will enumerate the IEnumerable",
string.Empty,
() => GetIListChildren(() => DebuggerHelpers.CreateListFromIEnumerable(GetValue()))
);
}
#warning reimplement this!
// if (shownType.ResolveIEnumerableImplementation(out iEnumerableType, out itemType)) {
// yield return new TreeNode(
// null,
// "IEnumerable",
// "Expanding will enumerate the IEnumerable",
// string.Empty,
// () => GetIListChildren(() => DebuggerHelpers.CreateListFromIEnumerable(GetValue()))
// );
// }
}
foreach(TreeNode node in GetMembers(publicInstance)) {

2
src/AddIns/DisplayBindings/IconEditor/IconEditor/IconEditor.csproj
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<OutputType>Library</OutputType>
<RootNamespace>IconEditor</RootNamespace>
<AssemblyName>IconEditor</AssemblyName>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

Write Preview
Loading…
Cancel
Save