Fixes #53372 #53503
Merged
sandy081 merged 4 commits intomicrosoft:masterfrom Jul 24, 2018
njkevlani:feature-#53372
Merged
Conversation
Added workbench.settings.openDefaultKeybindings setting
|
|
MadanBhandari
approved these changes
Jul 4, 2018
Contributor
Author
|
@sandy081 Done! Review please. |
Contributor
Author
|
Just putting a reminder here as there haven't been any activity for a while now. @sandy081 |
sandy081
requested changes
Jul 23, 2018
| } | ||
|
|
||
| setInput(input: KeybindingsEditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> { | ||
| this.searchWidget.setValue(input.defaultSearchValue); |
| } | ||
| } | ||
|
|
||
| export class OpenRawUserKeybindingsAction extends Action { |
Member
There was a problem hiding this comment.
We already have an action to open keybindings json file - OpenGlobalKeybindingsFileAction. So we do not need this action.
| "textual" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true } | ||
| } | ||
| */ | ||
| const openDefaultKeybindings = !!this.configurationService.getValue('workbench.settings.openDefaultKeybindings'); |
Member
There was a problem hiding this comment.
Move this line to inside if(textual) block
| } | ||
| return this.editorService.openEditor(this.instantiationService.createInstance(KeybindingsEditorInput), { pinned: true }).then(() => null); | ||
|
|
||
| const keybindingsEditorInput = this.instantiationService.createInstance(KeybindingsEditorInput); |
Member
There was a problem hiding this comment.
I do not think openDefaultKeybindings setting should interfere in Keybindings editor. This setting should decide to open or not the default keybindings file when you open keybindings as a file instead of editor.
| registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalSettingsAction, OpenGlobalSettingsAction.ID, OpenGlobalSettingsAction.LABEL), 'Preferences: Open User Settings', category); | ||
| registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalKeybindingsAction, OpenGlobalKeybindingsAction.ID, OpenGlobalKeybindingsAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_S) }), 'Preferences: Open Keyboard Shortcuts', category); | ||
| registry.registerWorkbenchAction(new SyncActionDescriptor(OpenRawDefaultKeybindingsAction, OpenRawDefaultKeybindingsAction.ID, OpenRawDefaultKeybindingsAction.LABEL), 'Preferences: Open Raw Default Settings', category); | ||
| registry.registerWorkbenchAction(new SyncActionDescriptor(OpenRawUserKeybindingsAction, OpenRawUserKeybindingsAction.ID, OpenRawUserKeybindingsAction.LABEL), 'Preferences: Open Raw Default Settings', category); |
Member
There was a problem hiding this comment.
Same as previous comment, This is not needed.
| return this.getEditableSettingsURI(ConfigurationTarget.USER); | ||
| } | ||
|
|
||
| get userKeybindingsResource(): URI { |
| return this.editorService.openEditor({ resource: this.defaultKeybindingsResource }); | ||
| } | ||
|
|
||
| openRawUserKeybindings(): TPromise<IEditor> { |
| switchSettings(target: ConfigurationTarget, resource: URI): TPromise<void>; | ||
| openGlobalKeybindingSettings(textual: boolean): TPromise<void>; | ||
| openRawDefaultKeybindings(): TPromise<IEditor>; | ||
| openRawUserKeybindings(): TPromise<IEditor>; |
| return otherInput instanceof KeybindingsEditorInput; | ||
| } | ||
|
|
||
| setDefaultSearchValue(defaultSearchValue = ''): void { |
Reverted changes regareding kebindingsEditor and removed some actions.
Contributor
Author
|
I have pushed requested changes. Review please, @sandy081 |
sandy081
approved these changes
Jul 24, 2018
| registry.registerWorkbenchAction(new SyncActionDescriptor(OpenSettings2Action, OpenSettings2Action.ID, OpenSettings2Action.LABEL), 'Preferences: Open Settings (Preview)', category); | ||
| registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalSettingsAction, OpenGlobalSettingsAction.ID, OpenGlobalSettingsAction.LABEL), 'Preferences: Open User Settings', category); | ||
| registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalKeybindingsAction, OpenGlobalKeybindingsAction.ID, OpenGlobalKeybindingsAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_S) }), 'Preferences: Open Keyboard Shortcuts', category); | ||
| registry.registerWorkbenchAction(new SyncActionDescriptor(OpenRawDefaultKeybindingsAction, OpenRawDefaultKeybindingsAction.ID, OpenRawDefaultKeybindingsAction.LABEL), 'Preferences: Open Raw Default Settings', category); |
Member
There was a problem hiding this comment.
Label should be Preferences: Open Default Keyboard Shortcuts File
Member
|
@njkevlani LGTM. Thanks for the PR |
Contributor
Author
|
Thanks for accepting!! @sandy081 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #53372
What is done?
Added following Actions:
Added following Settings:
What is remaining?
When keybindings are opened with
keyindingsEditor, it shows User+Default keybindings regardless of whatopenDefaultKeybindingsis set to(works forjsonfile, though). I wanted to use already implementedfetchfunction, with@source:user, for this functionality. But I got some errors. Can you suggest how should I approach this @sandy081?