Fixes view commands that open the working file

Fixes quickpick commands that open the working file

Neither of these cases worked with renamed files

Author: eamodio

CHANGELOG.md

@@ -8,7 +8,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## Fixed
 
-- Fixes the _Show Stashed Changes_ (`gitlens.showQuickStashList`) command with multiple repositories
+- Fixes issues with the _Open File_, _Open Files_, _Open All Changes with Working Tree_, and _Apply Changes_ commands in the views not working with renamed files
+- Fixes issues with the _Open File_, _Open Files_, and _Apply Changes_ command in the quick pick menus not working with renamed files
+- Fixes issues with the _Show Stashed Changes_ (`gitlens.showQuickStashList`) command and multiple repositories
 
 ## [9.7.3] - 2019-05-11
 

src/commands/openWorkingFile.ts

@@ -30,18 +30,21 @@ export class OpenWorkingFileCommand extends ActiveEditorCommand {
             if (args.uri == null) {
                 uri = getCommandUri(uri, editor);
                 if (uri == null) return undefined;
+            }
+            else {
+                uri = args.uri;
+            }
 
-                args.uri = await GitUri.fromUri(uri);
-                if (args.uri instanceof GitUri && args.uri.sha) {
-                    const workingUri = await Container.git.getWorkingUri(args.uri.repoPath!, args.uri);
-                    if (workingUri === undefined) {
-                        return window.showWarningMessage(
-                            'Unable to open working file. File could not be found in the working tree'
-                        );
-                    }
-
-                    args.uri = new GitUri(workingUri, args.uri.repoPath);
+            args.uri = await GitUri.fromUri(uri);
+            if (args.uri instanceof GitUri && args.uri.sha) {
+                const workingUri = await Container.git.getWorkingUri(args.uri.repoPath!, args.uri);
+                if (workingUri === undefined) {
+                    return window.showWarningMessage(
+                        'Unable to open working file. File could not be found in the working tree'
+                    );
                 }
+
+                args.uri = new GitUri(workingUri, args.uri.repoPath);
             }
 
             if (args.line !== undefined && args.line !== 0) {

src/git/parsers/logParser.ts

@@ -13,6 +13,8 @@ const diffRangeRegex = /^@@ -(\d+?),(\d+?) \+(\d+?),(\d+?) @@/;
 
 export const fileStatusRegex = /(\S)\S*\t([^\t\n]+)(?:\t(.+))?/;
 const logFileSimpleRegex = /^<r> (.*)\s*(?:(?:diff --git a\/(.*) b\/(.*))|(?:(\S)\S*\t([^\t\n]+)(?:\t(.+))?))/gm;
+const logFileSimpleRenamedRegex = /^<r> (\S+)\s*(.*)$/s;
+const logFileSimpleRenamedFilesRegex = /^(\S)\S*\t([^\t\n]+)(?:\t(.+)?)$/gm;
 
 // Using %x00 codes because some shells seem to try to expand things if not
 const lb = '%x3c'; // `%x${'<'.charCodeAt(0).toString(16)}`;
@@ -412,56 +414,75 @@ export class GitLogParser {
             skip--;
         }
 
-        let match;
         let ref;
+        let diffFile;
+        let diffRenamed;
+        let status;
         let file;
-        let status: GitFileStatus | undefined;
+        let renamed;
+
+        let match: RegExpExecArray | null;
         do {
             match = logFileSimpleRegex.exec(data);
             if (match == null) break;
 
             if (skip-- > 0) continue;
 
-            ref = ` ${match[1]}`.substr(1);
+            [, ref, diffFile, diffRenamed, status, file, renamed] = match;
+
             if (lineRef === ref) {
                 skip++;
 
                 continue;
             }
 
-            file = ` ${match[3] || match[2] || match[6] || match[5]}`.substr(1);
-            status = match[4] ? (` ${match[4]}`.substr(1) as GitFileStatus) : undefined;
+            // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
+            file = ` ${diffRenamed || diffFile || renamed || file}`.substr(1);
+            // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
+            status = status == null || status.length === 0 ? undefined : ` ${status}`.substr(1);
         } while (skip >= 0);
 
         // Ensure the regex state is reset
         logFileSimpleRegex.lastIndex = 0;
 
-        return [ref, file, status];
+        // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
+        return [` ${ref}`.substr(1), file, status as GitFileStatus | undefined];
     }
 
     @debug({ args: false })
     static parseSimpleRenamed(
         data: string,
         originalFileName: string
     ): [string | undefined, string | undefined, GitFileStatus | undefined] {
-        let match;
-        let ref;
+        let match = logFileSimpleRenamedRegex.exec(data);
+        if (match == null) return [undefined, undefined, undefined];
+
+        const [, ref, files] = match;
+
+        let status;
         let file;
-        let status: GitFileStatus | undefined;
+        let renamed;
+
         do {
-            match = logFileSimpleRegex.exec(data);
+            match = logFileSimpleRenamedFilesRegex.exec(files);
             if (match == null) break;
 
-            if (originalFileName !== (match[2] || match[5])) continue;
+            [, status, file, renamed] = match;
 
-            ref = ` ${match[1]}`.substr(1);
-            file = ` ${match[3] || match[2] || match[6] || match[5]}`.substr(1);
-            status = match[4] ? (` ${match[4]}`.substr(1) as GitFileStatus) : undefined;
+            if (originalFileName !== file) continue;
+
+            // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
+            file = ` ${renamed || file}`.substr(1);
+            // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
+            status = status == null || status.length === 0 ? undefined : ` ${status}`.substr(1);
+
+            break;
         } while (match != null);
 
         // Ensure the regex state is reset
-        logFileSimpleRegex.lastIndex = 0;
+        logFileSimpleRenamedFilesRegex.lastIndex = 0;
 
-        return [ref, file, status];
+        // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869
+        return [` ${ref}`.substr(1), file, status as GitFileStatus | undefined];
     }
 }

src/quickpicks/commitFileQuickPick.ts

@@ -1,28 +1,24 @@
 'use strict';
 import * as paths from 'path';
-import { QuickPickItem, Uri, window } from 'vscode';
+import { commands, QuickPickItem, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
 import {
     Commands,
     CopyMessageToClipboardCommandArgs,
     CopyShaToClipboardCommandArgs,
     DiffWithPreviousCommandArgs,
     DiffWithWorkingCommandArgs,
     openEditor,
+    OpenWorkingFileCommandArgs,
     ShowQuickCommitDetailsCommandArgs,
     ShowQuickCommitFileDetailsCommandArgs,
     ShowQuickFileHistoryCommandArgs
 } from '../commands';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
 import { GitLog, GitLogCommit, GitService, GitUri, RemoteResourceType } from '../git/gitService';
-import { KeyCommand, KeyNoopCommand } from '../keyboard';
+import { KeyCommand, KeyNoopCommand, Keys } from '../keyboard';
 import { Strings } from '../system';
-import {
-    CommandQuickPickItem,
-    getQuickPickIgnoreFocusOut,
-    KeyCommandQuickPickItem,
-    OpenFileCommandQuickPickItem
-} from './commonQuickPicks';
+import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, KeyCommandQuickPickItem } from './commonQuickPicks';
 import { OpenRemotesCommandQuickPickItem } from './remotesQuickPick';
 
 export class ApplyCommitFileChangesCommandQuickPickItem extends CommandQuickPickItem {
@@ -41,28 +37,50 @@ export class ApplyCommitFileChangesCommandQuickPickItem extends CommandQuickPick
 
     async execute(): Promise<{} | undefined> {
         const uri = this.commit.toGitUri();
-        void (await openEditor(uri, { preserveFocus: true, preview: false }));
+
+        // Open the working file to ensure undo will work
+        const args: OpenWorkingFileCommandArgs = {
+            uri: uri,
+            showOptions: { preserveFocus: true, preview: false }
+        };
+        void (await commands.executeCommand(Commands.OpenWorkingFile, undefined, args));
 
         void (await Container.git.applyChangesToWorkingFile(uri));
 
         return undefined;
     }
 }
 
-export class OpenCommitFileCommandQuickPickItem extends OpenFileCommandQuickPickItem {
-    constructor(commit: GitLogCommit, item?: QuickPickItem) {
-        const uri = GitUri.resolveToUri(commit.fileName, commit.repoPath);
+export class OpenCommitFileCommandQuickPickItem extends CommandQuickPickItem {
+    constructor(private readonly _commit: GitLogCommit, item?: QuickPickItem) {
         super(
-            uri,
             item || {
                 label: '$(file-symlink-file) Open File',
-                description: `${Strings.pad(GlyphChars.Dash, 2, 3)} ${paths.basename(commit.fileName)}`
+                description: `${Strings.pad(GlyphChars.Dash, 2, 3)} ${paths.basename(_commit.fileName)}`
             }
         );
     }
+
+    execute(options?: TextDocumentShowOptions): Thenable<TextEditor | undefined> {
+        const uri = this._commit.toGitUri();
+        const args: OpenWorkingFileCommandArgs = {
+            uri: uri,
+            showOptions: options
+        };
+        return commands.executeCommand(Commands.OpenWorkingFile, undefined, args);
+    }
+
+    onDidPressKey(key: Keys): Thenable<{} | undefined> {
+        return this.execute({
+            preserveFocus: true,
+            preview: false
+        });
+    }
 }
 
-export class OpenCommitFileRevisionCommandQuickPickItem extends OpenFileCommandQuickPickItem {
+export class OpenCommitFileRevisionCommandQuickPickItem extends CommandQuickPickItem {
+    private readonly _uri: Uri;
+
     constructor(commit: GitLogCommit, item?: QuickPickItem) {
         let description: string;
         let uri: Uri;
@@ -78,13 +96,26 @@ export class OpenCommitFileRevisionCommandQuickPickItem extends OpenFileCommandQ
                 GlyphChars.Space
             }$(git-commit) ${commit.shortSha}`;
         }
+
         super(
-            uri,
             item || {
                 label: '$(file-symlink-file) Open Revision',
                 description: description
             }
         );
+
+        this._uri = uri;
+    }
+
+    execute(options?: TextDocumentShowOptions): Thenable<TextEditor | undefined> {
+        return openEditor(this._uri, options);
+    }
+
+    onDidPressKey(key: Keys): Thenable<{} | undefined> {
+        return this.execute({
+            preserveFocus: true,
+            preview: false
+        });
     }
 }