From 3683aaaf2a7e88ab609cf98bd77049c43d97faa7 Mon Sep 17 00:00:00 2001 From: Maddy <12754347+MaddyDev@users.noreply.github.com> Date: Fri, 7 Aug 2020 15:39:39 -0700 Subject: [PATCH] Fix/markdown links (#11708) * test changes * maintain uri if it's not a file * check file and path is string * missed this * Add SQL CARBON EDIT Co-authored-by: chgagnon --- .../src/commands/openDocumentLink.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/markdown-language-features/src/commands/openDocumentLink.ts b/extensions/markdown-language-features/src/commands/openDocumentLink.ts index 8b9e50c85d..82b5d59cd8 100644 --- a/extensions/markdown-language-features/src/commands/openDocumentLink.ts +++ b/extensions/markdown-language-features/src/commands/openDocumentLink.ts @@ -10,6 +10,7 @@ import { Command } from '../commandManager'; import { MarkdownEngine } from '../markdownEngine'; import { TableOfContentsProvider } from '../tableOfContentsProvider'; import { isMarkdownFile } from '../util/file'; +import { isString } from 'util'; // {{ SQL CARBON EDIT }} export interface OpenDocumentLinkArgs { @@ -58,7 +59,7 @@ export class OpenDocumentLinkCommand implements Command { public static async execute(engine: MarkdownEngine, args: OpenDocumentLinkArgs) { const fromResource = vscode.Uri.parse('').with(args.fromResource); - const targetResource = vscode.Uri.parse('').with(args.path); + const targetResource = fromResource.scheme === 'file' && isString(args.path) ? vscode.Uri.file(args.path) : vscode.Uri.parse('').with(args.path); // {{ SQL CARBON EDIT }} Fix markdown relative links https://github.com/microsoft/azuredatastudio/issues/11657 const column = this.getViewColumn(fromResource); try { return await this.tryOpen(engine, targetResource, args, column);