Enable text-selection in assembly views#55
Merged
Austin-Lamb merged 5 commits intoJul 14, 2026
Conversation
Merge microsoft/SizeBench main branch. Resolve conflicts: - Adopt central package management (Directory.Packages.props) - Keep DiffPlex (core) instead of DiffPlex.Wpf for FlowDocument diff viewer - Take upstream's static method and range operator fixes (matching our changes) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jonwis
force-pushed
the
agents/enable-text-selection-diff-viewer
branch
from
June 2, 2026 22:39
ff5c491 to
5ad3cfe
Compare
jonwis
added a commit
to jonwis/SizeBench
that referenced
this pull request
Jun 11, 2026
Collaborator
|
I've finally gotten the pipeline clean and am trying this one locally - I see that it results in line wrapping that feels like it degrades the ability to scroll the code, so I'm going to try to tweak that to keep it from wrapping. |
…o elements in it - a gutter with line numbers as well as the FlowDocument with the disassembly text lines. This way we don't lose the line numbers that DiffPlex.Wpf had, and they also still remain out of the text when copying.
Austin-Lamb
approved these changes
Jul 14, 2026
jonwis
added a commit
to jonwis/SizeBench
that referenced
this pull request
Jul 14, 2026
Brings PR microsoft#56 up to date with main (microsoft#55, microsoft#57, microsoft#58 incl. the DIA update and net8->net10 upgrade). Conflict resolutions: - DIAAdapter: keep the loadFromSource delegate (symbol-server path) but route the PDB path through main's new prefetching loadDataFromPdbEx on IDiaDataSourceEx2. - msdia140.dll: keep main's updated checked-in binary (needed for IDiaDataSourceEx2) and layer PR microsoft#56's symsrv.dll drop on top for symbol-server support. - Directory.Packages.props / GUI.csproj: union of both sides, newer versions win. - IDE0031: use C# 14 null-conditional assignment for _appSettings?.UseSymbolServer.
jonwis
added a commit
to jonwis/SizeBench
that referenced
this pull request
Jul 14, 2026
Bring the disassembly zoom / selectable-diff QoL branch up to date with main's .NET 10 upgrade and microsoft#55's new SelectableDiffViewer control. Conflict resolutions: - TwoStringsToDiffViewerUIConverter: return main's SelectableDiffViewer but keep PR microsoft#54's zoom-percent parsing (values[2]), passing it through a new SelectableDiffViewer(oldText, newText, zoomPercent) overload. - SelectableDiffViewer: honor zoomPercent by scaling the effective font size everywhere DiffFontSize was used; expose EffectiveFontSize for unit testing. - Test files: adopt main's modern MSTest 4 assertions (ThrowsExactly, AreSequenceEqual) while preserving PR microsoft#54's FilteredSymbolDiffs coverage and the zoom font-size test. Full solution test suite: 1,110 passed / 0 failed. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: dfd40c62-1c34-4d1e-affc-7c9177d684bf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why is this change being made?
Selecting arbitrary text from assembly views is super useful when trying to find where the changes come from.
Briefly summarize what changed
Replaced the built-in DiffView.Wpf control with a FlowDocument built from the same diff'd content. Same UI, now with sub-line selection.
Also fixed a number of static analysis warnings.
How was the change tested?
PR Checklist