Merge from vscode 33a65245075e4d18908652865a79cf5489c30f40 (#9279)

* Merge from vscode 33a65245075e4d18908652865a79cf5489c30f40

* remove github

src/vs/base/common/extpath.ts

@@ -283,3 +283,20 @@ export function isRootOrDriveLetter(path: string): boolean {
 
 	return pathNormalized === posix.sep;
 }
+
+export function indexOfPath(path: string, candidate: string, ignoreCase: boolean): number {
+	if (candidate.length > path.length) {
+		return -1;
+	}
+
+	if (path === candidate) {
+		return 0;
+	}
+
+	if (ignoreCase) {
+		path = path.toLowerCase();
+		candidate = candidate.toLowerCase();
+	}
+
+	return path.indexOf(candidate);
+}

src/vs/base/common/types.ts

@@ -3,6 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { URI, UriComponents } from 'vs/base/common/uri';
+
 const _typeof = {
 	number: 'number',
 	string: 'string',
@@ -262,3 +264,21 @@ export type AddFirstParameterToFunctions<Target, TargetFunctionsReturnType, Firs
 	// Else: just leave as is
 	Target[K]
 };
+
+/**
+ * Mapped-type that replaces all occurrences of URI with UriComponents
+ */
+export type UriDto<T> = { [K in keyof T]: T[K] extends URI
+	? UriComponents
+	: UriDto<T[K]> };
+
+/**
+ * Mapped-type that replaces all occurrences of URI with UriComponents and
+ * drops all functions.
+ * todo@joh use toJSON-results
+ */
+export type Dto<T> = { [K in keyof T]: T[K] extends URI
+	? UriComponents
+	: T[K] extends Function
+	? never
+	: UriDto<T[K]> };

src/vs/base/parts/quickinput/browser/quickInput.ts

@@ -575,10 +575,6 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 		return this.visible ? this.ui.inputBox.hasFocus() : false;
 	}
 
-	public focusOnInput() {
-		this.ui.inputBox.setFocus();
-	}
-
 	onDidChangeSelection = this.onDidChangeSelectionEmitter.event;
 
 	onDidTriggerItemButton = this.onDidTriggerItemButtonEmitter.event;

src/vs/base/parts/quickinput/common/quickInput.ts

@@ -209,8 +209,6 @@ export interface IQuickPick<T extends IQuickPickItem> extends IQuickInput {
 	validationMessage: string | undefined;
 
 	inputHasFocus(): boolean;
-
-	focusOnInput(): void;
 }
 
 export interface IInputBox extends IQuickInput {