Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove URI usage from SCM API protocol

Browse Source 
related to #40169
This commit is contained in:
Joao Moreno
2017-12-14 15:06:32 +01:00
parent b7fad651ac
commit 35730c44b4
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -645,7 +645,7 @@ export interface ExtHostTerminalServiceShape {
}
export interface ExtHostSCMShape {
$provideOriginalResource(sourceControlHandle: number, uri: URI): TPromise<URI>;
$provideOriginalResource(sourceControlHandle: number, uri: string): TPromise<string>;
$onInputBoxValueChange(sourceControlHandle: number, value: string): TPromise<void>;
$executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): TPromise<void>;
}

14
src/vs/workbench/api/node/extHostSCM.ts
View File

@@ -12,7 +12,7 @@ import { dispose, IDisposable } from 'vs/base/common/lifecycle';
import { asWinJsPromise } from 'vs/base/common/async';
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
import { MainContext, MainThreadSCMShape, SCMRawResource, SCMRawResourceSplice, SCMRawResourceSplices, IMainContext } from './extHost.protocol';
import { MainContext, MainThreadSCMShape, SCMRawResource, SCMRawResourceSplice, SCMRawResourceSplices, IMainContext, ExtHostSCMShape } from './extHost.protocol';
import { sortedDiff } from 'vs/base/common/arrays';
import { comparePaths } from 'vs/base/common/comparers';
import * as vscode from 'vscode';
@@ -442,7 +442,7 @@ class ExtHostSourceControl implements vscode.SourceControl {
}
}
export class ExtHostSCM {
export class ExtHostSCM implements ExtHostSCMShape {
private static _handlePool: number = 0;
@@ -524,8 +524,8 @@ export class ExtHostSCM {
return inputBox;
}
$provideOriginalResource(sourceControlHandle: number, uri: URI): TPromise<URI> {
this.logService.trace('ExtHostSCM#$provideOriginalResource', sourceControlHandle, uri);
$provideOriginalResource(sourceControlHandle: number, uriString: string): TPromise<string> {
this.logService.trace('ExtHostSCM#$provideOriginalResource', sourceControlHandle, uriString);
const sourceControl = this._sourceControls.get(sourceControlHandle);
@@ -533,10 +533,8 @@ export class ExtHostSCM {
return TPromise.as(null);
}
return asWinJsPromise(token => {
const result = sourceControl.quickDiffProvider.provideOriginalResource(uri, token);
return result && URI.parse(result.toString());
});
return asWinJsPromise(token => sourceControl.quickDiffProvider.provideOriginalResource(URI.parse(uriString), token))
.then(result => result && result.toString());
}
$onInputBoxValueChange(sourceControlHandle: number, value: string): TPromise<void> {