From 46e23787795e967493d4199126b7bb821bf55b4c Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@ioninteractive.com>
Date: Sat, 12 Nov 2016 04:42:55 -0500
Subject: [PATCH] Fixes issue with unencoded chars in uri

---
 src/gitProvider.ts | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/gitProvider.ts b/src/gitProvider.ts
index 5ebabd0..9fa85c3 100644
--- a/src/gitProvider.ts
+++ b/src/gitProvider.ts
@@ -332,9 +332,7 @@ export default class GitProvider extends Disposable {
             if (c.isUncommitted) return;
 
             const decoration = `\u2937 ${c.author}, ${moment(c.date).format('MMMM Do, YYYY h:MMa')}`;
-            const uri = c.originalFileName
-                ? GitProvider.toGitUri(c, i + 1, commitCount, c.originalFileName, decoration)
-                : GitProvider.toGitUri(c, i + 1, commitCount, undefined, decoration);
+            const uri = GitProvider.toGitUri(c, i + 1, commitCount, c.originalFileName, decoration);
             locations.push(new Location(uri, new Position(0, 0)));
             if (c.sha === selectedSha) {
                 locations.push(new Location(uri, new Position(line + 1, 0)));
@@ -418,9 +416,7 @@ export default class GitProvider extends Disposable {
             if (c.isUncommitted) return;
 
             const decoration = `\u2937 ${c.author}, ${moment(c.date).format('MMMM Do, YYYY h:MMa')}`;
-            const uri = c.originalFileName
-                ? GitProvider.toGitUri(c, i + 1, commitCount, c.originalFileName, decoration)
-                : GitProvider.toGitUri(c, i + 1, commitCount, undefined, decoration);
+            const uri = GitProvider.toGitUri(c, i + 1, commitCount, c.originalFileName, decoration);
             locations.push(new Location(uri, new Position(0, 0)));
             if (c.sha === selectedSha) {
                 locations.push(new Location(uri, new Position(line + 1, 0)));
@@ -491,16 +487,15 @@ export default class GitProvider extends Disposable {
     private static _toGitUri(commit: GitCommit, scheme: DocumentSchemes, commitCount: number, data: IGitUriData) {
         const pad = (n: number) => ('0000000' + n).slice(-('' + commitCount).length);
         const ext = path.extname(data.fileName);
-        // const uriPath = `${dirname(data.fileName)}/${commit.sha}: ${basename(data.fileName, ext)}${ext}`;
         const uriPath = `${path.relative(commit.repoPath, data.fileName.slice(0, -ext.length))}/${commit.sha}${ext}`;
 
         let message = commit.message;
         if (message.length > 50) {
             message = message.substring(0, 49) + '\u2026';
         }
+
         // NOTE: Need to specify an index here, since I can't control the sort order -- just alphabetic or by file location
-        //return Uri.parse(`${scheme}:${pad(data.index)}. ${commit.author}, ${moment(commit.date).format('MMM D, YYYY hh:MMa')} - ${uriPath}?${JSON.stringify(data)}`);
-        return Uri.parse(`${scheme}:${pad(data.index)} \u2022 ${message} \u2022 ${moment(commit.date).format('MMM D, YYYY hh:MMa')} \u2022 ${uriPath}?${JSON.stringify(data)}`);
+        return Uri.parse(`${scheme}:${pad(data.index)} \u2022 ${encodeURIComponent(message)} \u2022 ${moment(commit.date).format('MMM D, YYYY hh:MMa')} \u2022 ${encodeURIComponent(uriPath)}?${JSON.stringify(data)}`);
     }
 
     private static _toGitUriData<T extends IGitUriData>(commit: GitCommit, index: number, originalFileName?: string, decoration?: string): T {