Refresh master with initial release/0.24 snapshot (#332)

* Initial port of release/0.24 source code

* Fix additional headers

* Fix a typo in launch.json

src/vs/workbench/api/electron-browser/mainThreadSCM.ts

@@ -10,23 +10,38 @@ import URI from 'vs/base/common/uri';
 import Event, { Emitter } from 'vs/base/common/event';
 import { assign } from 'vs/base/common/objects';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { ISCMService, ISCMRepository, ISCMProvider, ISCMResource, ISCMResourceGroup, ISCMResourceDecorations } from 'vs/workbench/services/scm/common/scm';
+import { ISCMService, ISCMRepository, ISCMProvider, ISCMResource, ISCMResourceGroup, ISCMResourceDecorations, ISCMResourceCollection, ISCMResourceSplice } from 'vs/workbench/services/scm/common/scm';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ExtHostContext, MainThreadSCMShape, ExtHostSCMShape, SCMProviderFeatures, SCMRawResource, SCMGroupFeatures, MainContext, IExtHostContext } from '../node/extHost.protocol';
+import { ExtHostContext, MainThreadSCMShape, ExtHostSCMShape, SCMProviderFeatures, SCMRawResourceSplices, SCMGroupFeatures, MainContext, IExtHostContext } from '../node/extHost.protocol';
 import { Command } from 'vs/editor/common/modes';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 
