From bce262ab46a8e485febb8e8b6311356ea7571af1 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sun, 1 Dec 2019 19:46:13 +1100
Subject: Backport: Improve debugging by fixing visualization of SplitVector,
 adding a visualization for Partitioning, and removing a layer from
 unique_ptr.

Backport of changeset 7776:ae7f68d17fc8.
---
 test/unit/Sci.natvis | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'test')

diff --git a/test/unit/Sci.natvis b/test/unit/Sci.natvis
index 0646036ba..d6ac2b96c 100644
--- a/test/unit/Sci.natvis
+++ b/test/unit/Sci.natvis
@@ -1,20 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-  <Type Name="SplitVector&lt;*&gt;">
+  <Type Name="Scintilla::SplitVector&lt;*&gt;">
     <DisplayString>{{size = {lengthBody}}}</DisplayString>
     <Expand>
       <Item Name="[size]">lengthBody</Item>
-      <Item Name="[capacity]">(size)</Item>
       <Item Name="[part1Length]">part1Length</Item>
       <Item Name="[gap]">gapLength</Item>
-      <ArrayItems>
-        <Size>part1Length</Size>
-        <ValuePointer>body</ValuePointer>
-      </ArrayItems>
-      <ArrayItems>
-        <Size>lengthBody-part1Length</Size>
-        <ValuePointer>body+part1Length+gapLength</ValuePointer>
-      </ArrayItems>
+      <IndexListItems>
+        <Size>lengthBody</Size>
+        <ValueNode>body[($i&lt;part1Length)?$i:$i+gapLength]</ValueNode>
+      </IndexListItems>
+    </Expand>
+  </Type>
+  <Type Name="Scintilla::Partitioning&lt;*&gt;">
+    <DisplayString>{{size = {body->lengthBody}}}</DisplayString>
+    <Expand>
+      <IndexListItems>
+        <Size>body->lengthBody</Size>
+        <ValueNode>body->body[($i&lt;body->part1Length)?$i:$i+body->gapLength]+($i&gt;stepPartition?stepLength:0)</ValueNode>
+      </IndexListItems>
+    </Expand>
+  </Type>
+  <Type Name="std::unique_ptr&lt;*&gt;">
+    <SmartPointer Usage="Minimal">_Mypair._Myval2</SmartPointer>
+    <DisplayString Condition="_Mypair._Myval2 == 0">empty</DisplayString>
+    <DisplayString Condition="_Mypair._Myval2 != 0">unique_ptr {*_Mypair._Myval2}</DisplayString>
+    <Expand>
+      <ExpandedItem Condition="_Mypair._Myval2 != 0">_Mypair._Myval2</ExpandedItem>
+      <ExpandedItem Condition="_Mypair._Myval2 != 0">_Mypair</ExpandedItem>
     </Expand>
   </Type>
 </AutoVisualizer>
-- 
cgit v1.2.3