From 4ae16c27e2db2002fa4550c762ea405bff492a03 Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Wed, 23 Oct 2019 10:39:23 +0300
Subject: [PATCH] - added Visual Studio debugger visualization for several
 types

---
 src/CMakeLists.txt     |  1 +
 src/utility/tarray.h   |  2 +
 src/win32/zdoom.natvis | 83 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 src/win32/zdoom.natvis

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 182eced71..6f6ece0a2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -743,6 +743,7 @@ set( NOT_COMPILED_SOURCE_FILES
 	scripting/zscript/zcc-parse.lemon
 	zcc-parse.c
 	zcc-parse.h
+	win32/zdoom.natvis
 )
 
 set( VM_JIT_SOURCES
diff --git a/src/utility/tarray.h b/src/utility/tarray.h
index ac84da6c7..ca4d86bc7 100644
--- a/src/utility/tarray.h
+++ b/src/utility/tarray.h
@@ -619,6 +619,7 @@ public:
 
 	typedef TIterator<T>                       iterator;
 	typedef TIterator<const T>                 const_iterator;
+	typedef T                                  value_type;
 
 	iterator begin()
 	{
@@ -1478,6 +1479,7 @@ public:
 
 	typedef TIterator<T>                       iterator;
 	typedef TIterator<const T>                 const_iterator;
+	typedef T                                  value_type;
 
 	iterator begin()
 	{
diff --git a/src/win32/zdoom.natvis b/src/win32/zdoom.natvis
new file mode 100644
index 000000000..d22342cc0
--- /dev/null
+++ b/src/win32/zdoom.natvis
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+
+<Type Name="TArray&lt;*&gt;">
+    <DisplayString>Size = {Count}</DisplayString>
+    <Expand>
+        <Item Name="Size">Count</Item>
+        <Item Name="Capacity">Most</Item>
+        <ArrayItems>
+            <Size>Count</Size>
+            <ValuePointer>(value_type*)Array</ValuePointer>
+        </ArrayItems>
+    </Expand>
+</Type>
+
+<Type Name="TArrayView&lt;*&gt;">
+    <DisplayString>Size = {Count}</DisplayString>
+    <Expand>
+        <Item Name="Size">Count</Item>
+        <ArrayItems>
+            <Size>Count</Size>
+            <ValuePointer>(value_type*)Array</ValuePointer>
+        </ArrayItems>
+    </Expand>
+</Type>
+
+<Type Name="TStaticPointedArray&lt;*&gt;">
+    <DisplayString>Size = {Count}</DisplayString>
+    <Expand>
+        <Item Name="Size">Count</Item>
+        <ArrayItems>
+            <Size>Count</Size>
+            <ValuePointer>(value_type*)Array</ValuePointer>
+        </ArrayItems>
+    </Expand>
+</Type>
+
+<Type Name="FName">
+    <DisplayString>{FName::NameData.NameArray[Index].Text, s}</DisplayString>
+</Type>
+
+<Type Name="FString">
+    <DisplayString>{Chars, s}</DisplayString>
+    <Expand>
+        <Item Name="Size">((FStringData*)Chars - 1)->Len</Item>
+        <Item Name="Capacity">((FStringData*)Chars - 1)->AllocLen</Item>
+        <Item Name="Reference Count">((FStringData*)Chars - 1)->RefCount</Item>
+    </Expand>
+</Type>
+
+<Type Name="TAngle&lt;*&gt;">
+    <DisplayString>{Degrees}</DisplayString>
+</Type>
+
+<Type Name="PClass">
+    <DisplayString>{TypeName}</DisplayString>
+</Type>
+
+<Type Name="DObject">
+    <DisplayString>{Class->TypeName}</DisplayString>
+</Type>
+
+<Type Name="TObjPtr&lt;*&gt;">
+    <DisplayString Condition="o == nullptr">&lt;NULL&gt;</DisplayString>
+    <DisplayString Condition="o != nullptr">{o->Class->TypeName}</DisplayString>
+</Type>
+
+<Type Name="FTextureID">
+    <DisplayString Condition="texnum == -1">&lt;None&gt;</DisplayString>
+    <DisplayString Condition="texnum != -1">{TexMan.Textures[texnum].Texture->Name}</DisplayString>
+    <Expand>
+        <Item Name="Index">texnum</Item>
+        <Item Name="Texture">TexMan.Textures[texnum].Texture</Item>
+    </Expand>
+</Type>
+
+<Type Name="FSoundID">
+    <DisplayString Condition="ID == 0">&lt;None&gt;</DisplayString>
+    <DisplayString Condition="ID != 0">{S_sfx[ID].name}</DisplayString>
+</Type>
+
+</AutoVisualizer>