Fixes the openWorkingFile command to always show when desired

Author: eamodio

CHANGELOG.md

@@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Adds clipboard support for Linux without requiring any external dependencies — thanks to [PR #394](https://github.com/eamodio/vscode-gitlens/pull/394) by Cédric Malard ([@cmalard](https://github.com/cmalard))
 - Adds a select branch quick pick menu to the *Open File in Remote* command (`gitlens.openFileInRemote`) when the current branch has no upstream tracking branch — closes [#209](https://github.com/eamodio/vscode-gitlens/issues/209)
 
+### Changed
+- Moves the *Open Working File* command (`gitlens.openWorkingFile`) to the right of the *Compare File with * Revision* commands in the editor toolbar
+
 ### Fixed
 - Fixes [#400](https://github.com/eamodio/vscode-gitlens/issues/400) - Reset TO commit also resets chosen one
 - Fixes [#399](https://github.com/eamodio/vscode-gitlens/issues/399) - "Open x in Remote" commands aren't always available
@@ -17,6 +20,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Fixes another case of [#343](https://github.com/eamodio/vscode-gitlens/issues/343) - Can't show blame when VSCode starts on branch without upstream — thanks to [PR #390](https://github.com/eamodio/vscode-gitlens/pull/390) by ryenus ([@ryenus](https://github.com/ryenus))
 - Fixes [#392](https://github.com/eamodio/vscode-gitlens/issues/392) - unable to contribute if default script shell is sh — thanks to [PR #393](https://github.com/eamodio/vscode-gitlens/pull/393) by Cédric Malard ([@cmalard](https://github.com/cmalard))
 - Fixes issue with the `chorded` keyboard shortcut for the *Compare File with Previous Revision* command (`gitlens.diffWithPreviousInDiff`) — from [#395](https://github.com/eamodio/vscode-gitlens/issues/395)
+- Fixes the *Open Working File* command (`gitlens.openWorkingFile`) not always showing in the editor toolbar when appropriate
 
 ## [8.3.3] - 2018-05-31
 ### Added

package.json

@@ -2407,29 +2407,34 @@
                 }
             ],
             "editor/title": [
-                {
-                    "command": "gitlens.openWorkingFile",
-                    "when": "gitlens:activeIsRevision && resourceScheme != git",
-                    "group": "navigation@1"
-                },
-                {
-                    "command": "gitlens.openWorkingFile",
-                    "when": "gitlens:activeIsRevision && resourceScheme == git && !isInDiffEditor",
-                    "group": "navigation@1"
-                },
                 {
                     "command": "gitlens.diffWithPrevious",
                     "when": "editorTextFocus && !isInDiffEditor && gitlens:activeIsTracked && config.gitlens.menus.editorGroup.compare",
-                    "group": "navigation@98"
+                    "group": "navigation@97"
                 },
                 {
                     "command": "gitlens.diffWithPreviousInDiff",
                     "when": "isInDiffEditor && gitlens:activeIsTracked && config.gitlens.menus.editorGroup.compare",
-                    "group": "navigation@98"
+                    "group": "navigation@97"
                 },
                 {
                     "command": "gitlens.diffWithNext",
                     "when": "editorTextFocus && gitlens:activeIsTracked && gitlens:activeIsTracked && gitlens:activeIsRevision && config.gitlens.menus.editorGroup.compare",
+                    "group": "navigation@98"
+                },
+                {
+                    "command": "gitlens.openWorkingFile",
+                    "when": "gitlens:activeIsRevision && resourceScheme != git",
+                    "group": "navigation@99"
+                },
+                {
+                    "command": "gitlens.openWorkingFile",
+                    "when": "!gitlens:activeIsRevision && resourceScheme != git && isInDiffEditor",
+                    "group": "navigation@99"
+                },
+                {
+                    "command": "gitlens.openWorkingFile",
+                    "when": "gitlens:activeIsRevision && resourceScheme == git && !isInDiffEditor",
                     "group": "navigation@99"
                 },
                 {