Просмотр исходного кода

Removes keybinding message as it is likely outdated at this point

main
Eric Amodio 6 лет назад
Родитель
Сommit
5bd0f58c1a
4 измененных файлов: 1 добавлений и 48 удалений
  1. +0
    -5
      package.json
  2. +0
    -1
      src/extension.ts
  3. +1
    -41
      src/messages.ts
  4. +0
    -1
      src/ui/config.ts

+ 0
- 5
package.json Просмотреть файл

@ -1466,7 +1466,6 @@
"suppressGitVersionWarning": false,
"suppressLineUncommittedWarning": false,
"suppressNoRepositoryWarning": false,
"suppressShowKeyBindingsNotice": false,
"suppressSupportGitLensNotification": false
},
"properties": {
@ -1498,10 +1497,6 @@
"type": "boolean",
"default": false
},
"suppressShowKeyBindingsNotice": {
"type": "boolean",
"default": false
},
"suppressSupportGitLensNotification": {
"type": "boolean",
"default": false

+ 0
- 1
src/extension.ts Просмотреть файл

@ -82,7 +82,6 @@ export async function activate(context: ExtensionContext) {
notifyOnUnsupportedGitVersion(gitVersion);
void showWelcomePage(gitlensVersion, previousVersion);
void Messages.showKeyBindingsInfoMessage();
context.globalState.update(GlobalState.GitLensVersion, gitlensVersion);

+ 1
- 41
src/messages.ts Просмотреть файл

@ -1,9 +1,8 @@
'use strict';
import { commands, ConfigurationTarget, MessageItem, Uri, window } from 'vscode';
import { Commands } from './commands';
import { configuration, KeyMap } from './configuration';
import { configuration } from './configuration';
import { BuiltInCommands, CommandContext, setCommandContext } from './constants';
import { Container } from './container';
import { GitCommit } from './git/gitService';
import { Logger } from './logger';
@ -15,7 +14,6 @@ export enum SuppressedMessages {
GitVersionWarning = 'suppressGitVersionWarning',
LineUncommittedWarning = 'suppressLineUncommittedWarning',
NoRepositoryWarning = 'suppressNoRepositoryWarning',
ShowKeyBindingsNotice = 'suppressShowKeyBindingsNotice',
SupportGitLensNotification = 'suppressSupportGitLensNotification'
}
@ -83,44 +81,6 @@ export class Messages {
);
}
static async showKeyBindingsInfoMessage(): Promise<MessageItem | undefined> {
if (
Container.config.keymap !== KeyMap.Alternate ||
Container.config.advanced.messages.suppressShowKeyBindingsNotice
) {
return undefined;
}
const actions: MessageItem[] = [
{ title: 'Keep Shortcuts', isCloseAffordance: true },
{ title: 'Switch Shortcuts' },
{ title: 'No Shortcuts' }
];
const result = await Messages.showMessage(
'info',
`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.`,
SuppressedMessages.ShowKeyBindingsNotice,
null,
...actions
);
switch (result) {
case actions[1]:
await configuration.update(
configuration.name('keymap').value,
KeyMap.Chorded,
ConfigurationTarget.Global
);
break;
case actions[2]:
await configuration.update(configuration.name('keymap').value, KeyMap.None, ConfigurationTarget.Global);
break;
}
return result;
}
static showLineUncommittedWarningMessage(message: string): Promise<MessageItem | undefined> {
return Messages.showMessage(
'warn',

+ 0
- 1
src/ui/config.ts Просмотреть файл

@ -203,7 +203,6 @@ export interface AdvancedConfig {
suppressGitVersionWarning: boolean;
suppressLineUncommittedWarning: boolean;
suppressNoRepositoryWarning: boolean;
suppressShowKeyBindingsNotice: boolean;
suppressSupportGitLensNotification: boolean;
};
quickPick: {

Загрузка…
Отмена
Сохранить