User Story 1556891: [MIEngine Natvis] Support multi-dimensional arrays

src/MIDebugEngine/Natvis.Impl/Natvis.cs

@@ -590,6 +590,10 @@ private IVariableInformation[] ExpandVisualized(IVariableInformation variable)
                             string expressionValue = GetExpressionValue(item.Rank, variable, visualizer.ScopedNames);
                             rank = Int32.Parse(expressionValue, CultureInfo.InvariantCulture);
                         }
+                        if (rank <= 0)
+                        {
+                            throw new Exception("Invalid rank value");
+                        }
                         dimensions = new uint[rank];
                         for (int idx = 0; idx < rank; idx++)
                         {
@@ -655,7 +659,7 @@ private IVariableInformation[] ExpandVisualized(IVariableInformation variable)
                                 for (uint index = 0; index < requestedSize; ++index)
                                 {
                                     string displayName = (startIndex + index).ToString(CultureInfo.InvariantCulture);
-                                    if (rank > 0)
+                                    if (rank > 1)
                                     {
                                         displayName = GetDisplayNameFromArrayIndex(index, rank, dimensions, isForward);
                                     }

test/CppTests/Tests/NatvisTests.cs

@@ -177,8 +177,8 @@ public void TestArrayItems(ITestSettings settings)
                     Assert.Equal("51", ll.GetVariable("[More...]").GetVariable("[51]").Value);
 
                     // Multi-dimensional array
-                    var c = currentFrame.GetVariable("c");
-                    Assert.Equal("3", c.GetVariable("[1,1]").Value);
+                    var matrix = currentFrame.GetVariable("matrix");
+                    Assert.Equal("3", matrix.GetVariable("[1,1]").Value);
                 }
 
                 runner.Expects.ExitedEvent(exitCode: 0).TerminatedEvent().AfterContinue();

test/CppTests/debuggees/natvis/src/C.h → test/CppTests/debuggees/natvis/src/SimpleMatrix.h

@@ -1,12 +1,12 @@
-class C
+class SimpleMatrix
 {
 public:
     int m_size1;
     int m_size2;
     bool m_fUseSize1;
     int* m_pData;
 
-    C(int size1, int size2, bool fUseSize1)
+    SimpleMatrix(int size1, int size2, bool fUseSize1)
     {
         m_size1 = size1;
         m_size2 = size2;

test/CppTests/debuggees/natvis/src/main.cpp

@@ -3,7 +3,7 @@
 #include "SimpleVector.h"
 #include "SimpleArray.h"
 #include "SimpleClass.h"
-#include "C.h"
+#include "SimpleMatrix.h"
 
 class SimpleDisplayObject
 {
@@ -46,7 +46,7 @@ int main(int argc, char** argv)
     SimpleClass* simpleClass = nullptr;
     simpleClass = new SimpleClass();
 
-    C c(5, 8, false);
+    SimpleMatrix matrix(5, 8, false);
 
     return 0;
 }