Skip to content

Commit 5bd0f58

Browse files
committed
Removes keybinding message as it is likely outdated at this point
1 parent fc20de9 commit 5bd0f58

File tree

4 files changed

+1
-48
lines changed

4 files changed

+1
-48
lines changed

package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1466,7 +1466,6 @@
14661466
"suppressGitVersionWarning": false,
14671467
"suppressLineUncommittedWarning": false,
14681468
"suppressNoRepositoryWarning": false,
1469-
"suppressShowKeyBindingsNotice": false,
14701469
"suppressSupportGitLensNotification": false
14711470
},
14721471
"properties": {
@@ -1498,10 +1497,6 @@
14981497
"type": "boolean",
14991498
"default": false
15001499
},
1501-
"suppressShowKeyBindingsNotice": {
1502-
"type": "boolean",
1503-
"default": false
1504-
},
15051500
"suppressSupportGitLensNotification": {
15061501
"type": "boolean",
15071502
"default": false

src/extension.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ export async function activate(context: ExtensionContext) {
8282

8383
notifyOnUnsupportedGitVersion(gitVersion);
8484
void showWelcomePage(gitlensVersion, previousVersion);
85-
void Messages.showKeyBindingsInfoMessage();
8685

8786
context.globalState.update(GlobalState.GitLensVersion, gitlensVersion);
8887

src/messages.ts

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
'use strict';
22
import { commands, ConfigurationTarget, MessageItem, Uri, window } from 'vscode';
33
import { Commands } from './commands';
4-
import { configuration, KeyMap } from './configuration';
4+
import { configuration } from './configuration';
55
import { BuiltInCommands, CommandContext, setCommandContext } from './constants';
6-
import { Container } from './container';
76
import { GitCommit } from './git/gitService';
87
import { Logger } from './logger';
98

@@ -15,7 +14,6 @@ export enum SuppressedMessages {
1514
GitVersionWarning = 'suppressGitVersionWarning',
1615
LineUncommittedWarning = 'suppressLineUncommittedWarning',
1716
NoRepositoryWarning = 'suppressNoRepositoryWarning',
18-
ShowKeyBindingsNotice = 'suppressShowKeyBindingsNotice',
1917
SupportGitLensNotification = 'suppressSupportGitLensNotification'
2018
}
2119

@@ -83,44 +81,6 @@ export class Messages {
8381
);
8482
}
8583

86-
static async showKeyBindingsInfoMessage(): Promise<MessageItem | undefined> {
87-
if (
88-
Container.config.keymap !== KeyMap.Alternate ||
89-
Container.config.advanced.messages.suppressShowKeyBindingsNotice
90-
) {
91-
return undefined;
92-
}
93-
94-
const actions: MessageItem[] = [
95-
{ title: 'Keep Shortcuts', isCloseAffordance: true },
96-
{ title: 'Switch Shortcuts' },
97-
{ title: 'No Shortcuts' }
98-
];
99-
const result = await Messages.showMessage(
100-
'info',
101-
`GitLens is using keyboard shortcuts which can conflict with menu mnemonics and different keyboard layouts. To avoid such conflicts, it is recommended to switch to the new default keyboard shortcuts.`,
102-
SuppressedMessages.ShowKeyBindingsNotice,
103-
null,
104-
...actions
105-
);
106-
107-
switch (result) {
108-
case actions[1]:
109-
await configuration.update(
110-
configuration.name('keymap').value,
111-
KeyMap.Chorded,
112-
ConfigurationTarget.Global
113-
);
114-
break;
115-
116-
case actions[2]:
117-
await configuration.update(configuration.name('keymap').value, KeyMap.None, ConfigurationTarget.Global);
118-
break;
119-
}
120-
121-
return result;
122-
}
123-
12484
static showLineUncommittedWarningMessage(message: string): Promise<MessageItem | undefined> {
12585
return Messages.showMessage(
12686
'warn',

src/ui/config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ export interface AdvancedConfig {
203203
suppressGitVersionWarning: boolean;
204204
suppressLineUncommittedWarning: boolean;
205205
suppressNoRepositoryWarning: boolean;
206-
suppressShowKeyBindingsNotice: boolean;
207206
suppressSupportGitLensNotification: boolean;
208207
};
209208
quickPick: {

0 commit comments

Comments
 (0)