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

Closes #1353 - improves status bar flicker

Also makes it the default
main
Eric Amodio 3 лет назад
Родитель
Сommit
914fab61c4
5 измененных файлов: 8 добавлений и 2 удалений
  1. +1
    -0
      CHANGELOG.md
  2. +1
    -1
      package.json
  3. +1
    -0
      src/annotations/lineAnnotationController.ts
  4. +2
    -1
      src/git/formatters/commitFormatter.ts
  5. +3
    -0
      src/statusbar/statusBarController.ts

+ 1
- 0
CHANGELOG.md Просмотреть файл

@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
### Changed
- Changes `gitlens.statusBar.reduceFlicker` to be on by default and improves it's display — closes [#1353](https://github.com/eamodio/vscode-gitlens/issues/1353)
- Changes the _Interactive Rebase Editor_ to abort the rebase if you just close it without choosing an action
- Changes _Push to Commit..._ on the HEAD commit to be _Push_ instead as there is no need for a commit specific push in that case
- Renames _Browse from Here_ command to _Browse Repository from Here_ in the command palette and quick pick menus

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

@ -1653,7 +1653,7 @@
},
"gitlens.statusBar.reduceFlicker": {
"type": "boolean",
"default": false,
"default": true,
"markdownDescription": "Specifies whether to avoid clearing the previous blame information when changing lines to reduce status bar \"flashing\"",
"scope": "window"
},

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

@ -296,6 +296,7 @@ export class LineAnnotationController implements Disposable {
dateFormat: cfg.dateFormat === null ? Container.config.defaultDateFormat : cfg.dateFormat,
getBranchAndTagTips: getBranchAndTagTips,
pullRequestOrRemote: prs?.get(commit.ref),
pullRequestPendingMessage: `PR ${GlyphChars.Ellipsis}`,
},
cfg.scrollable,
) as DecorationOptions;

+ 2
- 1
src/git/formatters/commitFormatter.ts Просмотреть файл

@ -44,6 +44,7 @@ export interface CommitFormatOptions extends FormatOptions {
messageIndent?: number;
messageTruncateAtNewLine?: boolean;
pullRequestOrRemote?: PullRequest | Promises.CancellationError | GitRemote;
pullRequestPendingMessage?: string;
presence?: ContactPresence;
previousLineDiffUris?: { current: GitUri; previous: GitUri | undefined };
remotes?: GitRemote<RemoteProvider>[];
@ -507,7 +508,7 @@ export class CommitFormatter extends Formatter {
} else if (pr instanceof Promises.CancellationError) {
text = this._options.markdown
? `[PR $(sync~spin)](command:${Commands.RefreshHover} "Searching for a Pull Request (if any) that introduced this commit...")`
: `PR ${GlyphChars.Ellipsis}`;
: this._options?.pullRequestPendingMessage ?? emptyStr;
} else {
return this._padOrTruncate(emptyStr, this._options.tokenOptions.pullRequest);
}

+ 3
- 0
src/statusbar/statusBarController.ts Просмотреть файл

@ -131,6 +131,8 @@ export class StatusBarController implements Disposable {
if (clear) {
this.clearBlame();
} else if (this._statusBarBlame != null) {
this._statusBarBlame.text = this._statusBarBlame.text.replace('$(git-commit)', '$(sync~spin)');
}
}
@ -177,6 +179,7 @@ export class StatusBarController implements Disposable {
getBranchAndTagTips: getBranchAndTagTips,
messageTruncateAtNewLine: true,
pullRequestOrRemote: pr,
pullRequestPendingMessage: 'PR $(sync~spin)',
})}`;
switch (cfg.command) {

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