Remove nonblocking list gen

Author: vaisest

src/Modules/ConfigModBrowser.lua

@@ -84,13 +84,15 @@ local function addItemMod(seenGroups, set, mod, source)
 				-- note that exactly 0.5 range is necessary as that is what the
 				-- modcache uses
 				local rangedLine = itemLib.applyRange(line, 0.5)
-				addModLine(set, rangedLine, source)
+				local modList, extra = modLib.parseMod(rangedLine)
+				addModLine(set, rangedLine, source, (not not modList) and not extra)
 			end
 		else
 			-- crafted mods have a different format
 			for _, line in ipairs(mod) do
 				local rangedLine = itemLib.applyRange(line, 0.5)
-				addModLine(set, rangedLine, source)
+				local modList, extra = modLib.parseMod(rangedLine)
+				addModLine(set, rangedLine, source, (not not modList) and not extra)
 			end
 		end
 	end
@@ -106,7 +108,7 @@ local function sortAlphabeticallyIgnoringValues(a, b)
 end
 
 local NO_MATCH_TEXT = "No matching modifiers found"
-local function updateDisplayList(controls, displayList, modList, noReset)
+local function updateDisplayList(controls, displayList, modList)
 	wipeTable(displayList)
 	local searchStr = controls.search.buf:lower():gsub("^[%s]+", ""):gsub("[%s]+$", "")
 
@@ -138,7 +140,7 @@ local function updateDisplayList(controls, displayList, modList, noReset)
 	if #displayList == 0 then
 		t_insert(displayList, { text = NO_MATCH_TEXT })
 	end
-	if controls.listControl and not noReset then
+	if controls.listControl then
 		controls.listControl.selIndex = 1
 		controls.listControl.selValue = displayList[1]
 		controls.listControl.controls.scrollBarV.offset = 0
@@ -161,7 +163,9 @@ function M.OpenAddModPopup(configTab, blockData)
 		else
 			for i, line in ipairs(node.stats) do
 				local supported = node.mods[i].list and not node.mods[i].extra
-				addModLine(modSet, line, string.format("%s Node", node.type), supported)
+				local ascendancyPrefix = node.isBloodline and "Bloodline " or
+					node.ascendancyName and "Ascendancy " or ""
+				addModLine(modSet, line, string.format("%s%s Node", ascendancyPrefix, node.type), supported)
 			end
 		end
 	end
@@ -192,7 +196,6 @@ function M.OpenAddModPopup(configTab, blockData)
 	end
 
 	local supportedList = {}
-	local pendingList = {}
 	for template, mod in pairs(modSet) do
 		mod.template = template
 		-- a key which is based on the stripped line, but one that also tries to
@@ -201,52 +204,18 @@ function M.OpenAddModPopup(configTab, blockData)
 			:gsub("[^%a]+", " ")
 			-- strip left and right spaces
 			:match("^%s*(.-)%s*$")
-		if mod.supported == true then
+		if mod.supported then
 			table.insert(supportedList, mod)
-		else
-			table.insert(pendingList, mod)
 		end
 	end
 
 	local displayList = {}
 	local controls = {}
 
 
-	local originalPending = #pendingList
-	controls.builderStatus = new("LabelControl", { "BOTTOMLEFT", nil, "BOTTOMLEFT" }, { 8, -10, 0, 16 }, function()
-		local pendingCount = #pendingList
-		if pendingCount == 0 or #displayList == 0 then
-			return ""
-		end
-		local remaining = #pendingList - originalPending
-		local donePercent = math.floor(-100 * remaining / originalPending)
-		return string.format("^7Building list %d%%", donePercent)
-	end)
 	controls.listControl = new("ListControl", { "TOPLEFT", nil, "TOPLEFT" }, { 10, 20, 700, 454 }, 16, "VERTICAL", false, displayList)
 	controls.listControl.forceTooltip = true
 	controls.listControl.font = "VAR"
-	controls.listControl.RealDraw = controls.listControl.Draw
-	function controls.listControl:Draw(vp, noTT)
-		local start = GetTime()
-		-- parse mods without pausing the UI on open
-		local modsAdded = false
-		while #pendingList > 0 do
-			local mod = table.remove(pendingList, #pendingList)
-			local modList, extra = modLib.parseMod(mod.text)
-			if modList and not extra then
-				modsAdded = true
-				table.insert(supportedList, mod)
-			end
-			local now = GetTime()
-			if now - start > 40 then
-				break
-			end
-		end
-		if #displayList == 0 or modsAdded then
-			updateDisplayList(controls, displayList, supportedList, modsAdded)
-		end
-		controls.listControl:RealDraw(vp, noTT)
-	end
 	controls.listControl.GetRowValue = function(self, column, index, value)
 		if value and value.text then
 			return (value.text == NO_MATCH_TEXT) and value.text or (colorCodes.MAGIC .. value.text)
@@ -278,6 +247,7 @@ function M.OpenAddModPopup(configTab, blockData)
 		return #controls.search.buf > 0
 	end
 
+	updateDisplayList(controls, displayList, supportedList)
 	local helpSize = 24
 	controls.whatDoesItDo = new("ButtonControl", { "BOTTOM", nil, "BOTTOM" }, { 0, -10, helpSize, helpSize }, "?", function() end)
 	controls.whatDoesItDo.forceTooltip = true