This commit is contained in:
Matthias Heil
2026-04-02 10:09:10 +02:00
parent 4623740937
commit 48e2f108a8
14 changed files with 172 additions and 104 deletions
@@ -0,0 +1,74 @@
// Decompiled with JetBrains decompiler
// Type: Microsoft.VisualStudio.DebuggerVisualizers.ExtensionProviders.IEnumerableVisualizerProvider
// Assembly: Microsoft.VisualStudio.DebuggerVisualizers.ExtensionProviders, Version=18.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
// MVID: 98A3FADF-73D8-4308-9C72-EE68F73E4141
// Assembly location: C:\Program Files\Microsoft Visual Studio\18\Professional\Common7\IDE\CommonExtensions\Platform\Debugger\Visualizers\Microsoft.VisualStudio.DebuggerVisualizers.ExtensionProviders.dll
using Microsoft.Internal.VisualStudio.Shell.Interop;
using Microsoft.VisualStudio.Debugger.IEnumerableVisualizer;
using Microsoft.VisualStudio.Debugger.TabularDataUIShared.WPF;
using Microsoft.VisualStudio.Extensibility;
using Microsoft.VisualStudio.Extensibility.DebuggerVisualizers;
using Microsoft.VisualStudio.Extensibility.VSSdkCompatibility;
using Microsoft.VisualStudio.RpcContracts.DebuggerVisualizers;
using Microsoft.VisualStudio.RpcContracts.RemoteUI;
using Microsoft.VisualStudio.Shell;
using Microsoft.VisualStudio.Shell.Interop;
using System;
using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
#nullable enable
namespace Microsoft.VisualStudio.DebuggerVisualizers.ExtensionProviders;
[VisualStudioContribution]
internal class IEnumerableVisualizerProvider : DebuggerVisualizerProvider
{
public IEnumerableVisualizerProvider(
VisualStudioExtensibility extensibility,
TraceSource traceSource)
{
}
public virtual DebuggerVisualizerProviderConfiguration DebuggerVisualizerProviderConfiguration
{
get
{
return new DebuggerVisualizerProviderConfiguration("%IEnumerableVisualizer.DisplayName%", "System.Collections.Generic.IEnumerable`1, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")
{
VisualizerObjectSourceType = new VisualizerObjectSourceType(typeof (IEnumerableVisualizerSource)),
Style = (VisualizerStyle) 1
};
}
}
public virtual async Task<IRemoteUserControl> CreateVisualizerAsync(
VisualizerTarget visualizerTarget,
CancellationToken cancellationToken)
{
IEnumerableViewModel viewModel = new IEnumerableViewModel(visualizerTarget.ObjectSource, visualizerTarget.OriginalVisualizedExpression, VsTaskLibraryHelper.WithPriority(ThreadHelper.JoinableTaskFactory, (VsTaskRunContext) 6));
visualizerTarget.VisualizedExpressionChanged += new Func<string, Task>(((TabularDataViewModel) viewModel).VisualizerTarget_VisualizedExpressionChangedAsync);
visualizerTarget.Changed += new Func<VisualizerTargetStateNotification, Task>(((TabularDataViewModel) viewModel).VisualizerTarget_StateChangedAsync);
await viewModel.InitializeAsync();
await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(new CancellationToken());
IVsDebugger debugger = await ServiceExtensions.GetServiceAsync<IVsDebugger, IVsDebugger>(AsyncServiceProvider.GlobalProvider, cancellationToken);
bool flag = (await ServiceExtensions.GetServiceAsync<SVsFeatureFlags, IVsFeatureFlags>(AsyncServiceProvider.GlobalProvider, cancellationToken)).IsFeatureEnabled("Debugger.EnableVisualizerDataTips", true);
IEnumerableVisualizerControl visualizerControl1 = new IEnumerableVisualizerControl();
visualizerControl1.DataContext = (object) viewModel;
visualizerControl1.Debugger = debugger;
visualizerControl1.AreDataTipsEnabled = flag;
IEnumerableVisualizerControl visualizerControl2 = visualizerControl1;
viewModel.ViewHelper = (IViewHelper) visualizerControl2;
IRemoteUserControl visualizerAsync = (IRemoteUserControl) new WpfControlWrapper((FrameworkElement) visualizerControl2);
viewModel = (IEnumerableViewModel) null;
debugger = (IVsDebugger) null;
return visualizerAsync;
}
protected virtual Task InitializeAsync(CancellationToken cancellationToken)
{
return ((ExtensionPart) this).InitializeAsync(cancellationToken);
}
}
@@ -0,0 +1,69 @@
// Decompiled with JetBrains decompiler
// Type: Microsoft.VisualStudio.Debugger.IEnumerableVisualizer.IEnumerableVisualizerSource
// Assembly: IEnumerableVisualizer.DebuggeeSide, Version=18.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
// MVID: CFD2027C-E4DB-4399-B4DA-641D6C32082D
// Assembly location: C:\Program Files\Microsoft Visual Studio\18\Professional\Common7\IDE\CommonExtensions\Platform\Debugger\Visualizers\net2.0\IEnumerableVisualizer.DebuggeeSide.dll
using Microsoft.VisualStudio.DebuggerVisualizers;
using System;
using System.Collections.Generic;
using System.IO;
namespace Microsoft.VisualStudio.Debugger.IEnumerableVisualizer;
public class IEnumerableVisualizerSource : VisualizerObjectSource
{
private static readonly Dictionary<object, IEnumerableObjectHandler> DataObjectHandlerDictionary = new Dictionary<object, IEnumerableObjectHandler>();
private static IEnumerableObjectHandler CurrentObjectHandler = (IEnumerableObjectHandler)null;
public static object GetObjectAt(int tableIndex, int rowIndex, int columnIndex)
{
return CurrentObjectHandler?.GetObjectAt(tableIndex, rowIndex, columnIndex) ?? (object)null;
}
public virtual void TransferData(object obj, Stream fromVisualizer, Stream toVisualizer)
{
IEnumerableObjectHandler dataObjectHandler;
if (DataObjectHandlerDictionary.ContainsKey(obj))
{
dataObjectHandler = DataObjectHandlerDictionary[obj];
dataObjectHandler.Refresh();
}
else
{
dataObjectHandler = CreateDataObjectHandler(obj);
DataObjectHandlerDictionary[obj] = dataObjectHandler;
}
CurrentObjectHandler = dataObjectHandler;
fromVisualizer.Seek(0L, SeekOrigin.Begin);
IDeserializableObject deserializableObject = VisualizerObjectSource.GetDeserializableObject(fromVisualizer);
Type type = (Type)null;
if (!deserializableObject.IsBinaryFormat)
{
string stringPropertyValue = deserializableObject.GetJsonStringPropertyValue("TypeName");
if (!Utils.SupportedCommands.TryGetValue(stringPropertyValue, out type))
throw new ArgumentException($"Unknown Command: {stringPropertyValue}. Cannot send command to debuggee-side visualizer.");
}
ICommunicatorCommand communicatorCommand = (ICommunicatorCommand)deserializableObject.ToObject(type);
if (communicatorCommand.TypeName.Equals("GetTableListCommand", StringComparison.InvariantCulture))
dataObjectHandler.InitializeDataSource();
SendResult(communicatorCommand.HandleCommand(dataObjectHandler), toVisualizer);
}
private IEnumerableObjectHandler CreateDataObjectHandler(object obj)
{
return new IEnumerableObjectHandler(obj);
}
public virtual object CreateReplacementObject(object obj, Stream serializedObject)
{
throw new NotSupportedException();
}
public virtual void GetData(object obj, Stream dataStream) => throw new NotSupportedException();
private void SendResult(CommunicatorResult result, Stream toVisualizer)
{
VisualizerObjectSource.Serialize(toVisualizer, (object)result);
}
}
@@ -1,7 +1,7 @@
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.VisualStudio.Extensibility; using Microsoft.VisualStudio.Extensibility;
namespace Vector3Visualizer namespace NrxDebugVisualizer
{ {
/// <summary> /// <summary>
/// Extension entrypoint for the VisualStudio.Extensibility extension. /// Extension entrypoint for the VisualStudio.Extensibility extension.
@@ -14,7 +14,7 @@
<PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.14.40608" PrivateAssets="all" /> <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.14.40608" PrivateAssets="all" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net8.0-windows8.0\Vector3VisualizerSource.dll" Link="netstandard2.0\Vector3VisualizerSource.dll" CopyToOutputDirectory="PreserveNewest" /> <Content Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net8.0-windows8.0\NrxVisualizerObjectSource.dll" Link="netstandard2.0\NrxVisualizerObjectSource.dll" CopyToOutputDirectory="PreserveNewest" />
<Content Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net8.0-windows8.0\NamedPipes.dll" Link="netstandard2.0\NamedPipes.dll" CopyToOutputDirectory="PreserveNewest" /> <Content Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net8.0-windows8.0\NamedPipes.dll" Link="netstandard2.0\NamedPipes.dll" CopyToOutputDirectory="PreserveNewest" />
<Content Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net8.0-windows8.0\PipeMethodCalls.dll" Link="netstandard2.0\PipeMethodCalls.dll" CopyToOutputDirectory="PreserveNewest" /> <Content Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net8.0-windows8.0\PipeMethodCalls.dll" Link="netstandard2.0\PipeMethodCalls.dll" CopyToOutputDirectory="PreserveNewest" />
<Content Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net8.0-windows8.0\MessagePack.dll" Link="netstandard2.0\MessagePack.dll" CopyToOutputDirectory="PreserveNewest" /> <Content Include="$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net8.0-windows8.0\MessagePack.dll" Link="netstandard2.0\MessagePack.dll" CopyToOutputDirectory="PreserveNewest" />
@@ -25,6 +25,6 @@
<EmbeddedResource Include="Vector3VisualizerUserControl.xaml" /> <EmbeddedResource Include="Vector3VisualizerUserControl.xaml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Vector3VisualizerSource\Vector3VisualizerSource.csproj" /> <ProjectReference Include="..\NrxVisualizerObjectSource\NrxVisualizerObjectSource.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>
@@ -2,19 +2,16 @@
using Microsoft.VisualStudio.Extensibility.DebuggerVisualizers; using Microsoft.VisualStudio.Extensibility.DebuggerVisualizers;
using Microsoft.VisualStudio.RpcContracts.RemoteUI; using Microsoft.VisualStudio.RpcContracts.RemoteUI;
using NamedPipes; using NamedPipes;
using NrxVisualizerObjectSource;
using System; using System;
using System.Collections;
using System.Collections.Generic;
using System.Numerics; using System.Numerics;
using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Vector3VisualizerSource;
namespace Vector3Visualizer; namespace NrxDebugVisualizer;
[VisualStudioContribution] [VisualStudioContribution]
internal sealed class Vector3DebuggerVisualizerProvider : DebuggerVisualizerProvider internal sealed class NrxDebuggerVisualizerProvider : DebuggerVisualizerProvider
{ {
public override DebuggerVisualizerProviderConfiguration DebuggerVisualizerProviderConfiguration => new( public override DebuggerVisualizerProviderConfiguration DebuggerVisualizerProviderConfiguration => new(
@@ -25,7 +22,7 @@ internal sealed class Vector3DebuggerVisualizerProvider : DebuggerVisualizerProv
new VisualizerTargetType("%NrxIEnumerableVisualizer_DisplayName%", @"System.Collections.Generic.IEnumerable`1, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"), new VisualizerTargetType("%NrxIEnumerableVisualizer_DisplayName%", @"System.Collections.Generic.IEnumerable`1, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"),
]) ])
{ {
VisualizerObjectSourceType = new VisualizerObjectSourceType(typeof(Vector3ObjectSource)), VisualizerObjectSourceType = new VisualizerObjectSourceType(typeof(NrxVisualizerObjectSource.NrxVisualizerObjectSource)),
Style = VisualizerStyle.ToolWindow, Style = VisualizerStyle.ToolWindow,
}; };
private static NamedPipeClient? PipeClient { get; set; } private static NamedPipeClient? PipeClient { get; set; }
@@ -39,8 +36,8 @@ internal sealed class Vector3DebuggerVisualizerProvider : DebuggerVisualizerProv
{ {
Vector3Model? model = await visualizerTarget.ObjectSource.RequestDataAsync<Vector3Model?>(jsonSerializer: null, cancellationToken); Vector3Model? model = await visualizerTarget.ObjectSource.RequestDataAsync<Vector3Model?>(jsonSerializer: null, cancellationToken);
SendToVisualizer(model); SendToVisualizer(model);
//throw new InvalidOperationException("This is a test exception to demonstrate the visualizer. Please remove this line and implement the visualizer logic.");
var control = new Vector3VisualizerUserControl(dataContext: model); var control = new Vector3VisualizerUserControl(dataContext: model);
return await Task.FromResult<IRemoteUserControl>(control); return await Task.FromResult<IRemoteUserControl>(control);
//return await Task.FromResult<IRemoteUserControl>(new MyRemoteUserControl(model));
} }
} }
@@ -1,7 +1,7 @@
using Vector3VisualizerSource; using Microsoft.VisualStudio.Extensibility.UI;
using Microsoft.VisualStudio.Extensibility.UI; using NrxVisualizerObjectSource;
namespace Vector3Visualizer; namespace NrxDebugVisualizer;
internal sealed class Vector3VisualizerUserControl : RemoteUserControl internal sealed class Vector3VisualizerUserControl : RemoteUserControl
{ {
@@ -1,16 +1,14 @@
using Microsoft.VisualStudio.DebuggerVisualizers; using Microsoft.VisualStudio.DebuggerVisualizers;
using NamedPipes;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Numerics; using System.Numerics;
namespace Vector3VisualizerSource; namespace NrxVisualizerObjectSource;
public class Vector3ObjectSource : VisualizerObjectSource public class NrxVisualizerObjectSource : VisualizerObjectSource
{ {
public Vector3ObjectSource() public NrxVisualizerObjectSource()
{ {
Debug.WriteLine("new Vector3ObjectSource"); Debug.WriteLine("new Vector3ObjectSource");
} }
@@ -32,4 +30,12 @@ public class Vector3ObjectSource : VisualizerObjectSource
} }
SerializeAsJson(outgoingData, vector3Model); SerializeAsJson(outgoingData, vector3Model);
} }
public override object CreateReplacementObject(object target, Stream incomingData)
{
return base.CreateReplacementObject(target, incomingData);
}
public override void TransferData(object target, Stream incomingData, Stream outgoingData)
{
base.TransferData(target, incomingData, outgoingData);
}
} }
@@ -1,6 +1,6 @@
using System.Numerics; using System.Numerics;
using System.Runtime.Serialization; using System.Runtime.Serialization;
namespace Vector3VisualizerSource; namespace NrxVisualizerObjectSource;
[DataContract] [DataContract]
public class Vector3Model public class Vector3Model
-80
View File
@@ -1,80 +0,0 @@
using Microsoft.VisualStudio.RpcContracts.RemoteUI;
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Vector3VisualizerSource;
namespace Vector3Visualizer;
public class MyRemoteUserControl : IRemoteWpfUserControl, IRemoteProxiedUserControl, IRemoteUserControl, IDisposable, IRemoteProxiedUserControl2
{
public Vector3Model? Model { get; }
public MyRemoteUserControl(Vector3Model? model) => Model = model;
private bool disposedValue;
protected virtual void Dispose(bool disposing)
{
if (!disposedValue)
{
if (disposing)
{
// TODO: dispose managed state (managed objects)
}
// TODO: free unmanaged resources (unmanaged objects) and override finalizer
// TODO: set large fields to null
disposedValue = true;
}
}
// // TODO: override finalizer only if 'Dispose(bool disposing)' has code to free unmanaged resources
// ~MyRemoteUserControl()
// {
// // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
// Dispose(disposing: false);
// }
void IDisposable.Dispose()
{
// Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
Dispose(disposing: true);
GC.SuppressFinalize(this);
}
Task<RemoteWpfUserControlDefinition> IRemoteWpfUserControl.InitializeAsync(IRemoteProxiedUserControlClient remoteUserControlClient, CancellationToken cancellationToken)
{
return Task.FromResult(new RemoteWpfUserControlDefinition());
}
Task IRemoteWpfUserControl.ControlLoadedAsync(CancellationToken cancellationToken)
{
return Task.CompletedTask;
}
Task<bool> IRemoteProxiedUserControl.GetObjectAsync(ObjectId id, CancellationToken cancellationToken)
{
return Task.FromResult(false);
}
Task<bool> IRemoteProxiedUserControl.SetObjectPropertyAsync(ObjectId id, string propertyName, MessagePackFragment value, CancellationToken cancellationToken)
{
return Task.FromResult(false);
}
Task<bool> IRemoteProxiedUserControl.SetCollectionEntryAsync(ObjectId id, int index, MessagePackFragment value, ObjectVersion? version, CancellationToken cancellationToken)
{
return Task.FromResult(false);
}
Task<bool> IRemoteProxiedUserControl.InvokeAsync(ObjectId id, MessagePackFragment parameter, CancellationToken cancellationToken)
{
return Task.FromResult(false);
}
Task<bool> IRemoteProxiedUserControl2.InvokeAsync(ObjectId id, MessagePackFragment parameter, IReadOnlyDictionary<string, string> context, CancellationToken cancellationToken)
{
return Task.FromResult(false);
}
}
+1 -1
View File
@@ -6,7 +6,7 @@ var typeName = a.GetType().AssemblyQualifiedName;
var b = new Vector3(5, 6, 7); var b = new Vector3(5, 6, 7);
Vector3[] v3Array = [a, b]; Vector3[] v3Array = [a, b];
List<Vector3> v3List = v3Array.ToList(); List<Vector3> v3List = [.. v3Array];
var quaternion = new Quaternion(1,2,3,4); var quaternion = new Quaternion(1,2,3,4);
return; return;
+4 -2
View File
@@ -7,6 +7,8 @@
<Project Path="TestServer/TestServer.csproj" Id="c81154ef-d854-4f1e-9d14-2cf674885291" /> <Project Path="TestServer/TestServer.csproj" Id="c81154ef-d854-4f1e-9d14-2cf674885291" />
<Project Path="Vector3VisualizerTest/Vector3VisualizerTest.csproj" /> <Project Path="Vector3VisualizerTest/Vector3VisualizerTest.csproj" />
</Folder> </Folder>
<Project Path="Vector3Visualizer/Vector3Visualizer.csproj" /> <Project Path="NrxDebuggerVisualizerProvider/NrxDebugVisualizer.csproj">
<Project Path="Vector3VisualizerSource/Vector3VisualizerSource.csproj" /> <Deploy />
</Project>
<Project Path="NrxVisualizerObjectSource/NrxVisualizerObjectSource.csproj" />
</Solution> </Solution>