Fix coloring in generic tokens

lzybkr · lzybkr · commit 99dbbe0108cf · 2013-09-19T13:53:57.000-07:00
diff --git a/PSReadLine/ReadLine.cs b/PSReadLine/ReadLine.cs
@@ -1490,10 +1490,10 @@ private void Render()
                     foregroundColor = _tokenForegroundColors[(int)GetTokenClassification(token)];
                     backgroundColor = _tokenBackgroundColors[(int)GetTokenClassification(token)];
 
-                    if (token.Kind == TokenKind.StringExpandable || token.Kind == TokenKind.HereStringExpandable)
+                    var stringToken = token as StringExpandableToken;
+                    if (stringToken != null)
                     {
                         // We might have nested tokens.
-                        var stringToken = (StringExpandableToken)token;
                         if (stringToken.NestedTokens != null && stringToken.NestedTokens.Any())
                         {
                             var tokens = new Token[stringToken.NestedTokens.Count + 1];

Original file line number	Diff line number	Diff line change
`@@ -1490,10 +1490,10 @@ private void Render()`
`1490`	`1490`	`foregroundColor = _tokenForegroundColors[(int)GetTokenClassification(token)];`
`1491`	`1491`	`backgroundColor = _tokenBackgroundColors[(int)GetTokenClassification(token)];`
`1492`	`1492`
`1493`		`- if (token.Kind == TokenKind.StringExpandable \|\| token.Kind == TokenKind.HereStringExpandable)`
	`1493`	`+ var stringToken = token as StringExpandableToken;`
	`1494`	`+ if (stringToken != null)`
`1494`	`1495`	`{`
`1495`	`1496`	`// We might have nested tokens.`
`1496`		`- var stringToken = (StringExpandableToken)token;`
`1497`	`1497`	`if (stringToken.NestedTokens != null && stringToken.NestedTokens.Any())`
`1498`	`1498`	`{`
`1499`	`1499`	`var tokens = new Token[stringToken.NestedTokens.Count + 1];`