development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-18 01:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

quick access - fix bug with options merging

Browse source
This commit is contained in:
Benjamin Pasero 2020-04-10 08:43:12 +02:00
parent c12bd56a88
commit 02bc4e2928
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vs/editor/contrib/quickAccess/gotoSymbolQuickAccess.ts
View file

@ -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 {

4
src/vs/platform/extensionManagement/node/extensionTipsService.ts
View file

@ -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) {

1
src/vs/workbench/workbench.web.api.ts
View file

@ -233,7 +233,6 @@ export {
create,
IWorkbenchConstructionOptions,
// Basic Types
URI,
UriComponents,