Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for 'primary header spans' in sticky-scroll. #68450

Merged
merged 20 commits into from
Jun 8, 2023

Conversation

CyrusNajmabadi
Copy link
Member

Looks like this:

image

Specifically, prior to this change, the if (true) part is gone, and you'd only see:

image

This work was done by populating a new PrimaryHeaderSpan property on IStructureTag so that the block for the else span can state that it is associated with the if span.

@CyrusNajmabadi CyrusNajmabadi requested review from a team as code owners June 5, 2023 22:53
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead labels Jun 5, 2023
@@ -110,8 +110,8 @@
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftIdentityModelClientsActiveDirectoryVersion>3.13.8</MicrosoftIdentityModelClientsActiveDirectoryVersion>
<MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>15.8.27812-alpha</MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>
<MicrosoftInternalVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioInteropVersion>
<MicrosoftInternalVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioShellFrameworkVersion>
<MicrosoftInternalVisualStudioInteropVersion>17.7.35005-preview.1</MicrosoftInternalVisualStudioInteropVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

set MicrosoftVisualStudioShellPackagesVersion to 17.7.35005-preview.1 instead

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.

@CyrusNajmabadi CyrusNajmabadi requested a review from genlu June 6, 2023 16:31
@CyrusNajmabadi
Copy link
Member Author

@genlu ptal.

@jaredpar jaredpar requested a review from a team as a code owner June 7, 2023 23:02
internal abstract partial class AbstractStructureTaggerProvider :
AsynchronousTaggerProvider<IStructureTag>
#pragma warning disable CS0618 // Type or member is obsolete
internal abstract partial class AbstractStructureTaggerProvider : AsynchronousTaggerProvider<IStructureTag2>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like IStructureTag2 is no longer experimental, wonder if we could use a newer editor package to avoid the suppression
https://devdiv.visualstudio.com/DevDiv/_git/VS-Platform?path=/src/Editor/Text/Def/TextUI/Tags/IStructureTag2.cs

Copy link
Member

@genlu genlu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@CyrusNajmabadi CyrusNajmabadi merged commit 087a317 into dotnet:main Jun 8, 2023
27 checks passed
@ghost ghost added this to the Next milestone Jun 8, 2023
@CyrusNajmabadi CyrusNajmabadi deleted the structureTag3 branch June 8, 2023 21:32
@RikkiGibson RikkiGibson modified the milestones: Next, 17.7 P3 Jun 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants