提交 18146e8c 编写于 作者: M Matt Bierner

Use `activePreview` when running markdown commands

Fixes #46216
上级 27a17935
...@@ -14,15 +14,9 @@ export class ShowSourceCommand implements Command { ...@@ -14,15 +14,9 @@ export class ShowSourceCommand implements Command {
private readonly previewManager: MarkdownPreviewManager private readonly previewManager: MarkdownPreviewManager
) { } ) { }
public execute() {
public execute(docUri?: vscode.Uri) { if (this.previewManager.activePreviewResource) {
if (!docUri) { return vscode.workspace.openTextDocument(this.previewManager.activePreviewResource)
return vscode.commands.executeCommand('workbench.action.navigateBack');
}
const resource = this.previewManager.getResourceForPreview(docUri);
if (resource) {
return vscode.workspace.openTextDocument(resource)
.then(document => vscode.window.showTextDocument(document)); .then(document => vscode.window.showTextDocument(document));
} }
return undefined; return undefined;
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information. * 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 { Command } from '../commandManager';
import { MarkdownPreviewManager } from '../features/previewManager'; import { MarkdownPreviewManager } from '../features/previewManager';
...@@ -14,7 +13,7 @@ export class ToggleLockCommand implements Command { ...@@ -14,7 +13,7 @@ export class ToggleLockCommand implements Command {
private readonly previewManager: MarkdownPreviewManager private readonly previewManager: MarkdownPreviewManager
) { } ) { }
public execute(previewUri?: vscode.Uri) { public execute() {
this.previewManager.toggleLock(previewUri); this.previewManager.toggleLock();
} }
} }
\ No newline at end of file
...@@ -76,13 +76,8 @@ export class MarkdownPreviewManager { ...@@ -76,13 +76,8 @@ export class MarkdownPreviewManager {
return this.activePreview && this.activePreview.resource; return this.activePreview && this.activePreview.resource;
} }
public getResourceForPreview(previewUri: vscode.Uri): vscode.Uri | undefined { public toggleLock() {
const preview = this.getPreviewWithUri(previewUri); const preview = this.activePreview;
return preview && preview.resource;
}
public toggleLock(previewUri?: vscode.Uri) {
const preview = previewUri ? this.getPreviewWithUri(previewUri) : this.activePreview;
if (preview) { if (preview) {
preview.toggleLock(); preview.toggleLock();
...@@ -103,10 +98,6 @@ export class MarkdownPreviewManager { ...@@ -103,10 +98,6 @@ export class MarkdownPreviewManager {
preview.matchesResource(resource, previewSettings.previewColumn, previewSettings.locked)); 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( private createNewPreview(
resource: vscode.Uri, resource: vscode.Uri,
previewSettings: PreviewSettings previewSettings: PreviewSettings
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册