Prevent stripping of format specifiers from -exec commands. (#1277)

microsoft · Feb 25, 2022 · 88ecee4 · 88ecee4
1 parent a109b93
commit 88ecee4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/MIDebugEngine/Engine.Impl/Variables.cs b/src/MIDebugEngine/Engine.Impl/Variables.cs
@@ -368,6 +368,12 @@ public enum NodeType
         private string StripFormatSpecifier(string exp, out string formatSpecifier)
         {
             formatSpecifier = null; // will be used with -var-set-format
+
+            if (EngineUtils.IsConsoleExecCmd(exp, out string _, out string _))
+            {
+                return exp;
+            }
+
             int lastComma = exp.LastIndexOf(',');
             if (lastComma <= 0)
                 return exp;

diff --git a/src/MIDebugEngine/Natvis.Impl/Natvis.cs b/src/MIDebugEngine/Natvis.Impl/Natvis.cs
@@ -426,7 +426,8 @@ internal IVariableInformation[] Expand(IVariableInformation variable)
         internal IVariableInformation GetVariable(string expr, AD7StackFrame frame)
         {
             IVariableInformation variable;
-            if (expr.EndsWith(",viz", StringComparison.Ordinal))
+            if (!EngineUtils.IsConsoleExecCmd(expr, out string _, out string _)
+                && expr.EndsWith(",viz", StringComparison.Ordinal))
             {
                 expr = expr.Substring(0, expr.Length - 4);
                 variable = new VariableInformation(expr, expr, frame.ThreadContext, frame.Engine, frame.Thread);