Take 1.11.0 of vscode.proposed.d.ts

src/tfvc/tfvcscmprovider.ts

@@ -5,7 +5,8 @@
 "use strict";
 
 import { Logger } from "../helpers/logger";
-import { commands, scm, Uri, Disposable, SCMProvider, SCMResource, SCMResourceGroup, Event, EventEmitter, ProviderResult, workspace } from "vscode";
+import { TfvcCommandNames } from "../helpers/constants";
+import { CancellationToken, commands, scm, Uri, Disposable, SCMProvider, SCMResource, SCMResourceGroup, Event, EventEmitter, ProviderResult, workspace } from "vscode";
 import { CommitHoverProvider } from "./scm/commithoverprovider";
 import { Model } from "./scm/model";
 import { Status } from "./scm/status";
@@ -241,6 +242,11 @@ export class TfvcSCMProvider implements SCMProvider {
         return uri.with({ scheme: TfvcSCMProvider.scmScheme });
     }
 
+    acceptChanges(token: CancellationToken): ProviderResult<void> {
+        console.log("acceptChanges", token);
+        return commands.executeCommand<void>(TfvcCommandNames.Checkin);
+    }
+
     dispose(): void {
         TfvcSCMProvider.instance = undefined;
         this.cleanup();

src/vscode.proposed.d.ts

@@ -137,10 +137,12 @@ export type ProviderResult<T> = T | undefined | null | Thenable<T | undefined |
 		readonly resources: SCMResourceGroup[];
 		readonly onDidChange: Event<SCMResourceGroup[]>;
 		readonly count?: number | undefined;
+		readonly state?: string;
 
 		getOriginalResource?(uri: Uri, token: CancellationToken): ProviderResult<Uri>;
 		open?(resource: SCMResource, token: CancellationToken): ProviderResult<void>;
 		drag?(resource: SCMResource, resourceGroup: SCMResourceGroup, token: CancellationToken): ProviderResult<void>;
+		acceptChanges?(token: CancellationToken): ProviderResult<void>;
 	}
 
 	export interface SCMInputBox {
@@ -156,5 +158,14 @@ export type ProviderResult<T> = T | undefined | null | Thenable<T | undefined |
 		export function getResourceFromURI(uri: Uri): SCMResource | SCMResourceGroup | undefined;
 		export function registerSCMProvider(id: string, provider: SCMProvider): Disposable;
 	}
+
+	export interface LineChange {
+		readonly originalStartLineNumber: number;
+		readonly originalEndLineNumber: number;
+		readonly modifiedStartLineNumber: number;
+		readonly modifiedEndLineNumber: number;
+	}
+
+	export function computeDiff(oneDocument: TextDocument, otherDocument: TextDocument): Thenable<LineChange[]>;
 }
 /* tslint:enable */