Merge pull request #1620 from filipw/features/771

Support go to definition from metadata

Author: DustinCampbell

src/features/definitionMetadataDocumentProvider.ts

@@ -2,7 +2,7 @@ import { workspace, Uri, TextDocument, Disposable, TextDocumentContentProvider}
 import { MetadataResponse } from '../omnisharp/protocol';
 
 export default class DefinitionMetadataDocumentProvider implements TextDocumentContentProvider, Disposable {
-    private _scheme = "omnisharp-metadata";
+    readonly scheme = "omnisharp-metadata";
     private _registration : Disposable;
     private _documents: Map<string, MetadataResponse>;
     private _documentClosedSubscription: Disposable;
@@ -31,15 +31,15 @@ export default class DefinitionMetadataDocumentProvider implements TextDocumentC
     }
 
     public register() : void {
-        this._registration = workspace.registerTextDocumentContentProvider(this._scheme, this);
+        this._registration = workspace.registerTextDocumentContentProvider(this.scheme, this);
     }
 
     public provideTextDocumentContent(uri : Uri) : string {
         return this._documents.get(uri.toString()).Source;
     }
 
     private createUri(metadataResponse: MetadataResponse) : Uri {
-        return Uri.parse(this._scheme + "://" +
+        return Uri.parse(this.scheme + "://" +
                          metadataResponse.SourceName.replace(/\\/g, "/")
                                                     .replace(/(.*)\/(.*)/g, "$1/[metadata] $2"));
     }

src/omnisharp/extension.ts

@@ -47,7 +47,9 @@ export function activate(context: vscode.ExtensionContext, reporter: TelemetryRe
         definitionMetadataDocumentProvider.register();
         localDisposables.push(definitionMetadataDocumentProvider);
 
-        localDisposables.push(vscode.languages.registerDefinitionProvider(documentSelector, new DefinitionProvider(server, definitionMetadataDocumentProvider)));
+        const definitionProvider = new DefinitionProvider(server, definitionMetadataDocumentProvider);
+        localDisposables.push(vscode.languages.registerDefinitionProvider(documentSelector, definitionProvider));
+        localDisposables.push(vscode.languages.registerDefinitionProvider({ scheme: definitionMetadataDocumentProvider.scheme }, definitionProvider));
         localDisposables.push(vscode.languages.registerImplementationProvider(documentSelector, new ImplementationProvider(server)));
         localDisposables.push(vscode.languages.registerCodeLensProvider(documentSelector, new CodeLensProvider(server)));
         localDisposables.push(vscode.languages.registerDocumentHighlightProvider(documentSelector, new DocumentHighlightProvider(server)));

src/omnisharp/typeConvertion.ts

@@ -44,8 +44,14 @@ export function createRequest<T extends protocol.Request>(document: vscode.TextD
         Column = where.start.character + 1;
     }
 
+    // for metadata sources, we need to remove the [metadata] from the filename, and prepend the $metadata$ authority
+    // this is expected by the Omnisharp server to support metadata-to-metadata navigation
+    let fileName = document.uri.scheme === "omnisharp-metadata" ? 
+        `${document.uri.authority}${document.fileName.replace("[metadata] ", "")}` : 
+        document.fileName;
+
     let request: protocol.Request = {
-        FileName: document.fileName,
+        FileName: fileName,
         Buffer: includeBuffer ? document.getText() : undefined,
         Line,
         Column