Merge from vscode 2b0b9136329c181a9e381463a1f7dc3a2d105a34 (#4880)

src/vs/vscode.proposed.d.ts

@@ -222,7 +222,6 @@ declare module 'vscode' {
 		 * See the vscode setting `"search.useGlobalIgnoreFiles"`.
 		 */
 		useGlobalIgnoreFiles: boolean;
-
 	}
 
 	/**
@@ -391,7 +390,6 @@ declare module 'vscode' {
 		 * Provide the set of files that match a certain file path pattern.
 		 * @param query The parameters for this query.
 		 * @param options A set of options to consider while searching files.
-		 * @param progress A progress callback that must be invoked for all results.
 		 * @param token A cancellation token.
 		 */
 		provideFileSearchResults(query: FileSearchQuery, options: FileSearchOptions, token: CancellationToken): ProviderResult<Uri[]>;
@@ -625,6 +623,11 @@ declare module 'vscode' {
 		 * An [event](#Event) that fires when the log level has changed.
 		 */
 		export const onDidChangeLogLevel: Event<LogLevel>;
+
+		/**
+		 * The custom uri scheme the editor registers to in the operating system, like 'vscode', 'vscode-insiders'.
+		 */
+		export const uriScheme: string;
 	}
 
 	//#endregion
@@ -1402,7 +1405,7 @@ declare module 'vscode' {
 		 * running on.
 		 *
 		 * If a webview accesses localhost content, we recomend that you specify port mappings even if
-		 * the `from` and `to` ports are the same.
+		 * the `port` and `resolvedPort` ports are the same.
 		 */
 		readonly portMapping?: ReadonlyArray<WebviewPortMapping>;
 	}