Merge from master

extensions/markdown-language-features/src/commands/index.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 export { OpenDocumentLinkCommand } from './openDocumentLink';
-export { OnPreviewStyleLoadErrorCommand } from './onPreviewStyleLoadError';
 export { ShowPreviewCommand, ShowPreviewToSideCommand, ShowLockedPreviewToSideCommand } from './showPreview';
 export { ShowSourceCommand } from './showSource';
 export { RefreshPreviewCommand } from './refreshPreview';

extensions/markdown-language-features/src/commands/onPreviewStyleLoadError.ts

@@ -1,18 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-import * as nls from 'vscode-nls';
-const localize = nls.loadMessageBundle();
-
-import * as vscode from 'vscode';
-
-import { Command } from '../commandManager';
-
-export class OnPreviewStyleLoadErrorCommand implements Command {
-	public readonly id = '_markdown.onPreviewStyleLoadError';
-
-	public execute(resources: string[]) {
-		vscode.window.showWarningMessage(localize('onPreviewStyleLoadError', "Could not load 'markdown.styles': {0}", resources.join(', ')));
-	}
-}

extensions/markdown-language-features/src/commands/openDocumentLink.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import * as path from 'path';
+import { extname } from 'path';
 
 import { Command } from '../commandManager';
 import { MarkdownEngine } from '../markdownEngine';
@@ -35,7 +35,7 @@ export class OpenDocumentLinkCommand implements Command {
 	public execute(args: OpenDocumentLinkArgs) {
 		const p = decodeURIComponent(args.path);
 		return this.tryOpen(p, args).catch(() => {
-			if (path.extname(p) === '') {
+			if (p && extname(p) === '') {
 				return this.tryOpen(p + '.md', args);
 			}
 			const resource = vscode.Uri.file(p);
@@ -47,13 +47,14 @@ export class OpenDocumentLinkCommand implements Command {
 
 	private async tryOpen(path: string, args: OpenDocumentLinkArgs) {
 		const resource = vscode.Uri.file(path);
-		if (vscode.window.activeTextEditor && isMarkdownFile(vscode.window.activeTextEditor.document) && vscode.window.activeTextEditor.document.uri.fsPath === resource.fsPath) {
-			return this.tryRevealLine(vscode.window.activeTextEditor, args.fragment);
-		} else {
-			return vscode.workspace.openTextDocument(resource)
-				.then(vscode.window.showTextDocument)
-				.then(editor => this.tryRevealLine(editor, args.fragment));
+		if (vscode.window.activeTextEditor && isMarkdownFile(vscode.window.activeTextEditor.document)) {
+			if (!path || vscode.window.activeTextEditor.document.uri.fsPath === resource.fsPath) {
+				return this.tryRevealLine(vscode.window.activeTextEditor, args.fragment);
+			}
 		}
+		return vscode.workspace.openTextDocument(resource)
+			.then(vscode.window.showTextDocument)
+			.then(editor => this.tryRevealLine(editor, args.fragment));
 	}
 
 	private async tryRevealLine(editor: vscode.TextEditor, fragment?: string) {
@@ -73,3 +74,37 @@ export class OpenDocumentLinkCommand implements Command {
 		}
 	}
 }
+
+
+export async function resolveLinkToMarkdownFile(path: string): Promise<vscode.Uri | undefined> {
+	try {
+		const standardLink = await tryResolveLinkToMarkdownFile(path);
+		if (standardLink) {
+			return standardLink;
+		}
+	} catch {
+		// Noop
+	}
+
+	// If no extension, try with `.md` extension
+	if (extname(path) === '') {
+		return tryResolveLinkToMarkdownFile(path + '.md');
+	}
+
+	return undefined;
+}
+
+async function tryResolveLinkToMarkdownFile(path: string): Promise<vscode.Uri | undefined> {
+	const resource = vscode.Uri.file(path);
+
+	let document: vscode.TextDocument;
+	try {
+		document = await vscode.workspace.openTextDocument(resource);
+	} catch {
+		return undefined;
+	}
+	if (isMarkdownFile(document)) {
+		return document.uri;
+	}
+	return undefined;
+}

extensions/markdown-language-features/src/commands/showPreview.ts

@@ -38,9 +38,10 @@ async function showPreview(
 		return;
 	}
 
+	const resourceColumn = (vscode.window.activeTextEditor && vscode.window.activeTextEditor.viewColumn) || vscode.ViewColumn.One;
 	webviewManager.preview(resource, {
-		resourceColumn: (vscode.window.activeTextEditor && vscode.window.activeTextEditor.viewColumn) || vscode.ViewColumn.One,
-		previewColumn: previewSettings.sideBySide ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active,
+		resourceColumn: resourceColumn,
+		previewColumn: previewSettings.sideBySide ? resourceColumn + 1 : resourceColumn,
 		locked: !!previewSettings.locked
 	});