Unify radius jewel tooltip comparison caching

Use the existing output cache for slot-only and multi-slot hovers instead of retaining temporary passive specs. Keep calculation-only specs free of UI path data while preserving socket distances. This reduces duplicate state and repeated calculations without changing tooltip content.

Author: mcagnion

spec/System/TestRadiusJewelStatDiff_spec.lua

@@ -668,7 +668,7 @@ describe("TestRadiusJewelStatDiff", function()
 			"limited unique radius jewels should rebuild only the same-unique slot that will be displayed")
 	end)
 
-	it("AddItemTooltip reuses slot-only radius jewel comparison specs until output changes", function()
+	it("AddItemTooltip reuses slot-only radius jewel comparison outputs until output changes", function()
 		local spec, sockets = setupAllocatedSockets(2)
 
 		local item = newCustomLeapJewel("Cached Leap")
@@ -678,29 +678,50 @@ describe("TestRadiusJewelStatDiff", function()
 
 		local originalSlotOnlyTooltips = main.slotOnlyTooltips
 		main.slotOnlyTooltips = true
+		build.itemsTab.jewelComparisonOutputCache = nil
 		local specClass = getmetatable(spec)
 		local originalBuildAllDependsAndPaths = specClass.BuildAllDependsAndPaths
 		local rebuilds = 0
 		specClass.BuildAllDependsAndPaths = function(self, ...)
 			rebuilds = rebuilds + 1
 			return originalBuildAllDependsAndPaths(self, ...)
 		end
+		local originalGetMiscCalculator = build.calcsTab.GetMiscCalculator
+		local calcCalls = 0
+		build.calcsTab.GetMiscCalculator = function(self, ...)
+			local calcFunc, calcBase = originalGetMiscCalculator(self, ...)
+			return function(...)
+				calcCalls = calcCalls + 1
+				return calcFunc(...)
+			end, calcBase
+		end
 
 		local ok, err = pcall(function()
 			local tooltip = new("Tooltip"):Tooltip()
 			build.itemsTab:AddItemTooltip(tooltip, item, slot)
+			local firstPassTooltipText = tooltipText(tooltip)
+			local firstPassCalcCalls = calcCalls
+			assert.is_true(firstPassCalcCalls > 0,
+				"slot-only radius jewel hover should calculate its output on first pass")
 			tooltip = new("Tooltip"):Tooltip()
 			build.itemsTab:AddItemTooltip(tooltip, item, slot)
+			assert.are.equals(firstPassTooltipText, tooltipText(tooltip),
+				"cached slot-only radius output should preserve tooltip content")
 			assert.are.equals(1, rebuilds,
-				"slot-only radius jewel hover should reuse its cached comparison spec")
+				"slot-only radius jewel hover should reuse its cached comparison output")
+			assert.are.equals(firstPassCalcCalls, calcCalls,
+				"slot-only radius jewel hover should not recalculate a cached output")
 
 			build.outputRevision = build.outputRevision + 1
 			tooltip = new("Tooltip"):Tooltip()
 			build.itemsTab:AddItemTooltip(tooltip, item, slot)
 			assert.are.equals(2, rebuilds,
-				"slot-only radius jewel comparison spec cache should reset when output changes")
+				"slot-only radius jewel output cache should reset when output changes")
+			assert.is_true(calcCalls > firstPassCalcCalls,
+				"slot-only radius jewel comparison should recalculate after output changes")
 		end)
 		specClass.BuildAllDependsAndPaths = originalBuildAllDependsAndPaths
+		build.calcsTab.GetMiscCalculator = originalGetMiscCalculator
 		main.slotOnlyTooltips = originalSlotOnlyTooltips
 		if not ok then
 			error(err)
@@ -723,10 +744,13 @@ describe("TestRadiusJewelStatDiff", function()
 		local originalSlotOnlyTooltips = main.slotOnlyTooltips
 		main.slotOnlyTooltips = true
 		local specClass = getmetatable(spec)
+		local originalBuildAllDependsAndPaths = specClass.BuildAllDependsAndPaths
 		local originalBuildPathFromNode = specClass.BuildPathFromNode
 		local originalSetNodeDistanceToClassStart = specClass.SetNodeDistanceToClassStart
+		local originalBuildSplitPersonalityPath = specClass.BuildSplitPersonalityPath
 		local buildPathCalls = 0
 		local distanceCalls = 0
+		local splitPersonalityPathCalls = 0
 		specClass.BuildPathFromNode = function(self, ...)
 			buildPathCalls = buildPathCalls + 1
 			return originalBuildPathFromNode(self, ...)
@@ -735,22 +759,42 @@ describe("TestRadiusJewelStatDiff", function()
 			distanceCalls = distanceCalls + 1
 			return originalSetNodeDistanceToClassStart(self, ...)
 		end
+		specClass.BuildSplitPersonalityPath = function(self, ...)
+			splitPersonalityPathCalls = splitPersonalityPathCalls + 1
+			return originalBuildSplitPersonalityPath(self, ...)
+		end
 
 		local ok, err = pcall(function()
 			local tooltip = new("Tooltip"):Tooltip()
 			build.itemsTab:AddItemTooltip(tooltip, radiusItem, radiusSlot)
+			local calculationOnlyTooltipText = tooltipText(tooltip)
+			assert.are.equals(0, buildPathCalls,
+				"calculation-only tooltip specs should not rebuild UI node paths")
+			assert.is_true(distanceCalls > 0,
+				"calculation-only tooltip specs should refresh jewel socket distances used by calc")
+			assert.are.equals(0, splitPersonalityPathCalls,
+				"calculation-only tooltip specs should not rebuild Split Personality highlight paths")
+
+			build.itemsTab.jewelComparisonOutputCache = nil
+			specClass.BuildAllDependsAndPaths = function(self)
+				return originalBuildAllDependsAndPaths(self)
+			end
+			local fullRebuildTooltip = new("Tooltip"):Tooltip()
+			build.itemsTab:AddItemTooltip(fullRebuildTooltip, radiusItem, radiusSlot)
+			assert.are.equals(calculationOnlyTooltipText, tooltipText(fullRebuildTooltip),
+				"calculation-only radius jewel specs should preserve full-rebuild tooltip output")
+			assert.is_true(splitPersonalityPathCalls > 0,
+				"the full-rebuild comparison should exercise Split Personality highlight paths")
 		end)
+		specClass.BuildAllDependsAndPaths = originalBuildAllDependsAndPaths
 		specClass.BuildPathFromNode = originalBuildPathFromNode
 		specClass.SetNodeDistanceToClassStart = originalSetNodeDistanceToClassStart
+		specClass.BuildSplitPersonalityPath = originalBuildSplitPersonalityPath
 		main.slotOnlyTooltips = originalSlotOnlyTooltips
 		if not ok then
 			error(err)
 		end
 
-		assert.are.equals(0, buildPathCalls,
-			"temporary tooltip specs should not rebuild UI node paths")
-		assert.is_true(distanceCalls > 0,
-			"temporary tooltip specs should still refresh jewel socket distances used by calc")
 	end)
 
 	it("AddItemTooltip reuses full radius jewel comparison outputs until output changes", function()
@@ -764,7 +808,6 @@ describe("TestRadiusJewelStatDiff", function()
 		local originalSlotOnlyTooltips = main.slotOnlyTooltips
 		main.slotOnlyTooltips = false
 		build.itemsTab.jewelComparisonOutputCache = nil
-		build.itemsTab.slotOnlyJewelComparisonSpecCache = nil
 
 		local originalGetMiscCalculator = build.calcsTab.GetMiscCalculator
 		local calcCalls = 0

src/Classes/ItemsTab.lua

@@ -4341,33 +4341,12 @@ local function cloneSpecForJewelComparison(spec)
 	return specCopy
 end
 
-local function buildSpecForJewelComparison(itemsTab, compareSlot, replacementItem, useJewelComparisonSpecCache)
+local function buildSpecForJewelComparison(itemsTab, compareSlot, replacementItem)
 	local tempItemId
-	local replacementItemId = replacementItem and replacementItem.id
-	local replacementItemIsStored = replacementItemId and itemsTab.items[replacementItemId] == replacementItem
-	local canCache = useJewelComparisonSpecCache and (not replacementItem or replacementItemIsStored)
-	local cacheKey
-	local cache
-	if canCache then
-		local outputRevision = itemsTab.build and itemsTab.build.outputRevision or 0
-		cache = itemsTab.slotOnlyJewelComparisonSpecCache
-		if not cache or cache.outputRevision ~= outputRevision then
-			cache = {
-				outputRevision = outputRevision,
-				specs = { },
-			}
-			itemsTab.slotOnlyJewelComparisonSpecCache = cache
-		end
-		cacheKey = tostring(compareSlot.nodeId) .. ":" .. tostring(replacementItemId or "")
-		if cache.specs[cacheKey] then
-			return cache.specs[cacheKey]
-		end
-	end
-
 	local spec = cloneSpecForJewelComparison(itemsTab.build.spec)
 	if replacementItem then
-		if replacementItemIsStored then
-			spec.jewels[compareSlot.nodeId] = replacementItemId
+		if replacementItem.id and itemsTab.items[replacementItem.id] == replacementItem then
+			spec.jewels[compareSlot.nodeId] = replacementItem.id
 		else
 			tempItemId = -1
 			while itemsTab.items[tempItemId] do
@@ -4381,9 +4360,9 @@ local function buildSpecForJewelComparison(itemsTab, compareSlot, replacementIte
 	end
 
 	local ok, err = xpcall(function()
-		-- These temporary specs only feed the misc calculator, which does not read node.path/pathDist.
-		-- Jewel socket distances are still rebuilt for jewel scaling;
-		-- Split Personality highlight paths are also refreshed.
+		-- These temporary specs only feed the misc calculator, which does not read regular
+		-- node paths or Split Personality highlight paths. Jewel socket distances are still
+		-- rebuilt for Split Personality modifier scaling.
 		spec:BuildAllDependsAndPaths(true)
 	end, debug.traceback)
 	if tempItemId then
@@ -4392,9 +4371,6 @@ local function buildSpecForJewelComparison(itemsTab, compareSlot, replacementIte
 	if not ok then
 		error(err, 0)
 	end
-	if cacheKey then
-		cache.specs[cacheKey] = spec
-	end
 	return spec
 end
 
@@ -5118,32 +5094,30 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode, maxWidth)
 
 		tooltip:AddLine(14, colorCodes.TIP .. "Tip: Press Ctrl+D"..itemTabHint.." to disable the display of stat differences.")
 
-		local function getReplacedItemAndOutput(compareSlot, selItem, useJewelComparisonSpecCache, useJewelComparisonOutputCache)
+		local function getReplacedItemAndOutput(compareSlot, selItem)
 			selItem = selItem or self.items[compareSlot.selItemId]
 			local override = { repSlotName = compareSlot.slotName, repItem = item ~= selItem and item or nil }
 			local outputCache
 			local outputCacheKey
 			if compareSlot.nodeId and (itemChangesPassiveTree(selItem) or itemChangesPassiveTree(item)) then
-				if useJewelComparisonOutputCache then
-					outputCacheKey = getJewelComparisonOutputCacheKey(self, compareSlot, override.repItem)
-					if outputCacheKey then
-						outputCache = getJewelComparisonOutputCache(self)
-						if outputCache.outputs[outputCacheKey] then
-							return selItem, outputCache.outputs[outputCacheKey]
-						end
+				outputCacheKey = getJewelComparisonOutputCacheKey(self, compareSlot, override.repItem)
+				if outputCacheKey then
+					outputCache = getJewelComparisonOutputCache(self)
+					if outputCache.outputs[outputCacheKey] then
+						return selItem, outputCache.outputs[outputCacheKey]
 					end
 				end
-				override.spec = buildSpecForJewelComparison(self, compareSlot, override.repItem, useJewelComparisonSpecCache)
+				override.spec = buildSpecForJewelComparison(self, compareSlot, override.repItem)
 			end
 			local output = calcFunc(override)
 			if outputCacheKey then
 				outputCache.outputs[outputCacheKey] = output
 			end
 			return selItem, output
 		end
-		local function addCompareForSlot(compareSlot, selItem, output, useJewelComparisonSpecCache)
+		local function addCompareForSlot(compareSlot, selItem, output)
 			if not selItem or not output then
-				selItem, output = getReplacedItemAndOutput(compareSlot, nil, useJewelComparisonSpecCache)
+				selItem, output = getReplacedItemAndOutput(compareSlot)
 			end
 			local header
 			if item == selItem then
@@ -5159,7 +5133,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode, maxWidth)
 		-- one slot.
 		local compareOnlySlot = type(slot) ~= "string" and slot or self.slots[slot]
 		if main.slotOnlyTooltips and slot then
-			if compareOnlySlot then addCompareForSlot(compareOnlySlot, nil, nil, true) end
+			if compareOnlySlot then addCompareForSlot(compareOnlySlot) end
 			return
 		end
 
@@ -5180,7 +5154,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode, maxWidth)
 		local slots = {}
 		for _, slotEntry in ipairs(slotCandidates) do
 			if not isLimitedUniqueAtLimit or slotEntry.isSameUnique then
-				local _, output = getReplacedItemAndOutput(slotEntry.compareSlot, slotEntry.selItem, nil, true)
+				local _, output = getReplacedItemAndOutput(slotEntry.compareSlot, slotEntry.selItem)
 				slotEntry.output = output
 				table.insert(slots, slotEntry)
 			end

src/Classes/PassiveSpec.lua

@@ -1099,10 +1099,10 @@ function PassiveSpecClass:NodesInIntuitiveLeapLikeRadius(node)
 end
 
 -- Rebuilds dependencies and calculation distances for all nodes.
--- When node paths are skipped, node.path/pathDist remain unset while jewel socket
--- distanceToClassStart values and Split Personality paths are still refreshed.
----@param skipNodePathRebuild? boolean
-function PassiveSpecClass:BuildAllDependsAndPaths(skipNodePathRebuild)
+-- Calculation-only specs leave UI path fields unset while still refreshing jewel
+-- socket distanceToClassStart values used by the calculator.
+---@param calculationOnly? boolean
+function PassiveSpecClass:BuildAllDependsAndPaths(calculationOnly)
 	local timelessJewelTypeByConqueror = {
 		vaal = 1,
 		karui = 2,
@@ -1600,7 +1600,7 @@ function PassiveSpecClass:BuildAllDependsAndPaths(skipNodePathRebuild)
 
 	-- Reset and rebuild all node paths
 	for id, node in pairs(self.nodes) do
-		if skipNodePathRebuild then
+		if calculationOnly then
 			node.pathDist = nil
 			node.path = nil
 		else
@@ -1613,7 +1613,7 @@ function PassiveSpecClass:BuildAllDependsAndPaths(skipNodePathRebuild)
 	end
 	for id, node in pairs(self.allocNodes) do
 		if #node.intuitiveLeapLikesAffecting == 0 or node.connectedToStart then
-			if not skipNodePathRebuild then
+			if not calculationOnly then
 				self:BuildPathFromNode(node)
 			end
 			if node.isJewelSocket or node.expansionJewel then
@@ -1622,7 +1622,9 @@ function PassiveSpecClass:BuildAllDependsAndPaths(skipNodePathRebuild)
 		end
 	end
 
-	self:BuildSplitPersonalityPath()
+	if not calculationOnly then
+		self:BuildSplitPersonalityPath()
+	end
 end
 
 function PassiveSpecClass:ReplaceNode(old, newNode)