Fix detection of nested symbols in Document Outline #68107
Merged
Conversation
This file contains 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
dotnet-issue-labeler
bot
added
Area-IDE
untriaged
sharwell
commented
May 4, 2023
| { | ||
| var parentRange = ProtocolConversions.RangeToLinePositionSpan(parent.Range); | ||
| var childRange = ProtocolConversions.RangeToLinePositionSpan(child.Range); | ||
| return childRange.Start > parentRange.Start && childRange.End <= parentRange.End; |
There was a problem hiding this comment.
📝 This is a move from comparing line number to comparing position number. Since the LSP Position type didn't support the comparison, we convert to a Roslyn TextPosition which provides the > and <= operators.
sharwell
added
IDE-Navigation
sharwell
commented
May 12, 2023
| @@ -194,9 +194,12 @@ public static LSP.VersionedTextDocumentIdentifier DocumentToVersionedTextDocumen | |||
| public static LinePosition PositionToLinePosition(LSP.Position position) | |||
| => new LinePosition(position.Line, position.Character); | |||
|
|
|||
| public static LinePositionSpan RangeToLinePositionSpan(LSP.Range range) | |||
| => new(PositionToLinePosition(range.Start), PositionToLinePosition(range.End)); | |||
There was a problem hiding this comment.
📝 This is a restoration of a helper method that was recently removed in #68081 due to lack of use
sharwell
commented
May 12, 2023
| @@ -107,7 +107,7 @@ protected async Task<DocumentOutlineTestMocks> CreateMocksAsync(string code) | |||
| async Task<ManualInvocationResponse?> RequestAsync(ITextBuffer textBuffer, Func<JToken, bool> capabilitiesFilter, string languageServerName, string method, Func<ITextSnapshot, JToken> parameterFactory, CancellationToken cancellationToken) | |||
| { | |||
| var request = parameterFactory(textBuffer.CurrentSnapshot).ToObject<RoslynDocumentSymbolParams>(); | |||
| var response = await testLspServer.ExecuteRequestAsync<RoslynDocumentSymbolParams, DocumentSymbol[]>(method, request!, cancellationToken); | |||
| var response = await testLspServer.ExecuteRequestAsync<RoslynDocumentSymbolParams, object[]>(method, request!, cancellationToken); | |||
There was a problem hiding this comment.
📝 The tests took longer than expected to write because this mock isn't the real call and didn't match the signature of the real call:
The use of DocumentSymbol[] was forcing it to serialize DocumentSymbol items, which is a base type of the actual RoslynDocumentSymbol items contained in this array, so all the items in the tests failed to have the Glyph property set.
CyrusNajmabadi
approved these changes
May 15, 2023
CyrusNajmabadi
approved these changes
May 15, 2023
ghost
added this to the 
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #66012
Fixes #66473