From 18146e8c71cc11179cc0f355471b88351fa09c48 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 20 Mar 2018 14:30:06 -0700
Subject: [PATCH] Use `activePreview` when running markdown commands

Fixes #46216
---
 .../src/commands/showSource.ts                      | 12 +++---------
 .../src/commands/toggleLock.ts                      |  5 ++---
 .../src/features/previewManager.ts                  | 13 ++-----------
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/extensions/markdown-language-features/src/commands/showSource.ts b/extensions/markdown-language-features/src/commands/showSource.ts
index 455327599e3..a916bccefc0 100644
--- a/extensions/markdown-language-features/src/commands/showSource.ts
+++ b/extensions/markdown-language-features/src/commands/showSource.ts
@@ -14,15 +14,9 @@ export class ShowSourceCommand implements Command {
 		private readonly previewManager: MarkdownPreviewManager
 	) { }
 
-
-	public execute(docUri?: vscode.Uri) {
-		if (!docUri) {
-			return vscode.commands.executeCommand('workbench.action.navigateBack');
-		}
-
-		const resource = this.previewManager.getResourceForPreview(docUri);
-		if (resource) {
-			return vscode.workspace.openTextDocument(resource)
+	public execute() {
+		if (this.previewManager.activePreviewResource) {
+			return vscode.workspace.openTextDocument(this.previewManager.activePreviewResource)
 				.then(document => vscode.window.showTextDocument(document));
 		}
 		return undefined;
diff --git a/extensions/markdown-language-features/src/commands/toggleLock.ts b/extensions/markdown-language-features/src/commands/toggleLock.ts
index 384138a10e1..a6596e5e27c 100644
--- a/extensions/markdown-language-features/src/commands/toggleLock.ts
+++ b/extensions/markdown-language-features/src/commands/toggleLock.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
 import { Command } from '../commandManager';
 import { MarkdownPreviewManager } from '../features/previewManager';
 
@@ -14,7 +13,7 @@ export class ToggleLockCommand implements Command {
 		private readonly previewManager: MarkdownPreviewManager
 	) { }
 
-	public execute(previewUri?: vscode.Uri) {
-		this.previewManager.toggleLock(previewUri);
+	public execute() {
+		this.previewManager.toggleLock();
 	}
 }
\ No newline at end of file
diff --git a/extensions/markdown-language-features/src/features/previewManager.ts b/extensions/markdown-language-features/src/features/previewManager.ts
index 650711f4bca..882895d35bc 100644
--- a/extensions/markdown-language-features/src/features/previewManager.ts
+++ b/extensions/markdown-language-features/src/features/previewManager.ts
@@ -76,13 +76,8 @@ export class MarkdownPreviewManager {
 		return this.activePreview && this.activePreview.resource;
 	}
 
-	public getResourceForPreview(previewUri: vscode.Uri): vscode.Uri | undefined {
-		const preview = this.getPreviewWithUri(previewUri);
-		return preview && preview.resource;
-	}
-
-	public toggleLock(previewUri?: vscode.Uri) {
-		const preview = previewUri ? this.getPreviewWithUri(previewUri) : this.activePreview;
+	public toggleLock() {
+		const preview = this.activePreview;
 		if (preview) {
 			preview.toggleLock();
 
@@ -103,10 +98,6 @@ export class MarkdownPreviewManager {
 			preview.matchesResource(resource, previewSettings.previewColumn, previewSettings.locked));
 	}
 
-	private getPreviewWithUri(previewUri: vscode.Uri): MarkdownPreview | undefined {
-		return this.previews.find(preview => preview.uri.toString() === previewUri.toString());
-	}
-
 	private createNewPreview(
 		resource: vscode.Uri,
 		previewSettings: PreviewSettings
-- 
GitLab