Apply changes from PathOfBuildingCommunity/PathOfBuilding#9830

Author: Wires77

spec/System/TestItemParse_spec.lua.rej

@@ -0,0 +1,42 @@
+diff a/spec/System/TestItemParse_spec.lua b/spec/System/TestItemParse_spec.lua	(rejected hunks)
+@@ -525,6 +525,16 @@ describe("TestAdvancedItemParse #item", function()
+ 		assert.are_not.equals("mana", item.explicitModLines[3].modTags[1])
+ 	end)
+ 
++	it("resets linePostfix", function() 
++		local item = new("Item", raw([[
++			{ Corruption Enhancement — Mana }
++			24(20-30)% increased Mana Regeneration Rate
++			--------
++			+15 to maximum life
++		]]))
++		assert.falsy(item.explicitModLines[1].enchant)
++	end)
++
+ 	it("parses vaaled catalyst", function() 
+ 		local item = new("Item", raw([[
+ 			Quality (Attribute Modifiers): +19% (augmented)
+@@ -571,6 +581,23 @@ describe("TestAdvancedItemParse #item", function()
+ 		-- assert.are.equals(1, item.explicitModLines[1].range) -- Not sure why this is returning 0.5
+ 	end)
+ 
++	it("parses enchant correctly #enchant", function()
++		local item = new("Item", raw([[
++			{ Corrupted Enhancement }
++			+8(6-10)% to Fire Resistance
++		]]))
++		assert.are.equals(8, item.enchantModLines[1].modList[1].value)
++	end)
++
++	it("parses enchant with tags correctly #enchant", function()
++		local item = new("Item", raw([[
++			{ Corrupted Enhancement - Energy Shield }
++			+8(6-10)% to Fire Resistance
++		]]))
++		assert.are.equals(8, item.enchantModLines[1].modList[1].value)
++		assert.are.equals("energyshield", item.enchantModLines[1].modTags[1])
++	end)
++
+ 	it("parses junk", function()
+ 		local godTestItem = new("Item", [[
+ 			Item Class: Sceptres

src/Classes/Item.lua

@@ -383,6 +383,8 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 	local deferJewelRadiusIndexAssignment
 	local gameModeStage = "FINDIMPLICIT"
 	local foundExplicit, foundImplicit
+	local linePrefix = ""
+	local linePostfix = ""
 
 	while self.rawLines[l] do	
 		local line = self.rawLines[l]
@@ -426,7 +428,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 				end
 				self.checkSection = false
 			end
-			local specName, specVal = line:match("^([%a ]+:?): (.+)$")
+			local specName, specVal = line:match("^([%a %(%)]+:?): (.+)$")
 			if specName then
 				if specName == "Class:" then
 					specName = "Requires Class"

src/Classes/Item.lua.rej

@@ -0,0 +1,36 @@
+diff a/src/Classes/Item.lua b/src/Classes/Item.lua	(rejected hunks)
+@@ -838,8 +838,8 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
+ 						end
+ 					end
+ 					-- Use rolling Delta/Range in case one range is 1-3 and another is 1-100 so we get the finest precision possible
+-					local bestPrecisionDelta = 0
+-					local bestPrecisionRange = 0
++					local bestPrecisionDelta = -1
++					local bestPrecisionRange = -1
+ 					for value, range in line:gmatch("(%-?%d+%.?%d*)%((%-?%d+%.?%d*%-%-?%d+%.?%d*)%)") do
+ 						-- Find advanced copy paste format: 45(40-50)
+ 						local min, max = range:match("(%-?%d+%.?%d*)%-(%-?%d+%.?%d*)")
+@@ -857,8 +857,12 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
+ 					self.pendingAffixList = {}
+ 				else
+ 					-- Use rolling Delta/Range in case one range is 1-3 and another is 1-100 so we get the finest precision possible
+-					local bestPrecisionDelta = 0
+-					local bestPrecisionRange = 0
++					local bestPrecisionDelta = -1
++					local bestPrecisionRange = -1
++					
++					-- Replace non-number ranges as unsupported
++					line = line:gsub("(%a+)%([%a%s]+%-[%a%s]+%)", "%1")
++
+ 					for value, range in line:gmatch("(%-?%d+%.?%d*)%((%-?%d+%.?%d*%-%-?%d+%.?%d*)%)") do
+ 						local min, max = range:match("(%-?%d+%.?%d*)%-(%-?%d+%.?%d*)")
+ 						local delta = tonumber(max) - min
+@@ -869,7 +873,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
+ 						if bestPrecisionRange > 1 or bestPrecisionRange < 0 then
+ 							line = line:gsub(value .. "%(" .. range:gsub("%-", "%%-") .. "%)", value)
+ 						else
+-							line = line:gsub(value .. "%(" .. range:gsub("%-", "%%-") .. "%)", "(" .. range .. ")")
++							line = line:gsub(value .. "%(" .. range:gsub("%-", "%%-") .. "%)", (tonumber(value) < 0 and "+" or "") .. "(" .. range .. ")")
+ 						end
+ 					end
+ 					if bestPrecisionRange <= 1 and bestPrecisionRange >= 0 then

src/Classes/ItemsTab.lua

@@ -1941,7 +1941,13 @@ function ItemsTabClass:UpdateAffixControl(control, item, type, outputTable, outp
 	end
 	if control.list[control.selIndex].haveRange then
 		control.slider.divCount = #control.list[control.selIndex].modList
-		control.slider.val = (isValueInArray(control.list[control.selIndex].modList, selAffix) - 1 + (item[outputTable][outputIndex].range or 0.5)) / control.slider.divCount
+		local index = isValueInArray(control.list[control.selIndex].modList, selAffix)
+		local range = item[outputTable][outputIndex].range or 0.5
+		-- Avoid exact integer boundary that slider:GetDivVal's ceil would assign to the previous segment
+		if range == 0 and index > 1 then
+			range = 1e-4
+		end
+		control.slider.val = (index - 1 + range) / control.slider.divCount
 		if control.slider.divCount == 1 then
 			control.slider.divCount = nil
 		end

src/Classes/ItemsTab.lua.rej

@@ -0,0 +1,13 @@
+diff a/src/Classes/ItemsTab.lua b/src/Classes/ItemsTab.lua	(rejected hunks)
+@@ -1242,11 +1242,6 @@ function ItemsTabClass:Draw(viewPort, inputEvents)
+ 		if event.type == "KeyDown" then	
+ 			if event.key == "v" and IsKeyDown("CTRL") then
+ 				local newItem = Paste()
+-				if newItem:find("{ ", 0, true) then
+-					main:OpenConfirmPopup("Warning", "\"Advanced Item Descriptions\" (Ctrl+Alt+c) are unsupported.\n\nAbort paste?", "OK", function()
+-						self:SetDisplayItem()
+-					end)
+-				end
+ 				if newItem then
+ 					self:CreateDisplayItemFromRaw(newItem, true)
+ 				end