From e7d29479e41d29fe43ea84a6d7e42d89be7c6441 Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Thu, 29 Feb 2024 15:11:56 +0100
Subject: [PATCH] natvis: drop simple views for ecs module

---
 natvis/entt/entity.natvis | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/natvis/entt/entity.natvis b/natvis/entt/entity.natvis
index e843d36d6..10b733272 100644
--- a/natvis/entt/entity.natvis
+++ b/natvis/entt/entity.natvis
@@ -7,17 +7,13 @@
 			<Synthetic Name="[pools]">
 				<DisplayString>{ pools.size() }</DisplayString>
 				<Expand>
-					<IndexListItems ExcludeView="simple">
+					<IndexListItems>
 						<Size>pools.size()</Size>
 						<ValueNode>*pools.packed.first_base::value[$i].element.second</ValueNode>
 					</IndexListItems>
-					<IndexListItems IncludeView="simple">
-						<Size>pools.size()</Size>
-						<ValueNode>*pools.packed.first_base::value[$i].element.second,view(simple)</ValueNode>
-					</IndexListItems>
 				</Expand>
 			</Synthetic>
-			<Item Name="[groups]" ExcludeView="simple">groups.size()</Item>
+			<Item Name="[groups]">groups.size()</Item>
 			<Synthetic Name="[vars]">
 				<DisplayString>{ vars.ctx.size() }</DisplayString>
 				<Expand>
@@ -33,14 +29,13 @@
 		<Intrinsic Name="cap" Expression="(traits_type::version_mask &lt;&lt; traits_type::length)"/>
 		<DisplayString>{{ size={ packed.size() }, type={ info->alias,na } }}</DisplayString>
 		<Expand>
-			<Item Name="[capacity]" ExcludeView="simple">packed.capacity()</Item>
+			<Item Name="[capacity]">packed.capacity()</Item>
 			<Item Name="[policy]">mode,en</Item>
 			<Item Name="[free_list]">head</Item>
 			<Synthetic Name="[sparse]">
 				<DisplayString>{ sparse.size() * traits_type::page_size }</DisplayString>
 				<Expand>
-					<ExpandedItem IncludeView="simple">sparse,view(simple)</ExpandedItem>
-					<CustomListItems ExcludeView="simple">
+					<CustomListItems>
 						<Variable Name="pos" InitialValue="0"/>
 						<Variable Name="page" InitialValue="0"/>
 						<Variable Name="offset" InitialValue="0"/>
@@ -60,8 +55,7 @@
 			<Synthetic Name="[packed]">
 				<DisplayString>{ packed.size() }</DisplayString>
 				<Expand>
-					<ExpandedItem IncludeView="simple">packed,view(simple)</ExpandedItem>
-					<CustomListItems ExcludeView="simple">
+					<CustomListItems>
 						<Variable Name="pos" InitialValue="0"/>
 						<Variable Name="last" InitialValue="packed.size()"/>
 						<Loop>
@@ -80,11 +74,10 @@
 		<Intrinsic Name="cap" Expression="(base_type::traits_type::version_mask &lt;&lt; base_type::traits_type::length)"/>
 		<DisplayString>{{ size={ base_type::packed.size() }, type={ base_type::info->alias,na } }}</DisplayString>
 		<Expand>
-			<Item Name="[capacity]" Optional="true" ExcludeView="simple">payload.capacity() * traits_type::page_size</Item>
-			<Item Name="[page size]" Optional="true" ExcludeView="simple">traits_type::page_size</Item>
-			<Item Name="[placeholder]" Optional="true" ExcludeView="simple">placeholder</Item>
-			<Item Name="[base]" ExcludeView="simple">(base_type*)this,nand</Item>
-			<Item Name="[base]" IncludeView="simple">(base_type*)this,view(simple)nand</Item>
+			<Item Name="[capacity]" Optional="true">payload.capacity() * traits_type::page_size</Item>
+			<Item Name="[page size]" Optional="true">traits_type::page_size</Item>
+			<Item Name="[placeholder]" Optional="true">placeholder</Item>
+			<Item Name="[base]">(base_type*)this,nand</Item>
 			<!-- having SFINAE-like techniques in natvis is priceless :) -->
 			<CustomListItems Condition="payload.size() != 0" Optional="true">
 				<Variable Name="pos" InitialValue="0" />