@@ -106,7 +106,7 @@ private static string GetUnquotedText(CompletionResult match, bool consistentQuo
             {
                 if (IsQuotedVariable(s))
                 {
-                    return '$' + s.Substring(2, s.Length - 3);
+                    return s[0] + s.Substring(2, s.Length - 3);
                 }
                 return s;
             }
@@ -731,7 +731,7 @@ private Collection<CompletionResult> FilterCompletions(CommandCompletion complet
 
         private int FindUserCompletionTextPosition(CompletionResult match, string userCompletionText)
         {
-            return match.ResultType == CompletionResultType.Variable && match.CompletionText[1] == '{'
+            return match.ResultType == CompletionResultType.Variable && userCompletionText.Length > 1 && match.CompletionText[1] == '{'
                 ? match.CompletionText.IndexOf(userCompletionText.Substring(1), StringComparison.OrdinalIgnoreCase) - 1
                 : match.CompletionText.IndexOf(userCompletionText, StringComparison.OrdinalIgnoreCase);
         }
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ private static string GetUnquotedText(CompletionResult match, bool consistentQuo`
`106`	`106`	`{`
`107`	`107`	`if (IsQuotedVariable(s))`
`108`	`108`	`{`
`109`		`- return '$' + s.Substring(2, s.Length - 3);`
	`109`	`+ return s[0] + s.Substring(2, s.Length - 3);`
`110`	`110`	`}`
`111`	`111`	`return s;`
`112`	`112`	`}`
`@@ -731,7 +731,7 @@ private Collection<CompletionResult> FilterCompletions(CommandCompletion complet`
`731`	`731`
`732`	`732`	`private int FindUserCompletionTextPosition(CompletionResult match, string userCompletionText)`
`733`	`733`	`{`
`734`		`- return match.ResultType == CompletionResultType.Variable && match.CompletionText[1] == '{'`
	`734`	`+ return match.ResultType == CompletionResultType.Variable && userCompletionText.Length > 1 && match.CompletionText[1] == '{'`
`735`	`735`	`? match.CompletionText.IndexOf(userCompletionText.Substring(1), StringComparison.OrdinalIgnoreCase) - 1`
`736`	`736`	`: match.CompletionText.IndexOf(userCompletionText, StringComparison.OrdinalIgnoreCase);`
`737`	`737`	`}`