提交 521fdc27 编写于 作者: J Joao Moreno

🐛 expect resources, not uris in commands

fixes #23689
上级 817174b9
......@@ -244,13 +244,7 @@ export class CommandCenter {
}
@command('git.openFile')
async openFile(uri?: Uri): Promise<void> {
if (uri && uri.scheme === 'file') {
return await commands.executeCommand<void>('vscode.open', uri);
}
const resource = this.resolveSCMResource(uri);
async openFile(resource?: Resource): Promise<void> {
if (!resource) {
return;
}
......@@ -259,9 +253,7 @@ export class CommandCenter {
}
@command('git.openChange')
async openChange(uri?: Uri): Promise<void> {
const resource = this.resolveSCMResource(uri);
async openChange(resource?: Resource): Promise<void> {
if (!resource) {
return;
}
......@@ -272,7 +264,7 @@ export class CommandCenter {
@command('git.stage')
async stage(...resourceStates: SourceControlResourceState[]): Promise<void> {
if (resourceStates.length === 0) {
const resource = this.resolveSCMResource();
const resource = this.getActiveEditorSCMResource();
if (!resource) {
return;
......@@ -378,7 +370,7 @@ export class CommandCenter {
@command('git.unstage')
async unstage(...resourceStates: SourceControlResourceState[]): Promise<void> {
if (resourceStates.length === 0) {
const resource = this.resolveSCMResource();
const resource = this.getActiveEditorSCMResource();
if (!resource) {
return;
......@@ -446,7 +438,7 @@ export class CommandCenter {
@command('git.clean')
async clean(...resourceStates: SourceControlResourceState[]): Promise<void> {
if (resourceStates.length === 0) {
const resource = this.resolveSCMResource();
const resource = this.getActiveEditorSCMResource();
if (!resource) {
return;
......@@ -799,8 +791,8 @@ export class CommandCenter {
return result;
}
private resolveSCMResource(uri?: Uri): Resource | undefined {
uri = uri || window.activeTextEditor && window.activeTextEditor.document.uri;
private getActiveEditorSCMResource(): Resource | undefined {
let uri = window.activeTextEditor && window.activeTextEditor.document.uri;
if (!uri) {
return undefined;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册