Fix #1059: String "interpolation", invalid cast when emitting "IL wit…

…h C#"
icsharpcode · Feb 24, 2018 · 0ffc747 · 0ffc747
1 parent 3892762
commit 0ffc747
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs
@@ -985,11 +985,11 @@ public virtual void VisitInterpolatedStringExpression(InterpolatedStringExpressi
 		{
 			StartNode(interpolatedStringExpression);
 
-			writer.WriteToken(Roles.Error, "$\"");
+			writer.WriteToken(InterpolatedStringExpression.OpenQuote, "$\"");
 			foreach (var element in interpolatedStringExpression.Content) {
 				element.AcceptVisitor(this);
 			}
-			writer.WriteToken(Roles.Error, "\"");
+			writer.WriteToken(InterpolatedStringExpression.CloseQuote, "\"");
 			isAfterSpace = false;
 
 			EndNode(interpolatedStringExpression);

diff --git a/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/InterpolatedStringExpression.cs b/ICSharpCode.Decompiler/CSharp/Syntax/Expressions/InterpolatedStringExpression.cs
@@ -7,6 +7,9 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
 {
 	public class InterpolatedStringExpression : Expression
 	{
+		public static readonly TokenRole OpenQuote = new TokenRole("$\"");
+		public static readonly TokenRole CloseQuote = new TokenRole("\"");
+
 		public AstNodeCollection<InterpolatedStringContent> Content {
 			get { return GetChildrenByRole(InterpolatedStringContent.Role); }
 		}