Merge from vscode 0a7364f00514c46c9caceece15e1f82f82e3712f

src/vs/base/common/codicons.ts

@@ -476,6 +476,8 @@ export namespace Codicon {
 	export const record = new Codicon('record', { character: '\\eba7' });
 	export const debugAltSmall = new Codicon('debug-alt-small', { character: '\\eba8' });
 	export const vmConnect = new Codicon('vm-connect', { character: '\\eba9' });
+	export const cloud = new Codicon('cloud', { character: '\\ebaa' });
+	export const merge = new Codicon('merge', { character: '\\ebab' });
 }
 
 

src/vs/base/common/json.ts

@@ -72,6 +72,7 @@ export interface JSONScanner {
 }
 
 
+
 export interface ParseError {
 	error: ParseErrorCode;
 	offset: number;

src/vs/base/common/scrollable.ts

@@ -332,6 +332,12 @@ export class Scrollable extends Disposable {
 
 		this._setState(newState);
 
+		if (!this._smoothScrolling) {
+			// Looks like someone canceled the smooth scrolling
+			// from the scroll event handler
+			return;
+		}
+
 		if (update.isDone) {
 			this._smoothScrolling.dispose();
 			this._smoothScrolling = null;

src/vs/base/common/uri.ts

@@ -252,7 +252,7 @@ export class URI implements UriComponents {
 			return this;
 		}
 
-		return new CachingURI(scheme, authority, path, query, fragment);
+		return new Uri(scheme, authority, path, query, fragment);
 	}
 
 	// ---- parse & validate ------------------------
@@ -266,9 +266,9 @@ export class URI implements UriComponents {
 	static parse(value: string, _strict: boolean = false): URI {
 		const match = _regexp.exec(value);
 		if (!match) {
-			return new CachingURI(_empty, _empty, _empty, _empty, _empty);
+			return new Uri(_empty, _empty, _empty, _empty, _empty);
 		}
-		return new CachingURI(
+		return new Uri(
 			match[2] || _empty,
 			percentDecode(match[4] || _empty),
 			percentDecode(match[5] || _empty),
@@ -323,11 +323,11 @@ export class URI implements UriComponents {
 			}
 		}
 
-		return new CachingURI('file', authority, path, _empty, _empty);
+		return new Uri('file', authority, path, _empty, _empty);
 	}
 
 	static from(components: { scheme: string; authority?: string; path?: string; query?: string; fragment?: string }): URI {
-		return new CachingURI(
+		return new Uri(
 			components.scheme,
 			components.authority,
 			components.path,
@@ -388,7 +388,7 @@ export class URI implements UriComponents {
 		} else if (data instanceof URI) {
 			return data;
 		} else {
-			const result = new CachingURI(data);
+			const result = new Uri(data);
 			result._formatted = (<UriState>data).external;
 			result._fsPath = (<UriState>data)._sep === _pathSepMarker ? (<UriState>data).fsPath : null;
 			return result;
@@ -414,7 +414,7 @@ interface UriState extends UriComponents {
 const _pathSepMarker = isWindows ? 1 : undefined;
 
 // This class exists so that URI is compatibile with vscode.Uri (API).
-class CachingURI extends URI {
+class Uri extends URI {
 
 	_formatted: string | null = null;
 	_fsPath: string | null = null;