Merge from vscode 8df646d3c5477b02737fc10343fa7cf0cc3f606b

2026-02-17 02:51:36 -05:00 · 2020-03-25 06:20:54 +00:00
parent 6e5fbc9012
commit d810da9d87
114 changed files with 2036 additions and 797 deletions
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -2100,7 +2100,7 @@ declare module 'vscode' {
 		 * @param pathFragments
 		 * @returns A new uri
 		 */
-		export function joinPaths(base: Uri, ...pathFragments: string[]): Uri;
+		export function joinPath(base: Uri, ...pathFragments: string[]): Uri;
 	}

 	//#endregion