Charged items: revert greyed-on-cooldown override, keep RequestLayout fix

.serena/project.yml

@@ -1,26 +1,31 @@
-# the name by which the project can be referenced within Serena
+# the name by which the project can be referenced within Serena/when chatting with the LLM.
 project_name: "EnhancedCooldownManager"
 
-
-# list of languages for which language servers are started; choose from:
-#   al                  ansible             bash                clojure             cpp
-#   cpp_ccls            crystal             csharp              csharp_omnisharp    dart
-#   elixir              elm                 erlang              fortran             fsharp
+# list of languages for which language servers are started (LSP backend only); choose from:
+#   ada                 al                  angular             ansible             bash
+#   bsl                 clojure             cpp                 cpp_ccls            crystal
+#   csharp              csharp_omnisharp    cue                 dart                elixir
+#   elm                 erlang              fortran             fsharp              gdscript
 #   go                  groovy              haskell             haxe                hlsl
-#   java                json                julia               kotlin              lean4
-#   lua                 luau                markdown            matlab              msl
-#   nix                 ocaml               pascal              perl                php
-#   php_phpactor        powershell          python              python_jedi         python_ty
-#   r                   rego                ruby                ruby_solargraph     rust
-#   scala               solidity            swift               systemverilog       terraform
-#   toml                typescript          typescript_vts      vue                 yaml
-#   zig
-#   (This list may be outdated. For the current list, see values of Language enum here:
-#   https://github.com/oraios/serena/blob/main/src/solidlsp/ls_config.py
-#   For some languages, there are alternative language servers, e.g. csharp_omnisharp, ruby_solargraph.)
+#   html                java                json                julia               kotlin
+#   latex               lean4               lua                 luau                markdown
+#   matlab              msl                 nix                 ocaml               pascal
+#   perl                php                 php_phpactor        php_phpantom        powershell
+#   python              python_jedi         python_pyrefly      python_ty           r
+#   rego                ruby                ruby_solargraph     rust                scala
+#   scss                solidity            svelte              swift               systemverilog
+#   terraform           toml                typescript          typescript_vts      vue
+#   yaml                zig
+#   (This list may be outdated; generated with scripts/print_language_list.py;
+#   For the current list, see values of Language enum here:
+#   https://github.com/oraios/serena/blob/main/src/solidlsp/ls_config.py)
+# For some languages, there are alternative language servers, e.g. csharp_omnisharp, ruby_solargraph.)
 # Note:
 #   - For C, use cpp
 #   - For JavaScript, use typescript
+#   - For Angular projects, use angular (subsumes typescript+html; requires `npm install` in the project root)
+#   - For Svelte projects, use svelte (subsumes typescript/javascript for .svelte projects; requires npm)
+#   - For SCSS / Sass / plain CSS, use scss (some-sass-language-server handles all three)
 #   - For Free Pascal/Lazarus, use pascal
 # Special requirements:
 #   Some languages require additional setup/installations.
@@ -117,22 +122,47 @@ ignored_memory_patterns: []
 
 # advanced configuration option allowing to configure language server-specific options.
 # Maps the language key to the options.
-# Have a look at the docstring of the constructors of the LS implementations within solidlsp (e.g., for C# or PHP) to see which options are available.
-# No documentation on options means no options are available.
+# The settings are considered only if the project is trusted (see global configuration to define trusted projects).
+# See https://oraios.github.io/serena/02-usage/050_configuration.html#language-server-specific-settings
 ls_specific_settings: {}
 
 # list of mode names to be activated additionally for this project, e.g. ["query-projects"]
 # The full set of modes to be activated is base_modes (from global config) + default_modes + added_modes.
 # See https://oraios.github.io/serena/02-usage/050_configuration.html#modes
 added_modes:
 
-# list of additional workspace folder paths for cross-package reference support (e.g. in monorepos).
+# list of additional workspace folder paths for cross-package reference support.
 # Paths can be absolute or relative to the project root.
 # Each folder is registered as an LSP workspace folder, enabling language servers to discover
-# symbols and references across package boundaries.
-# Currently supported for: TypeScript.
+# symbols and references across package boundaries, but these folders are not indexed by Serena,
+# i.e. the respective symbols will not be found using Serena's symbol search tools.
 # Example:
 #   additional_workspace_folders:
 #     - ../sibling-package
 #     - ../shared-lib
