diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8a0dc8..1c43053 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
## [Unreleased]
### Added
- Adds `gitlens.statusBar.reduceFlicker` setting to specify whether to reduce the status bar "flickering" when changing lines by not first clearing the previous blame information -- closes [#272](https://github.com/eamodio/vscode-gitlens/issues/272)
+- Adds the *Open File* (`gitlens.explorers.openFile`) command to the *GitLens* explorer inline for file nodes
+- Adds the *Clear Results* (`gitlen.resultsExplorer.clearResultsNode`) command to the *GitLens Results* view inline for results nodes
### Fixed
- Fixes [#276](https://github.com/eamodio/vscode-gitlens/issues/276) - Lookup for branches without upstreams fails
diff --git a/images/dark/icon-close-small.svg b/images/dark/icon-close-small.svg
new file mode 100644
index 0000000..621fa4b
--- /dev/null
+++ b/images/dark/icon-close-small.svg
@@ -0,0 +1,5 @@
+
+
\ No newline at end of file
diff --git a/images/dark/icon-open-file.svg b/images/dark/icon-open-file.svg
new file mode 100644
index 0000000..42ee941
--- /dev/null
+++ b/images/dark/icon-open-file.svg
@@ -0,0 +1,4 @@
+
\ No newline at end of file
diff --git a/images/dark/open-file.svg b/images/dark/icon-open-working-file.svg
similarity index 100%
rename from images/dark/open-file.svg
rename to images/dark/icon-open-working-file.svg
diff --git a/images/light/icon-close-small.svg b/images/light/icon-close-small.svg
new file mode 100644
index 0000000..b8c9968
--- /dev/null
+++ b/images/light/icon-close-small.svg
@@ -0,0 +1,5 @@
+
+
\ No newline at end of file
diff --git a/images/light/icon-open-file.svg b/images/light/icon-open-file.svg
new file mode 100644
index 0000000..9ec4b74
--- /dev/null
+++ b/images/light/icon-open-file.svg
@@ -0,0 +1,4 @@
+
\ No newline at end of file
diff --git a/images/light/open-file.svg b/images/light/icon-open-working-file.svg
similarity index 100%
rename from images/light/open-file.svg
rename to images/light/icon-open-working-file.svg
diff --git a/package.json b/package.json
index e47dd15..6e0ef28 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
},
"publisher": "eamodio",
"engines": {
- "vscode": "^1.19.0"
+ "vscode": "^1.20.0"
},
"license": "SEE LICENSE IN LICENSE",
"displayName": "GitLens \u2014 Git supercharged",
@@ -1306,8 +1306,8 @@
"title": "Open Working File",
"category": "GitLens",
"icon": {
- "dark": "images/dark/open-file.svg",
- "light": "images/light/open-file.svg"
+ "dark": "images/dark/icon-open-working-file.svg",
+ "light": "images/light/icon-open-working-file.svg"
}
},
{
@@ -1367,7 +1367,11 @@
{
"command": "gitlens.explorers.openFile",
"title": "Open File",
- "category": "GitLens"
+ "category": "GitLens",
+ "icon": {
+ "dark": "images/dark/icon-open-file.svg",
+ "light": "images/light/icon-open-file.svg"
+ }
},
{
"command": "gitlens.explorers.openFileRevision",
@@ -1574,7 +1578,11 @@
{
"command": "gitlens.resultsExplorer.clearResultsNode",
"title": "Clear Results",
- "category": "GitLens"
+ "category": "GitLens",
+ "icon": {
+ "dark": "images/dark/icon-close-small.svg",
+ "light": "images/light/icon-close-small.svg"
+ }
},
{
"command": "gitlens.resultsExplorer.close",
@@ -2797,6 +2805,11 @@
"group": "8_gitlens@5"
},
{
+ "command": "gitlens.explorers.openFile",
+ "when": "viewItem == gitlens:commit-file",
+ "group": "inline"
+ },
+ {
"command": "gitlens.explorers.openChanges",
"when": "viewItem == gitlens:commit-file",
"group": "1_gitlens@1"
@@ -2844,6 +2857,11 @@
{
"command": "gitlens.explorers.openFile",
"when": "viewItem == gitlens:file-history",
+ "group": "inline"
+ },
+ {
+ "command": "gitlens.explorers.openFile",
+ "when": "viewItem == gitlens:file-history",
"group": "1_gitlens@1"
},
{
@@ -2874,6 +2892,11 @@
{
"command": "gitlens.resultsExplorer.clearResultsNode",
"when": "viewItem == gitlens:comparison-results",
+ "group": "inline"
+ },
+ {
+ "command": "gitlens.resultsExplorer.clearResultsNode",
+ "when": "viewItem == gitlens:comparison-results",
"group": "1_gitlens@1"
},
{
@@ -2884,6 +2907,11 @@
{
"command": "gitlens.resultsExplorer.clearResultsNode",
"when": "viewItem == gitlens:search-results",
+ "group": "inline"
+ },
+ {
+ "command": "gitlens.resultsExplorer.clearResultsNode",
+ "when": "viewItem == gitlens:search-results",
"group": "1_gitlens@1"
},
{
@@ -2947,6 +2975,11 @@
"group": "7_gitlens_@2"
},
{
+ "command": "gitlens.explorers.openFile",
+ "when": "viewItem == gitlens:stash-file",
+ "group": "inline"
+ },
+ {
"command": "gitlens.explorers.applyChanges",
"when": "viewItem == gitlens:stash-file",
"group": "1_gitlens@1"
@@ -2987,6 +3020,11 @@
"group": "1_gitlens@1"
},
{
+ "command": "gitlens.explorers.openFile",
+ "when": "viewItem == gitlens:status-file",
+ "group": "inline"
+ },
+ {
"command": "gitlens.explorers.openChanges",
"when": "viewItem == gitlens:status-file",
"group": "1_gitlens@1"
@@ -3023,6 +3061,11 @@
},
{
"command": "gitlens.explorers.openFile",
+ "when": "viewItem == gitlens:stash-file-commits",
+ "group": "inline"
+ },
+ {
+ "command": "gitlens.explorers.openFile",
"when": "viewItem == gitlens:status-file-commits",
"group": "1_gitlens@1"
},
diff --git a/src/views/branchFolderNode.ts b/src/views/branchFolderNode.ts
index b3f4852..b2fd3e5 100644
--- a/src/views/branchFolderNode.ts
+++ b/src/views/branchFolderNode.ts
@@ -37,7 +37,7 @@ export class BranchFolderNode extends ExplorerNode {
async getTreeItem(): Promise {
const item = new TreeItem(this.label, TreeItemCollapsibleState.Collapsed);
item.contextValue = ResourceType.Folder;
- (item as any).resourceUri = this.explorer.folderResourceUri;
+ item.resourceUri = this.explorer.folderResourceUri;
return item;
}
diff --git a/src/views/folderNode.ts b/src/views/folderNode.ts
index fb8b42b..23f83d9 100644
--- a/src/views/folderNode.ts
+++ b/src/views/folderNode.ts
@@ -63,7 +63,7 @@ export class FolderNode extends ExplorerNode {
// TODO: Change this to expanded once https://github.com/Microsoft/vscode/issues/30918 is fixed
const item = new TreeItem(this.label, TreeItemCollapsibleState.Collapsed);
item.contextValue = ResourceType.Folder;
- (item as any).resourceUri = this.explorer.folderResourceUri;
+ item.resourceUri = this.explorer.folderResourceUri;
return item;
}