Fixes #409 - removes $(ellipsis) from placeholder text

CHANGELOG.md

@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ## [Unreleased]
 ### Fixed
 - Fixes [#400](https://github.com/eamodio/vscode-gitlens/issues/412) - GitLens logging to debug console when debugging different extension
+- Fixes [#409](https://github.com/eamodio/vscode-gitlens/issues/409) - Literal $(ellipsis) inserted into commit QuickPick menu entry placeholder text
 
 ## [8.3.5] - 2018-06-08
 ### Fixed

src/quickPicks/commitFileQuickPick.ts

@@ -158,7 +158,7 @@ export class CommitFileQuickPick {
 
             items.push(new CommandQuickPickItem({
                 label: `$(clippy) Copy Commit Message to Clipboard`,
-                description: `${Strings.pad(GlyphChars.Dash, 2, 3)} ${commit.getShortMessage(`${GlyphChars.Space}$(ellipsis)`)}`
+                description: `${Strings.pad(GlyphChars.Dash, 2, 3)} ${commit.getShortMessage()}`
             }, Commands.CopyMessageToClipboard, [
                     uri,
                     {
@@ -312,7 +312,7 @@ export class CommitFileQuickPick {
 
         const pick = await window.showQuickPick(items, {
             matchOnDescription: true,
-            placeHolder: `${commit.getFormattedPath()} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${isUncommitted ? `Uncommitted ${GlyphChars.ArrowRightHollow} ` : ''}${commit.shortSha} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.author}, ${commit.formattedDate} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.getShortMessage(`${GlyphChars.Space}$(ellipsis)`)}`,
+            placeHolder: `${commit.getFormattedPath()} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${isUncommitted ? `Uncommitted ${GlyphChars.ArrowRightHollow} ` : ''}${commit.shortSha} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.author}, ${commit.formattedDate} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.getShortMessage()}`,
             ignoreFocusOut: getQuickPickIgnoreFocusOut(),
             onDidSelectItem: (item: QuickPickItem) => {
                 scope.setKeyCommand('right', item as KeyCommand);

src/quickPicks/commitQuickPick.ts

@@ -101,7 +101,7 @@ export class CommitQuickPick {
         if (stash) {
             items.splice(index++, 0, new CommandQuickPickItem({
                 label: `$(git-pull-request) Apply Stashed Changes`,
-                description: `${Strings.pad(GlyphChars.Dash, 2, 3)} ${commit.getShortMessage(`${GlyphChars.Space}$(ellipsis)`)}`
+                description: `${Strings.pad(GlyphChars.Dash, 2, 3)} ${commit.getShortMessage()}`
             }, Commands.StashApply, [
                     {
                         confirm: true,
@@ -114,7 +114,7 @@ export class CommitQuickPick {
 
             items.splice(index++, 0, new CommandQuickPickItem({
                 label: `$(x) Delete Stashed Changes`,
-                description: `${Strings.pad(GlyphChars.Dash, 2, 3)} ${commit.getShortMessage(`${GlyphChars.Space}$(ellipsis)`)}`
+                description: `${Strings.pad(GlyphChars.Dash, 2, 3)} ${commit.getShortMessage()}`
             }, Commands.StashDelete, [
                     {
                         confirm: true,
@@ -179,7 +179,7 @@ export class CommitQuickPick {
 
         items.splice(index++, 0, new CommandQuickPickItem({
             label: `$(clippy) Copy Commit Message to Clipboard`,
-            description: `${Strings.pad(GlyphChars.Dash, 2, 3)} ${commit.getShortMessage(`${GlyphChars.Space}$(ellipsis)`)}`
+            description: `${Strings.pad(GlyphChars.Dash, 2, 3)} ${commit.getShortMessage()}`
         }, Commands.CopyMessageToClipboard, [
                 uri,
                 {
@@ -303,7 +303,7 @@ export class CommitQuickPick {
         const pick = await window.showQuickPick(items, {
             matchOnDescription: true,
             matchOnDetail: true,
-            placeHolder: `${commit.shortSha} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.author ? `${commit.author}, ` : ''}${commit.formattedDate} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.getShortMessage(`${GlyphChars.Space}$(ellipsis)`)}`,
+            placeHolder: `${commit.shortSha} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.author ? `${commit.author}, ` : ''}${commit.formattedDate} ${Strings.pad(GlyphChars.Dot, 1, 1)} ${commit.getShortMessage()}`,
             ignoreFocusOut: getQuickPickIgnoreFocusOut(),
             onDidSelectItem: (item: QuickPickItem) => {
                 scope.setKeyCommand('right', item);

src/quickPicks/commonQuickPicks.ts

@@ -20,21 +20,21 @@ export function showQuickPickProgress(message: string, mapping?: KeyMapping): Ca
 }
 
 async function _showQuickPickProgress(message: string, cancellation: CancellationTokenSource, mapping?: KeyMapping) {
-        const scope = mapping && await Container.keyboard.beginScope(mapping);
+    const scope = mapping && await Container.keyboard.beginScope(mapping);
 
-        try {
-            await window.showQuickPick(_getInfiniteCancellablePromise(cancellation), {
-                placeHolder: message,
-                ignoreFocusOut: getQuickPickIgnoreFocusOut()
-            } as QuickPickOptions, cancellation.token);
-        }
-        catch (ex) {
-            // Not sure why this throws
-        }
-        finally {
-            cancellation.cancel();
-            scope && scope.dispose();
-        }
+    try {
+        await window.showQuickPick(_getInfiniteCancellablePromise(cancellation), {
+            placeHolder: message,
+            ignoreFocusOut: getQuickPickIgnoreFocusOut()
+        } as QuickPickOptions, cancellation.token);
+    }
+    catch (ex) {
+        // Not sure why this throws
+    }
+    finally {
+        cancellation.cancel();
+        scope && scope.dispose();
+    }
 }
 
 function _getInfiniteCancellablePromise(cancellation: CancellationTokenSource) {
@@ -155,7 +155,7 @@ export class CommitQuickPickItem implements QuickPickItem {
     detail: string;
 
     constructor(public readonly commit: GitLogCommit) {
-        const message = commit.getShortMessage(`${GlyphChars.Space}$(ellipsis)`);
+        const message = commit.getShortMessage();
         if (commit.isStash) {
             this.label = message;
             this.description = '';