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

[EnC] Store entire spans instead of line deltas #58831

Merged
merged 4 commits into from
Jan 21, 2022

Conversation

davidwengier
Copy link
Contributor

Fixes #58179

Bit noisy with the renames, but pretty straightforward over all. Commit by commit might help, but probably won't make a huge difference.

Storing the entire span instead of calculating the line delta gives more accurate results where more than just line delta is needed.
We instead now calculate the line delta when we need to provide it to the debugger.
Responding to the rename, and the change in debugger display, used for test verification.
Just cleaning things up
Copy link
Contributor

@ryzngard ryzngard left a comment

Choose a reason for hiding this comment

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

I think this looks correct, in as much as I understand EnC code.

@davidwengier
Copy link
Contributor Author

I think this looks correct, in as much as I understand EnC code.

You and me both. The only EnC understanding here is knowing what the fix is, and that was provided by @tmat 😛

@davidwengier
Copy link
Contributor Author

Ping @tmat

@tmat
Copy link
Member

tmat commented Jan 20, 2022

Looks good, though I think the new test is a bit hard to read. BaseActiveStatementsAndExceptionRegions_WithInitialNonRemappableRegions is similar but using some markers to make it easier to express the edit.

@davidwengier davidwengier merged commit c05463a into dotnet:main Jan 21, 2022
@davidwengier davidwengier deleted the ActiveStatementsLineDelta branch January 21, 2022 05:38
@ghost ghost added this to the Next milestone Jan 21, 2022
333fred added a commit to 333fred/roslyn that referenced this pull request Jan 21, 2022
* upstream/main: (1035 commits)
  Add missing header
  Mark IVSTypeScriptFormattingServiceImplementation as optional, but require it in the constructor
  Fix Go To Base for a symbol with a single metadata location (dotnet#58965)
  [EnC] Store entire spans instead of line deltas (dotnet#58831)
  Delete CodeAnalysisRules.ruleset (dotnet#58968)
  Allow xml docs to still be created when 'emit metadata only' is on. (dotnet#57667)
  Fix ParseVBErrorOrWarning (dotnet#47833)
  Update parameter nullability to match implementation
  Ensure CSharpUseParameterNullCheckingDiagnosticAnalyzer works with nullable parameters
  Add tests for issues fixed by previous PR (dotnet#58764)
  Update src/Features/CSharp/Portable/Completion/CompletionProviders/ExplicitInterfaceMemberCompletionProvider.CompletionSymbolDisplay.cs
  Disallow null checking discard parameters (dotnet#58952)
  Add extension method
  Escape type arguments
  Few fixes
  Update tests.
  Add Analyzers layer to CODEOWNERS
  Add formatting analyzer test for param nullchecking (dotnet#58936)
  Move reading HideAdvancedMembers option up (dotnet#58747)
  List patterns: Slice value is assumed to be never null (dotnet#57457)
  ...
@RikkiGibson RikkiGibson modified the milestones: Next, 17.2.P1 Feb 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

EnC: Multi-line active statement span not calculated properly
4 participants