-additional_workspace_folders: []
+ls_additional_workspace_folders: []
+
+# list of workspace folder paths (LSP backend only).
+# These folders will be used to build up Serena's symbol index.
+# Paths must be within the project root and should thus be relative to the project root.
+# Furthermore, the paths should not be filtered by ignore settings.
+# Default setting: The entire project root folder (".") is considered.
+# In (large) monorepos, this can be used to index only subfolders of the project root, e.g.
+#   ls_workspace_folders:
+#     - "./subproject1"
+#     - "./subproject2"
+ls_workspace_folders:
+- .
+
+# optional shell command to run before the language backend (LSP or JetBrains) is initialised.
+# the command runs in the project root directory and is only executed if the project is trusted
+# (see trusted_project_path_patterns in the global configuration).
+# serena waits for the command to exit: a non-zero exit code is logged as an error but does not
+# abort activation. a per-project timeout (activation_command_timeout, default 180s) is the safety
+# backstop for non-terminating commands; on expiry the process is killed and activation continues.
+# example: activation_command: "npx nx run-many -t build"
+activation_command:
+
+# maximum time in seconds to wait for activation_command to complete before killing it (default 180s).
+# must be a positive number.
+activation_command_timeout: 180.0

Modules/ExtraIcons.lua

@@ -482,6 +482,7 @@ end
 
 function ExtraIcons:OnBagUpdateCooldown()
     self:ThrottledRefresh("OnBagUpdateCooldown")
+    ns.Runtime.RequestLayout("ExtraIcons:OnBagUpdateCooldown")
 end
 
 function ExtraIcons:OnBagUpdateDelayed()

Tests/Modules/ExtraIcons_spec.lua

@@ -641,6 +641,17 @@ describe("ExtraIcons real source", function()
         assert.same({ "OnBagUpdateCooldown" }, reasons)
     end)
 
+    it("requests layout on bag cooldown change so charged item display is re-evaluated", function()
+        local layoutReasons = {}
+        ns.Runtime.RequestLayout = function(reason)
+            layoutReasons[#layoutReasons + 1] = reason
+        end
+
+        ExtraIcons.InnerFrame = ExtraIcons:CreateFrame()
+        ExtraIcons:OnBagUpdateCooldown()
+        assert.same({ "ExtraIcons:OnBagUpdateCooldown" }, layoutReasons)
+    end)
+
     it("edit mode callbacks toggle state and defer layout", function()
         local reasons = {}
         ExtraIcons.InnerFrame = ExtraIcons:CreateFrame()
@@ -1513,6 +1524,29 @@ describe("ExtraIcons real source", function()
         assert.same({ 100, 60 }, ExtraIcons._viewers.utility.iconPool[1].Cooldown.__cooldown)
     end)
 
+    for _, cd in ipairs({ { 100, 60, true }, { 0, 0, false } }) do
+        it("hides consumed item stack icon when showIfMissing is not set (cooldown=" .. tostring(cd[3]) .. ")", function()
+            local utilityIconChild = TestHelpers.makeFrame({ shown = true, width = 18, height = 18 })
+            utilityIconChild.GetSpellID = function() return 1 end
+            UtilityCooldownViewer.childXPadding = 0
+            UtilityCooldownViewer.iconScale = 1
+            UtilityCooldownViewer._children = { utilityIconChild }
+            UtilityCooldownViewer:SetPoint("CENTER", UIParent, "CENTER", 0, 0)
+
+            itemCounts[HEALTHSTONE_ID] = 0
+            itemIconsByID[HEALTHSTONE_ID] = "healthstone"
+            itemCooldownByID[HEALTHSTONE_ID] = cd
+
+            ExtraIcons.InnerFrame = ExtraIcons:CreateFrame()
+            ExtraIcons.GetModuleConfig = function()
+                return makeViewersConfig({ { kind = "itemStack", itemStackId = "healthstones" } })
+            end
+
+            assert.is_false(ExtraIcons:UpdateLayout("test"))
+            assert.is_false(ExtraIcons._viewers.utility.container:IsShown())
+        end)
+    end
+
     it("shows item stack counts when enabled", function()
         local utilityIconChild = TestHelpers.makeFrame({ shown = true, width = 18, height = 18 })
         utilityIconChild.GetSpellID = function() return 1 end