quick access - fix bug with options merging

Benjamin Pasero · Benjamin Pasero · commit 02bc4e2928f4 · 2020-04-10T08:43:12.000+02:00
diff --git a/src/vs/editor/contrib/quickAccess/gotoSymbolQuickAccess.ts b/src/vs/editor/contrib/quickAccess/gotoSymbolQuickAccess.ts
@@ -35,8 +35,10 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 	static SCOPE_PREFIX = ':';
 	static PREFIX_BY_CATEGORY = `${AbstractGotoSymbolQuickAccessProvider.PREFIX}${AbstractGotoSymbolQuickAccessProvider.SCOPE_PREFIX}`;
 
-	constructor(protected options?: IGotoSymbolQuickAccessProviderOptions) {
-		super({ ...options, canAcceptInBackground: true });
+	constructor(protected options: IGotoSymbolQuickAccessProviderOptions = Object.create(null)) {
+		super(options);
+
+		options.canAcceptInBackground = true;
 	}
 
 	protected provideWithoutTextEditor(picker: IQuickPick<IGotoSymbolQuickPickItem>): IDisposable {
diff --git a/src/vs/platform/extensionManagement/node/extensionTipsService.ts b/src/vs/platform/extensionManagement/node/extensionTipsService.ts
@@ -27,7 +27,7 @@ export class ExtensionTipsService implements IExtensionTipsService {
 
 	constructor(
 		@IFileService private readonly fileService: IFileService,
-		@IEnvironmentService private readonly environmentService: IEnvironmentService,
+		@IEnvironmentService private readonly environmentService: INativeEnvironmentService,
 		@IProductService private readonly productService: IProductService,
 		@IRequestService private readonly requestService: IRequestService,
 		@ILogService private readonly logService: ILogService,
@@ -76,7 +76,7 @@ export class ExtensionTipsService implements IExtensionTipsService {
 				}
 			} else {
 				exePaths.push(join('/usr/local/bin', exeName));
-				exePaths.push(join((this.environmentService as INativeEnvironmentService).userHome.fsPath, exeName));
+				exePaths.push(join(this.environmentService.userHome.fsPath, exeName));
 			}
 
 			for (const exePath of exePaths) {
diff --git a/src/vs/workbench/workbench.web.api.ts b/src/vs/workbench/workbench.web.api.ts
@@ -233,7 +233,6 @@ export {
 	create,
 	IWorkbenchConstructionOptions,
 
-
 	// Basic Types
 	URI,
 	UriComponents,
