Browse Source

Changes chorded keymap keys to avoid Windows issues

main
Eric Amodio 6 years ago
parent
commit
68ec6e6263
3 changed files with 24 additions and 15 deletions
  1. +4
    -0
      CHANGELOG.md
  2. +2
    -2
      README.md
  3. +18
    -13
      package.json

+ 4
- 0
CHANGELOG.md View File

@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased] ## [Unreleased]
### Changed
- Changes `chorded` keymap on Windows to use `Ctrl+Shift+G` rather than `Ctrl+Alt+G` to avoid [issues](https://blogs.msdn.microsoft.com/oldnewthing/20040329-00/?p=40003)
- Also remaps `Show SCM` to `Ctrl+Shift+G G` since by default it is `Ctrl+Shift+G` if the `chorded` keymap is used
### Fixed ### Fixed
- Fixes issue where GitLens wouldn't detect the creation of a Git repository if there were no other repositories open - Fixes issue where GitLens wouldn't detect the creation of a Git repository if there were no other repositories open
- Fixes issue where some GitLens commands would show in the palette even though there was no repository - Fixes issue where some GitLens commands would show in the palette even though there was no repository

+ 2
- 2
README.md View File

@ -28,7 +28,7 @@ While GitLens is highly customizable and provides many [configuration settings](
|`gitlens.codeLens.enabled`|Specifies whether or not to provide any Git code lens, by default<br />Use the *Toggle Git Code Lens* command (`gitlens.toggleCodeLens`) to toggle the Git code lens on and off for the current session |`gitlens.codeLens.enabled`|Specifies whether or not to provide any Git code lens, by default<br />Use the *Toggle Git Code Lens* command (`gitlens.toggleCodeLens`) to toggle the Git code lens on and off for the current session
|`gitlens.gitExplorer.enabled`|Specifies whether or not to show the **GitLens** view |`gitlens.gitExplorer.enabled`|Specifies whether or not to show the **GitLens** view
|`gitlens.statusBar.enabled`|Specifies whether or not to provide blame information on the status bar |`gitlens.statusBar.enabled`|Specifies whether or not to provide blame information on the status bar
|`gitlens.keymap`|Specifies the keymap to use for GitLens shortcut keys<br />`standard` - adds a standard set of shortcut keys<br />`chorded` - adds a chorded set of shortcut keys that all start with `Ctrl+Alt+G` (`⌥⌘G` on macOS)<br />`none` - no shortcut keys will be added
|`gitlens.keymap`|Specifies the keymap to use for GitLens shortcut keys<br />`standard` - adds a standard set of shortcut keys<br />`chorded` - adds a chorded set of shortcut keys that all start with `Ctrl+Shift+G` (`⌥⌘G` on macOS)<br />`none` - no shortcut keys will be added
## Features ## Features
@ -389,7 +389,7 @@ GitLens is highly customizable and provides many configuration settings to allow
|`gitlens.defaultDateStyle`|Specifies how dates will be displayed by default |`gitlens.defaultDateStyle`|Specifies how dates will be displayed by default
|`gitlens.defaultGravatarsStyle`|Specifies the style of the gravatar default (fallback) images<br />`identicon` - a geometric pattern<br />`mm` - (mystery-man) a simple, cartoon-style silhouetted outline of a person (does not vary by email hash)<br />`monsterid` - a monster with different colors, faces, etc<br />`retro` - 8-bit arcade-style pixelated faces<br />`robohash` - a robot with different colors, faces, etc<br />`wavatar` - faces with differing features and backgrounds |`gitlens.defaultGravatarsStyle`|Specifies the style of the gravatar default (fallback) images<br />`identicon` - a geometric pattern<br />`mm` - (mystery-man) a simple, cartoon-style silhouetted outline of a person (does not vary by email hash)<br />`monsterid` - a monster with different colors, faces, etc<br />`retro` - 8-bit arcade-style pixelated faces<br />`robohash` - a robot with different colors, faces, etc<br />`wavatar` - faces with differing features and backgrounds
|`gitlens.insiders`|Opts into the insiders channel -- provides access to upcoming features |`gitlens.insiders`|Opts into the insiders channel -- provides access to upcoming features
|`gitlens.keymap`|Specifies the keymap to use for GitLens shortcut keys<br />`standard` - adds a standard set of shortcut keys<br />`chorded` - adds a chorded set of shortcut keys that all start with `Ctrl+Alt+G` (`⌥⌘G` on macOS)<br />`none` - no shortcut keys will be added
|`gitlens.keymap`|Specifies the keymap to use for GitLens shortcut keys<br />`standard` - adds a standard set of shortcut keys<br />`chorded` - adds a chorded set of shortcut keys that all start with `Ctrl+Shift+G` (`⌥⌘G` on macOS)<br />`none` - no shortcut keys will be added
|`gitlens.outputLevel`|Specifies how much (if any) output will be sent to the GitLens output channel |`gitlens.outputLevel`|Specifies how much (if any) output will be sent to the GitLens output channel
### Blame Settings ### Blame Settings

+ 18
- 13
package.json View File

@ -3143,79 +3143,79 @@
}, },
{ {
"command": "gitlens.toggleFileBlame", "command": "gitlens.toggleFileBlame",
"key": "ctrl+alt+g b",
"key": "ctrl+shift+g b",
"mac": "cmd+alt+g b", "mac": "cmd+alt+g b",
"when": "gitlens:keymap == chorded && editorTextFocus && gitlens:activeIsBlameable" "when": "gitlens:keymap == chorded && editorTextFocus && gitlens:activeIsBlameable"
}, },
{ {
"command": "gitlens.toggleCodeLens", "command": "gitlens.toggleCodeLens",
"key": "ctrl+alt+g shift+b",
"key": "ctrl+shift+g shift+b",
"mac": "cmd+alt+g shift+b", "mac": "cmd+alt+g shift+b",
"when": "gitlens:keymap == chorded && editorTextFocus && gitlens:activeIsTracked && gitlens:canToggleCodeLens" "when": "gitlens:keymap == chorded && editorTextFocus && gitlens:activeIsTracked && gitlens:canToggleCodeLens"
}, },
{ {
"command": "gitlens.showLastQuickPick", "command": "gitlens.showLastQuickPick",
"key": "ctrl+alt+g -",
"key": "ctrl+shift+g -",
"mac": "cmd+alt+g -", "mac": "cmd+alt+g -",
"when": "gitlens:keymap == chorded && gitlens:enabled" "when": "gitlens:keymap == chorded && gitlens:enabled"
}, },
{ {
"command": "gitlens.showCommitSearch", "command": "gitlens.showCommitSearch",
"key": "ctrl+alt+g /",
"key": "ctrl+shift+g /",
"mac": "cmd+alt+g /", "mac": "cmd+alt+g /",
"when": "gitlens:keymap == chorded && gitlens:enabled" "when": "gitlens:keymap == chorded && gitlens:enabled"
}, },
{ {
"command": "gitlens.showQuickFileHistory", "command": "gitlens.showQuickFileHistory",
"key": "ctrl+alt+g h",
"key": "ctrl+shift+g h",
"mac": "cmd+alt+g h", "mac": "cmd+alt+g h",
"when": "gitlens:keymap == chorded && gitlens:enabled" "when": "gitlens:keymap == chorded && gitlens:enabled"
}, },
{ {
"command": "gitlens.showQuickRepoHistory", "command": "gitlens.showQuickRepoHistory",
"key": "ctrl+alt+g shift+h",
"key": "ctrl+shift+g shift+h",
"mac": "cmd+alt+g shift+h", "mac": "cmd+alt+g shift+h",
"when": "gitlens:keymap == chorded && gitlens:enabled" "when": "gitlens:keymap == chorded && gitlens:enabled"
}, },
{ {
"command": "gitlens.showQuickRepoStatus", "command": "gitlens.showQuickRepoStatus",
"key": "ctrl+alt+g s",
"key": "ctrl+shift+g s",
"mac": "cmd+alt+g s", "mac": "cmd+alt+g s",
"when": "gitlens:keymap == chorded && gitlens:enabled" "when": "gitlens:keymap == chorded && gitlens:enabled"
}, },
{ {
"command": "gitlens.showQuickCommitFileDetails", "command": "gitlens.showQuickCommitFileDetails",
"key": "ctrl+alt+g c",
"key": "ctrl+shift+g c",
"mac": "cmd+alt+g c", "mac": "cmd+alt+g c",
"when": "gitlens:keymap == chorded && editorTextFocus && gitlens:enabled" "when": "gitlens:keymap == chorded && editorTextFocus && gitlens:enabled"
}, },
{ {
"command": "gitlens.diffWithNext", "command": "gitlens.diffWithNext",
"key": "ctrl+alt+g .",
"key": "ctrl+shift+g .",
"mac": "cmd+alt+g .", "mac": "cmd+alt+g .",
"when": "gitlens:keymap == chorded && editorTextFocus && gitlens:activeIsTracked" "when": "gitlens:keymap == chorded && editorTextFocus && gitlens:activeIsTracked"
}, },
{ {
"command": "gitlens.diffLineWithPrevious", "command": "gitlens.diffLineWithPrevious",
"key": "ctrl+alt+g shift+,",
"key": "ctrl+shift+g shift+,",
"mac": "cmd+alt+g shift+,", "mac": "cmd+alt+g shift+,",
"when": "gitlens:keymap == chorded && editorTextFocus && gitlens:activeIsTracked" "when": "gitlens:keymap == chorded && editorTextFocus && gitlens:activeIsTracked"
}, },
{ {
"command": "gitlens.diffWithPrevious", "command": "gitlens.diffWithPrevious",
"key": "ctrl+alt+g ,",
"key": "ctrl+shift+g ,",
"mac": "cmd+alt+g ,", "mac": "cmd+alt+g ,",
"when": "gitlens:keymap == chorded && editorTextFocus && gitlens:activeIsTracked" "when": "gitlens:keymap == chorded && editorTextFocus && gitlens:activeIsTracked"
}, },
{ {
"command": "gitlens.diffLineWithWorking", "command": "gitlens.diffLineWithWorking",
"key": "ctrl+alt+g w",
"key": "ctrl+shift+g w",
"mac": "cmd+alt+g w", "mac": "cmd+alt+g w",
"when": "gitlens:keymap == chorded && editorTextFocus && gitlens:activeIsTracked" "when": "gitlens:keymap == chorded && editorTextFocus && gitlens:activeIsTracked"
}, },
{ {
"command": "gitlens.diffWithWorking", "command": "gitlens.diffWithWorking",
"key": "ctrl+alt+g shift+w",
"key": "ctrl+shift+g shift+w",
"mac": "cmd+alt+g shift+w", "mac": "cmd+alt+g shift+w",
"when": "gitlens:keymap == chorded && editorTextFocus && gitlens:activeIsTracked" "when": "gitlens:keymap == chorded && editorTextFocus && gitlens:activeIsTracked"
}, },
@ -3283,6 +3283,11 @@
"command": "gitlens.diffWithWorking", "command": "gitlens.diffWithWorking",
"key": "shift+alt+w", "key": "shift+alt+w",
"when": "gitlens:keymap == standard && editorTextFocus && gitlens:activeIsTracked" "when": "gitlens:keymap == standard && editorTextFocus && gitlens:activeIsTracked"
},
{
"command": "workbench.view.scm",
"key": "ctrl+shift+g g",
"when": "gitlens:keymap == chorded && gitlens:enabled"
} }
], ],
"views": { "views": {

Loading…
Cancel
Save