Merge from vscode 8df646d3c5477b02737fc10343fa7cf0cc3f606b

src/vs/base/common/history.ts

@@ -28,11 +28,17 @@ export class HistoryNavigator<T> implements INavigator<T> {
 	}
 
 	public next(): T | null {
-		return this._navigator.next();
+		if (this._currentPosition() !== this._elements.length - 1) {
+			return this._navigator.next();
+		}
+		return null;
 	}
 
 	public previous(): T | null {
-		return this._navigator.previous();
+		if (this._currentPosition() !== 0) {
+			return this._navigator.previous();
+		}
+		return null;
 	}
 
 	public current(): T | null {
@@ -73,6 +79,15 @@ export class HistoryNavigator<T> implements INavigator<T> {
 		}
 	}
 
+	private _currentPosition(): number {
+		const currentElement = this._navigator.current();
+		if (!currentElement) {
+			return -1;
+		}
+
+		return this._elements.indexOf(currentElement);
+	}
+
 	private _initialize(history: readonly T[]): void {
 		this._history = new Set();
 		for (const entry of history) {

src/vs/base/common/resources.ts

@@ -5,7 +5,7 @@
 
 import * as extpath from 'vs/base/common/extpath';
 import * as paths from 'vs/base/common/path';
-import { URI, originalFSPath as uriOriginalFSPath } from 'vs/base/common/uri';
+import { URI } from 'vs/base/common/uri';
 import { equalsIgnoreCase } from 'vs/base/common/strings';
 import { Schemas } from 'vs/base/common/network';
 import { isLinux, isWindows } from 'vs/base/common/platform';
@@ -13,7 +13,28 @@ import { CharCode } from 'vs/base/common/charCode';
 import { ParsedExpression, IExpression, parse } from 'vs/base/common/glob';
 import { TernarySearchTree } from 'vs/base/common/map';
 
-export const originalFSPath = uriOriginalFSPath;
+export function originalFSPath(uri: URI): string {
+	let value: string;
+	const uriPath = uri.path;
+	if (uri.authority && uriPath.length > 1 && uri.scheme === 'file') {
+		// unc path: file://shares/c$/far/boo
+		value = `//${uri.authority}${uriPath}`;
+	} else if (
+		isWindows
+		&& uriPath.charCodeAt(0) === CharCode.Slash
+		&& extpath.isWindowsDriveLetter(uriPath.charCodeAt(1))
+		&& uriPath.charCodeAt(2) === CharCode.Colon
+	) {
+		value = uriPath.substr(1);
+	} else {
+		// other path
+		value = uriPath;
+	}
+	if (isWindows) {
+		value = value.replace(/\//g, '\\');
+	}
+	return value;
+}
 
 /**
  * Creates a key from a resource URI to be used to resource comparison and for resource maps.
@@ -24,7 +45,7 @@ export function getComparisonKey(resource: URI, caseInsensitivePath = hasToIgnor
 	if (caseInsensitivePath) {
 		path = path.toLowerCase();
 	}
-	return `${resource.scheme}://${resource.authority.toLowerCase()}/${path}?${resource.query}`;
+	return resource.with({ authority: resource.authority.toLowerCase(), path: path, fragment: null }).toString();
 }
 
 export function hasToIgnoreCase(resource: URI | undefined): boolean {
@@ -123,7 +144,15 @@ export function dirname(resource: URI): URI {
  * @returns The resulting URI.
  */
 export function joinPath(resource: URI, ...pathFragment: string[]): URI {
-	return URI.joinPaths(resource, ...pathFragment);
+	let joinedPath: string;
+	if (resource.scheme === 'file') {
+		joinedPath = URI.file(paths.join(originalFSPath(resource), ...pathFragment)).path;
+	} else {
+		joinedPath = paths.posix.join(resource.path || '/', ...pathFragment);
+	}
+	return resource.with({
+		path: joinedPath
+	});
 }
 
 /**

src/vs/base/common/uri.ts

@@ -6,7 +6,6 @@
 import { isWindows } from 'vs/base/common/platform';
 import { CharCode } from 'vs/base/common/charCode';
 import * as paths from 'vs/base/common/path';
-import * as extpath from 'vs/base/common/extpath';
 
 const _schemePattern = /^\w[\w\d+.-]*$/;
 const _singleSlashStart = /^\//;
@@ -206,7 +205,7 @@ export class URI implements UriComponents {
 		// if (this.scheme !== 'file') {
 		// 	console.warn(`[UriError] calling fsPath with scheme ${this.scheme}`);
 		// }
-		return _makeFsPath(this);
+		return _makeFsPath(this, false);
 	}
 
 	// ---- modify to new -------------------------
@@ -340,20 +339,21 @@ export class URI implements UriComponents {
 	/**
 	 * Join a URI path with path fragments and normalizes the resulting path.
 	 *
-	 * @param resource The input URI.
+	 * @param uri The input URI.
 	 * @param pathFragment The path fragment to add to the URI path.
 	 * @returns The resulting URI.
 	 */
-	static joinPaths(resource: URI, ...pathFragment: string[]): URI {
-		let joinedPath: string;
-		if (resource.scheme === 'file') {
-			joinedPath = URI.file(paths.join(originalFSPath(resource), ...pathFragment)).path;
-		} else {
-			joinedPath = paths.posix.join(resource.path || '/', ...pathFragment);
+	static joinPath(uri: URI, ...pathFragment: string[]): URI {
+		if (!uri.path) {
+			throw new Error(`[UriError]: cannot call joinPaths on URI without path`);
 		}
-		return resource.with({
-			path: joinedPath
-		});
+		let newPath: string;
+		if (isWindows && uri.scheme === 'file') {
+			newPath = URI.file(paths.win32.join(_makeFsPath(uri, true), ...pathFragment)).path;
+		} else {
+			newPath = paths.posix.join(uri.path, ...pathFragment);
+		}
+		return uri.with({ path: newPath });
 	}
 
 	// ---- printing/externalize ---------------------------
@@ -421,7 +421,7 @@ class _URI extends URI {
 
 	get fsPath(): string {
 		if (!this._fsPath) {
-			this._fsPath = _makeFsPath(this);
+			this._fsPath = _makeFsPath(this, false);
 		}
 		return this._fsPath;
 	}
@@ -577,7 +577,7 @@ function encodeURIComponentMinimal(path: string): string {
 /**
  * Compute `fsPath` for the given uri
  */
-function _makeFsPath(uri: URI): string {
+function _makeFsPath(uri: URI, keepDriveLetterCasing: boolean): string {
 
 	let value: string;
 	if (uri.authority && uri.path.length > 1 && uri.scheme === 'file') {
@@ -589,7 +589,11 @@ function _makeFsPath(uri: URI): string {
 		&& uri.path.charCodeAt(2) === CharCode.Colon
 	) {
 		// windows drive letter: file:///c:/far/boo
-		value = uri.path[1].toLowerCase() + uri.path.substr(2);
+		if (!keepDriveLetterCasing) {
+			value = uri.path[1].toLowerCase() + uri.path.substr(2);
+		} else {
+			value = uri.path.substr(1, 2);
+		}
 	} else {
 		// other path
 		value = uri.path;
@@ -695,29 +699,3 @@ function percentDecode(str: string): string {
 	}
 	return str.replace(_rEncodedAsHex, (match) => decodeURIComponentGraceful(match));
 }
-
-
-// --- utils
-
-export function originalFSPath(uri: URI): string {
-	let value: string;
-	const uriPath = uri.path;
-	if (uri.authority && uriPath.length > 1 && uri.scheme === 'file') {
-		// unc path: file://shares/c$/far/boo
-		value = `//${uri.authority}${uriPath}`;
-	} else if (
-		isWindows
-		&& uriPath.charCodeAt(0) === CharCode.Slash
-		&& extpath.isWindowsDriveLetter(uriPath.charCodeAt(1))
-		&& uriPath.charCodeAt(2) === CharCode.Colon
-	) {
-		value = uriPath.substr(1);
-	} else {
-		// other path
-		value = uriPath;
-	}
-	if (isWindows) {
-		value = value.replace(/\//g, '\\');
-	}
-	return value;
-}