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.

Sign up for GitHub

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

Jump to bottom

Update inline rename code following completion of TypeScript external access work #43634

Merged
merged 6 commits into from
Apr 27, 2020
Merged

Update inline rename code following completion of TypeScript external access work #43634

merged 6 commits into from
Apr 27, 2020

Conversation

allisonchou
Copy link
Contributor

@allisonchou allisonchou commented Apr 24, 2020 •
edited
Loading

TypeScript recently moved inline rename to the external access API.
This PR is a follow-up that accomplishes the following:

  1. Moves DefinitionLocations property from IInlineRenameInfoWithFileRename to IInlineRenameInfo: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1077984/
  2. Adds a new parameter "triggerText" to GetConflictEditSpan() and GetReferenceEditSpan() so that we can do more work asynchronously: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1080161/

@allisonchou allisonchou requested review from a team as code owners April 24, 2020 07:58
@allisonchou allisonchou merged commit 3ae0f79 into dotnet:master Apr 27, 2020
@ghost ghost added this to the Next milestone Apr 27, 2020
@sharwell sharwell modified the milestones: Next, temp, 16.7.P1 Apr 28, 2020
@genlu
Copy link
Member

genlu commented Apr 28, 2020

This change break XAML.
https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_git/VS/pullrequest/245253

Q:\cmd\1w\src\Xaml\Designer\Source\XamlLanguageService\CodeAnalysis\Features\InlineRename\XamlRenameInfoService.cs(119,40): error CS0535: 'XamlRenameInfoService.XamlRenameInfo' does not implement interface member 'IXamlRenameInfo.DefinitionLocations'
Q:\cmd\1w\src\Xaml\Designer\Source\XamlLanguageService\CodeAnalysis\Features\InlineRename\XamlRenameInfoService.cs(177,43): error CS0535: 'XamlRenameInfoService.FailureRenameInfo' does not implement interface member 'IXamlRenameInfo.DefinitionLocations'

Need to revert to unblock insertion, and later make a dual insertion with updated XAML bits. FYI @agocke @vatsalyaagrawal

@genlu genlu mentioned this pull request Apr 28, 2020
Closed
genlu added a commit to genlu/roslyn that referenced this pull request Apr 28, 2020
@genlu
Revert "Merge pull request dotnet#43634 from allisonchou/IVTInterface…
85049c5 
…DeclarationsTSRename"

This reverts commit 3ae0f79, reversing
changes made to a2ec364.
@allisonchou allisonchou mentioned this pull request Apr 29, 2020
Merged
genlu added a commit that referenced this pull request Apr 29, 2020
@genlu
Merge pull request #43764 from genlu/revert43634
0c0f167 
Revert "Merge pull request #43634 from allisonchou/IVTInterfaceDeclar…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dibarbet dibarbet dibarbet approved these changes

Assignees
No one assigned
Labels
Area-IDE
Projects
None yet
Milestone
16.7.P1
Development

Successfully merging this pull request may close these issues.
4 participants
@allisonchou @genlu @dibarbet @sharwell