Merge pull request #1285 from microsoft/main

Merge 'main' into 'release-cpptools'
microsoft · Mar 5, 2022 · c405048 · c405048
2 parents b7e3d6f + de8db64
commit c405048
Show file tree

Hide file tree

Showing 10 changed files with 116 additions and 20 deletions.
diff --git a/.github/workflows/Build-And-Test.yml b/.github/workflows/Build-And-Test.yml
@@ -172,6 +172,7 @@ jobs:
       run: dotnet build ${{ github.workspace }}/src/MIDebugEngine-Unix.sln
 
     - run: |
+        sudo apt update
         sudo apt-get install gdb g++ -y
         which g++
         which gdb

diff --git a/src/MIDebugEngine/Engine.Impl/DebuggedProcess.cs b/src/MIDebugEngine/Engine.Impl/DebuggedProcess.cs
@@ -1234,8 +1234,13 @@ private async Task HandleBreakModeEvent(ResultEventArgs results, BreakRequest br
                     }
                     else
                     {
-                        // not one of our breakpoints, so stop with a message
-                        _callback.OnException(thread, "Unknown breakpoint", "", 0);
+                        // This is not one of our breakpoints, so stop with a message. Possibly it
+                        // was set by the user via "-exec break ...", so display the available
+                        // information.
+                        string desc = String.Format(CultureInfo.CurrentCulture,
+                                                    ResourceStrings.UnknownBreakpoint,
+                                                    bkptno, addr);
+                        _callback.OnException(thread, desc, "", 0);
                     }
                 }
             }
@@ -1263,8 +1268,40 @@ private async Task HandleBreakModeEvent(ResultEventArgs results, BreakRequest br
                     }
                     else
                     {
-                        // not one of our breakpoints, so stop with a message
-                        _callback.OnException(thread, "Unknown watchpoint", "", 0);
+                        // This is not one of our watchpoints, so stop with a message. Possibly it
+                        // was set by the user via "-exec watch ...", so display the available
+                        // information.
+                        string desc = string.Empty;
+                        string exp = wpt.TryFindString("exp");
+                        if (string.IsNullOrEmpty(exp)) {
+                            desc = String.Format(CultureInfo.CurrentCulture,
+                                                 ResourceStrings.UnknownWatchpoint,
+                                                 bkptno, addr);
+                        }
+                        else
+                        {
+                            desc = String.Format(CultureInfo.CurrentCulture,
+                                                 ResourceStrings.UnknownWatchpointWithExpression,
+                                                 bkptno, exp, addr);
+                        }
+                        var value = results.Results.TryFind<TupleValue>("value");
+                        if (value != null) {
+                            string oldValue = value.TryFindString("old");
+                            if (!string.IsNullOrEmpty(oldValue)) {
+                                desc += "\n";
+                                desc += String.Format(CultureInfo.CurrentCulture,
+                                                      ResourceStrings.UnknownWatchpointOldValue,
+                                                      oldValue);
+                            }
+                            string newValue = value.TryFindString("new");
+                            if (!string.IsNullOrEmpty(newValue)) {
+                                desc += "\n";
+                                desc += String.Format(CultureInfo.CurrentCulture,
+                                                      ResourceStrings.UnknownWatchpointNewValue,
+                                                      newValue);
+                            }
+                        }
+                        _callback.OnException(thread, desc, "", 0);
                     }
                 }
             }

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);

diff --git a/src/MIDebugEngine/ResourceStrings.Designer.cs b/src/MIDebugEngine/ResourceStrings.Designer.cs
diff --git a/src/MIDebugEngine/ResourceStrings.resx b/src/MIDebugEngine/ResourceStrings.resx
@@ -270,4 +270,24 @@ See https://aka.ms/miengine-gdb-troubleshooting for details.</value>
     <value>Exception{0} thrown at 0x{1:X} in {2}.</value>
     <comment>0 = optional exception name, 1 = address, 2 = exception file</comment>
   </data>
+  <data name="UnknownBreakpoint" xml:space="preserve">
+    <value>Hit breakpoint {0} at 0x{1:x}.</value>
+    <comment>0 = breakpoint number, 1 = address</comment>
+  </data>
+  <data name="UnknownWatchpoint" xml:space="preserve">
+    <value>Hit watchpoint {0} at 0x{1:x}.</value>
+    <comment>0 = watchpoint number, 1 = address</comment>
+  </data>
+  <data name="UnknownWatchpointWithExpression" xml:space="preserve">
+    <value>Hit watchpoint {0}: {1} at 0x{2:x}.</value>
+    <comment>0 = watchpoint number, 1 = expression, 2 = address</comment>
+  </data>
+  <data name="UnknownWatchpointOldValue" xml:space="preserve">
+    <value>Old value = {0}</value>
+    <comment>0 = old value of watchpoint</comment>
+  </data>
+  <data name="UnknownWatchpointNewValue" xml:space="preserve">
+    <value>New value = {0}</value>
+    <comment>0 = new value of watchpoint</comment>
+  </data>
 </root>
diff --git a/src/MIDebugPackage/MIDebugPackage.csproj b/src/MIDebugPackage/MIDebugPackage.csproj
@@ -58,7 +58,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="Resources\Package.ico" />
     <Content Include="OpenFolderSchema.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>

diff --git a/src/MIDebugPackage/MIDebugPackagePackage.cs b/src/MIDebugPackage/MIDebugPackagePackage.cs
@@ -31,10 +31,7 @@ namespace Microsoft.MIDebugPackage
     /// </summary>
     // This attribute tells the PkgDef creation utility (CreatePkgDef.exe) that this class is
     // a package.
-    [PackageRegistration(UseManagedResourcesOnly = true)]
-    // This attribute is used to register the information needed to show this package
-    // in the Help/About dialog of Visual Studio.
-    [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
+    [PackageRegistration(UseManagedResourcesOnly = true)]    
     // This attribute is needed to let the shell know that this package exposes some menus.
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [Guid(GuidList.guidMIDebugPackagePkgString)]

diff --git a/src/MIDebugPackage/Resources/Package.ico b/src/MIDebugPackage/Resources/Package.ico
diff --git a/src/MIDebugPackage/VSPackage.resx b/src/MIDebugPackage/VSPackage.resx
@@ -117,14 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="110" xml:space="preserve">
-    <value>Microsoft MI-Based Debugger</value>
-  </data>
-  <data name="112" xml:space="preserve">
-    <value>Provides support for connecting Visual Studio to MI compatible debuggers</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\Package.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>