+class MainThreadSCMResourceCollection implements ISCMResourceCollection {
+
+	readonly resources: ISCMResource[] = [];
+
+	private _onDidSplice = new Emitter<ISCMResourceSplice>();
+	readonly onDidSplice = this._onDidSplice.event;
+
+	splice(start: number, deleteCount: number, resources: ISCMResource[]) {
+		this.resources.splice(start, deleteCount, ...resources);
+		this._onDidSplice.fire({ start, deleteCount, resources });
+	}
+}
+
 class MainThreadSCMResourceGroup implements ISCMResourceGroup {
 
+	readonly resourceCollection = new MainThreadSCMResourceCollection();
+	get hideWhenEmpty(): boolean { return this.features.hideWhenEmpty; }
+
 	constructor(
 		private sourceControlHandle: number,
 		private handle: number,
 		public provider: ISCMProvider,
 		public features: SCMGroupFeatures,
 		public label: string,
-		public id: string,
-		public resources: ISCMResource[]
+		public id: string
 	) { }
 
 	toJSON(): any {
@@ -41,15 +56,19 @@ class MainThreadSCMResourceGroup implements ISCMResourceGroup {
 class MainThreadSCMResource implements ISCMResource {
 
 	constructor(
+		private proxy: ExtHostSCMShape,
 		private sourceControlHandle: number,
 		private groupHandle: number,
 		private handle: number,
 		public sourceUri: URI,
-		public command: Command | undefined,
 		public resourceGroup: ISCMResourceGroup,
 		public decorations: ISCMResourceDecorations
 	) { }
 
+	open(): TPromise<void> {
+		return this.proxy.$executeResourceCommand(this.sourceControlHandle, this.groupHandle, this.handle);
+	}
+
 	toJSON(): any {
 		return {
 			$mid: 3,
@@ -71,42 +90,41 @@ class MainThreadSCMProvider implements ISCMProvider {
 
 	get resources(): ISCMResourceGroup[] {
 		return this._groups
-			.filter(g => g.resources.length > 0 || !g.features.hideWhenEmpty);
+			.filter(g => g.resourceCollection.resources.length > 0 || !g.features.hideWhenEmpty);
 	}
 
-	private _onDidChange = new Emitter<void>();
-	get onDidChange(): Event<void> { return this._onDidChange.event; }
+	private _onDidChangeResources = new Emitter<void>();
+	get onDidChangeResources(): Event<void> { return this._onDidChangeResources.event; }
 
 	private features: SCMProviderFeatures = {};
 
 	get handle(): number { return this._handle; }
 	get label(): string { return this._label; }
+	get rootUri(): URI | undefined { return this._rootUri; }
 	get contextValue(): string { return this._contextValue; }
 
 	get commitTemplate(): string | undefined { return this.features.commitTemplate; }
 	get acceptInputCommand(): Command | undefined { return this.features.acceptInputCommand; }
 	get statusBarCommands(): Command[] | undefined { return this.features.statusBarCommands; }
+	get count(): number | undefined { return this.features.count; }
 
 	private _onDidChangeCommitTemplate = new Emitter<string>();
 	get onDidChangeCommitTemplate(): Event<string> { return this._onDidChangeCommitTemplate.event; }
 
-	private _count: number | undefined = undefined;
-	get count(): number | undefined { return this._count; }
+	private _onDidChange = new Emitter<void>();
+	get onDidChange(): Event<void> { return this._onDidChange.event; }
 
 	constructor(
 		private proxy: ExtHostSCMShape,
 		private _handle: number,
 		private _contextValue: string,
 		private _label: string,
+		private _rootUri: URI | undefined,
 		@ISCMService scmService: ISCMService,
 		@ICommandService private commandService: ICommandService
 	) { }
 
 	$updateSourceControl(features: SCMProviderFeatures): void {
-		if ('count' in features) {
-			this._count = features.count;
-		}
-
 		this.features = assign(this.features, features);
 		this._onDidChange.fire();
 
@@ -122,8 +140,7 @@ class MainThreadSCMProvider implements ISCMProvider {
 			this,
 			{},
 			label,
-			id,
-			[]
+			id
 		);
 
 		this._groups.push(group);
@@ -152,37 +169,50 @@ class MainThreadSCMProvider implements ISCMProvider {
 		this._onDidChange.fire();
 	}
 
-	$updateGroupResourceStates(groupHandle: number, resources: SCMRawResource[]): void {
-		const group = this._groupsByHandle[groupHandle];
+	$spliceGroupResourceStates(splices: SCMRawResourceSplices[]): void {
+		for (const [groupHandle, groupSlices] of splices) {
+			const group = this._groupsByHandle[groupHandle];
 
-		if (!group) {
-			return;
+			if (!group) {
+				console.warn(`SCM group ${groupHandle} not found in provider ${this.label}`);
+				continue;
+			}
+
+			// reverse the splices sequence in order to apply them correctly
+			groupSlices.reverse();
+
+			for (const [start, deleteCount, rawResources] of groupSlices) {
+				const resources = rawResources.map(rawResource => {
+					const [handle, sourceUri, icons, tooltip, strikeThrough, faded, source, letter, color] = rawResource;
+					const icon = icons[0];
+					const iconDark = icons[1] || icon;
+					const decorations = {
+						icon: icon && URI.parse(icon),
+						iconDark: iconDark && URI.parse(iconDark),
+						tooltip,
+						strikeThrough,
+						faded,
+						source,
+						letter,
+						color: color && color.id
+					};
+
+					return new MainThreadSCMResource(
+						this.proxy,
+						this.handle,
+						groupHandle,
+						handle,
+						URI.parse(sourceUri),
+						group,
+						decorations
+					);
+				});
+
+				group.resourceCollection.splice(start, deleteCount, resources);
+			}
 		}
 
-		group.resources = resources.map(rawResource => {
-			const [handle, sourceUri, command, icons, tooltip, strikeThrough, faded] = rawResource;
-			const icon = icons[0];
-			const iconDark = icons[1] || icon;
-			const decorations = {
-				icon: icon && URI.parse(icon),
-				iconDark: iconDark && URI.parse(iconDark),
-				tooltip,
-				strikeThrough,
-				faded
-			};
-
-			return new MainThreadSCMResource(
-				this.handle,
-				groupHandle,
-				handle,
-				URI.parse(sourceUri),
-				command,
-				group,
-				decorations
-			);
-		});
-
-		this._onDidChange.fire();
+		this._onDidChangeResources.fire();
 	}
 
 	$unregisterGroup(handle: number): void {
@@ -245,8 +275,8 @@ export class MainThreadSCM implements MainThreadSCMShape {
 		this._disposables = dispose(this._disposables);
 	}
 
-	$registerSourceControl(handle: number, id: string, label: string): void {
-		const provider = new MainThreadSCMProvider(this._proxy, handle, id, label, this.scmService, this.commandService);
+	$registerSourceControl(handle: number, id: string, label: string, rootUri: string | undefined): void {
+		const provider = new MainThreadSCMProvider(this._proxy, handle, id, label, rootUri && URI.parse(rootUri), this.scmService, this.commandService);
 		const repository = this.scmService.registerSCMProvider(provider);
 		this._repositories[handle] = repository;
 
@@ -312,7 +342,7 @@ export class MainThreadSCM implements MainThreadSCMShape {
 		provider.$updateGroupLabel(groupHandle, label);
 	}
 
-	$updateGroupResourceStates(sourceControlHandle: number, groupHandle: number, resources: SCMRawResource[]): void {
+	$spliceResourceStates(sourceControlHandle: number, splices: SCMRawResourceSplices[]): void {
 		const repository = this._repositories[sourceControlHandle];
 
 		if (!repository) {
@@ -320,7 +350,7 @@ export class MainThreadSCM implements MainThreadSCMShape {
 		}
 
 		const provider = repository.provider as MainThreadSCMProvider;
-		provider.$updateGroupResourceStates(groupHandle, resources);
+		provider.$spliceGroupResourceStates(splices);
 	}
 
 	$unregisterGroup(sourceControlHandle: number, handle: number): void {