maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

grid - allow to open settings and keybindings

Browse source
This commit is contained in:
Benjamin Pasero 2018-05-09 10:48:37 +02:00
parent d3f28be83a
commit b4b420f0f1
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/vs/workbench/services/preferences/browser/preferencesService.ts
View file

@ -38,6 +38,7 @@ import { parse } from 'vs/base/common/json';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { assign } from 'vs/base/common/objects';
import { INextEditorService } from 'vs/workbench/services/editor/common/nextEditorService';
const emptyEditableSettingsContent = '{\n}';
@ -58,6 +59,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
constructor(
@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
@INextEditorService private nextEditorService: INextEditorService,
@IEditorGroupService private editorGroupService: IEditorGroupService,
@IFileService private fileService: IFileService,
@IWorkspaceConfigurationService private configurationService: IWorkspaceConfigurationService,
@ -230,7 +232,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
});
}
return this.editorService.openEditor(this.instantiationService.createInstance(KeybindingsEditorInput), { pinned: true }).then(() => null);
return (this.nextEditorService.openEditor(this.instantiationService.createInstance(KeybindingsEditorInput), { pinned: true }) as TPromise).then(() => null);
}
configureSettingsForLanguage(language: string): void {
@ -269,9 +271,9 @@ export class PreferencesService extends Disposable implements IPreferencesServic
const defaultPreferencesEditorInput = this.instantiationService.createInstance(DefaultPreferencesEditorInput, this.getDefaultSettingsResource(configurationTarget));
const preferencesEditorInput = new PreferencesEditorInput(this.getPreferencesEditorInputName(configurationTarget, resource), editableSettingsEditorInput.getDescription(), defaultPreferencesEditorInput, <EditorInput>editableSettingsEditorInput);
this.lastOpenedSettingsInput = preferencesEditorInput;
return this.editorService.openEditor(preferencesEditorInput, options, position);
return this.nextEditorService.openEditor(preferencesEditorInput, options /*, TODO@grid position */);
}
return this.editorService.openEditor(editableSettingsEditorInput, options, position);
return this.nextEditorService.openEditor(editableSettingsEditorInput, options /*, TODO@grid position */);
});
}