Skip to content

Commit e39bd5d

Browse files
committed
Removes setting & command to show/hide stashes view
1 parent 00cdd2e commit e39bd5d

File tree

4 files changed

+16
-26
lines changed

4 files changed

+16
-26
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## [4.x] - 2017-08-16
8+
## Added
9+
- Adds progress indicator to the `Toggle File Blame Annotations` command (`gitlens.toggleFileBlame`) icon
10+
- Icon pulses while annotations are computed
11+
- Adds active state to the `Toggle File Blame Annotations` command (`gitlens.toggleFileBlame`) icon
12+
- Icon turns orange while the annotations are visible
13+
14+
## Changed
15+
- Changes chat links from Gitter to [Slack](https://join.slack.com/t/vscode-gitlens/shared_invite/MjIxOTgxNDE3NzM0LTE1MDE2Nzk1MTgtMjkwMmZjMzcxNQ)
16+
17+
## Removed
18+
- Removes unneeded `gitlens.stashExplorer.enabled` configuration setting since users can add or remove custom views natively now
19+
- Removes unneeded `Toggle Git Stashed Explorer` command (`gitlens.stashExplorer.toggle`) since users can add or remove custom views natively now
20+
721
## [4.3.3] - 2017-07-28
822
## Added
923
- Adds progress indicator for when computing annotations takes a while

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ GitLens is highly customizable and provides many configuration settings to allow
293293

294294
|Name | Description
295295
|-----|------------
296-
|`gitlens.stashExplorer.enabled`|Specifies whether or not to show the `Git Stashes` explorer
297296
|`gitlens.stashExplorer.stashFormat`|Specifies the format of stashed changes in the `Git Stashes` explorer <br />Available tokens<br /> ${id} - commit id<br /> ${author} - commit author<br /> ${message} - commit message<br /> ${ago} - relative commit date (e.g. 1 day ago)<br /> ${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)<br /> ${authorAgo} - commit author, relative commit date<br />See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
298297
|`gitlens.stashExplorer.stashFileFormat`|Specifies the format of a stashed file in the `Git Stashes` explorer <br />Available tokens<br /> ${file} - file name<br /> ${path} - file path
299298

package.json

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -407,11 +407,6 @@
407407
"default": null,
408408
"description": "Specifies how all absolute dates will be formatted by default\nSee https://momentjs.com/docs/#/displaying/format/ for valid formats"
409409
},
410-
"gitlens.stashExplorer.enabled": {
411-
"type": "boolean",
412-
"default": false,
413-
"description": "Specifies whether or not to show the `Git Stashes` explorer"
414-
},
415410
"gitlens.stashExplorer.stashFormat": {
416411
"type": "string",
417412
"default": "${message}",
@@ -1011,11 +1006,6 @@
10111006
"command": "gitlens.stashExplorer.openFileInRemote",
10121007
"title": "Open File in Remote",
10131008
"category": "GitLens"
1014-
},
1015-
{
1016-
"command": "gitlens.stashExplorer.toggle",
1017-
"title": "Toggle Git Stashes Explorer",
1018-
"category": "GitLens"
10191009
}
10201010
],
10211011
"menus": {
@@ -1172,10 +1162,6 @@
11721162
"command": "gitlens.gitExplorer.refresh",
11731163
"when": "gitlens:enabled"
11741164
},
1175-
{
1176-
"command": "gitlens.stashExplorer.toggle",
1177-
"when": "gitlens:enabled"
1178-
},
11791165
{
11801166
"command": "gitlens.stashExplorer.refresh",
11811167
"when": "gitlens:enabled"
@@ -1552,7 +1538,7 @@
15521538
{
15531539
"id": "gitlens.stashExplorer",
15541540
"name": "Git Stashes",
1555-
"when": "gitlens:enabled && config.gitlens.stashExplorer.enabled"
1541+
"when": "gitlens:enabled"
15561542
}
15571543
]
15581544
}

src/views/stashExplorer.ts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
'use strict';
22
// import { Functions } from '../system';
3-
import { commands, Event, EventEmitter, ExtensionContext, TreeDataProvider, TreeItem, Uri, workspace } from 'vscode';
3+
import { commands, Event, EventEmitter, ExtensionContext, TreeDataProvider, TreeItem, Uri } from 'vscode';
44
import { Commands, DiffWithPreviousCommandArgs, openEditor } from '../commands';
5-
import { ExtensionKey, IConfig } from '../configuration';
65
import { ExplorerNode, StashCommitNode, StashNode } from './explorerNodes';
76
import { GitService, GitUri } from '../gitService';
87

@@ -20,7 +19,6 @@ export class StashExplorer implements TreeDataProvider<ExplorerNode> {
2019

2120
constructor(private context: ExtensionContext, private git: GitService) {
2221
commands.registerCommand('gitlens.stashExplorer.refresh', this.refresh, this);
23-
commands.registerCommand('gitlens.stashExplorer.toggle', this.toggle, this);
2422
commands.registerCommand('gitlens.stashExplorer.openChanges', this.openChanges, this);
2523
commands.registerCommand('gitlens.stashExplorer.openFile', this.openFile, this);
2624
commands.registerCommand('gitlens.stashExplorer.openStashedFile', this.openStashedFile, this);
@@ -62,16 +60,9 @@ export class StashExplorer implements TreeDataProvider<ExplorerNode> {
6260
// }
6361

6462
refresh() {
65-
if (!this.git.config.stashExplorer.enabled) return;
66-
6763
this._onDidChangeTreeData.fire();
6864
}
6965

70-
private toggle() {
71-
const cfg = workspace.getConfiguration().get<IConfig>(ExtensionKey)!;
72-
workspace.getConfiguration(ExtensionKey).update('stashExplorer.enabled', !cfg.stashExplorer.enabled, true);
73-
}
74-
7566
private openChanges(node: StashCommitNode) {
7667
const command = node.getCommand();
7768
if (command === undefined || command.arguments === undefined) return;

0 commit comments

Comments
 (0)