Fix "go to definition" from metadata within the same metadata file #1772
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
DustinCampbell
approved these changes
Oct 2, 2017
| @@ -38,9 +41,8 @@ export default class DefinitionMetadataDocumentProvider implements TextDocumentC | |||
| return this._documents.get(uri.toString()).Source; | |||
| } | |||
|
|
|||
| private createUri(metadataResponse: MetadataResponse) : Uri { | |||
| private createUri(sourceName:string) : Uri { | |||
| this._documents.set(uri.toString(), metadataResponse); | ||
|
|
||
| return uri; | ||
| } | ||
|
|
||
| public getExistingMetadataResponseUri(sourceName:string) : Uri { |
| if (gotoDefinitionResponse && gotoDefinitionResponse.FileName) { | ||
|
|
||
| // if it is part of an already used metadata file, retrieve its uri instead of going to the physical file | ||
| if (gotoDefinitionResponse.FileName.startsWith("$metadata$")) { |
There was a problem hiding this comment.
We should add something to the OmniSharp response to indicate that the result is in metadata, rather than checking the file name. Not a blocking a issue, but I wanted to capture it.
There was a problem hiding this comment.
yes I agree, good point
src/omnisharp/typeConvertion.ts
Outdated
| return toLocationFromUri(fileName, location); | ||
| } | ||
|
|
||
| export function toLocationFromUri(uri:vscode.Uri, location: protocol.ResourceLocation | protocol.QuickFix): vscode.Location { |
src/features/definitionProvider.ts
Outdated
|
|
||
| // if it is part of an already used metadata file, retrieve its uri instead of going to the physical file | ||
| if (gotoDefinitionResponse.FileName.startsWith("$metadata$")) { | ||
| let uri = this._definitionMetadataDocumentProvider.getExistingMetadataResponseUri(gotoDefinitionResponse.FileName); |
There was a problem hiding this comment.
nit: const rather than let
|
Looks good! Anything else? |
No, I think this can go as is. We will do something smarter in Omnisharp in the future and then we can tweak this code to be a bit cleaner. ✨ |
|
Sounds great. |
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.
At the moment we have a nice story of going from
source -> metadataand frommetadata -> other metadata.However, when trying to go from metadata as source file to the same metadata as source file, we get an error.
Albeit not a huge issue, it can be a little annoying. An example is below.
Given the following metadata as source file (shortened for brevity), where we position the caret at
$$:When I invoke "go to definition" on
$$, I should be taken back toEncodingdefinition within the same metadata file. Instead I get:This PR fixes this.