From 2547713ec4e91a28b978be5f644ceffc7086d79b Mon Sep 17 00:00:00 2001 From: derped Date: Sat, 3 May 2025 21:43:19 +0200 Subject: [PATCH] Rename getName helper to getPluginName. --- pkgs/lazyUtils.nix | 10 +++++----- tests/lazyUtils.nix | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/lazyUtils.nix b/pkgs/lazyUtils.nix index a07b4fd..2c93531 100644 --- a/pkgs/lazyUtils.nix +++ b/pkgs/lazyUtils.nix @@ -17,9 +17,9 @@ let 3. (path) baseNameOf plugin.dir Type: - getName :: Plugin -> String + getPluginName :: Plugin -> String */ - getName = + getPluginName = plugin: if (plugin ? name && plugin.name != null) then assert builtins.isString plugin.name; @@ -124,7 +124,7 @@ let resolvePlugin = pluginFn: pluginFn vPlug; in lib.pipe plugin [ - # Resolve dir and dependencies first so getName can resolve names + # Resolve dir and dependencies first so getPluginName can resolve names ( plugin: plugin @@ -132,7 +132,7 @@ let dir = runIfSet resolvePlugin "dir"; dependencies = runIfSet ( pluginListFn: - (map (pluginOrPackage: getName (pluginWrapper pluginOrPackage))) (resolvePlugin pluginListFn) + (map (pluginOrPackage: getPluginName (pluginWrapper pluginOrPackage))) (resolvePlugin pluginListFn) ) "dependencies"; } ) @@ -141,7 +141,7 @@ let plugin // { __posArgs = runIfSet lib.flatten "short"; - name = getName plugin; + name = getPluginName plugin; enabled = runIfSet stringLiteral "enabled"; cond = runIfSet stringLiteral "cond"; init = runIfSet stringLiteral "init"; diff --git a/tests/lazyUtils.nix b/tests/lazyUtils.nix index 36b2f2a..a1bc462 100644 --- a/tests/lazyUtils.nix +++ b/tests/lazyUtils.nix @@ -21,25 +21,25 @@ let in { helpers = { - getName = { + getPluginName = { testName = { - expr = lazyUtils.helpers.getName (nullPlugin // { name = "nameTest"; }); + expr = lazyUtils.helpers.getPluginName (nullPlugin // { name = "nameTest"; }); expected = "nameTest"; }; testShort = { - expr = lazyUtils.helpers.getName (nullPlugin // { short = "shortTest"; }); + expr = lazyUtils.helpers.getPluginName (nullPlugin // { short = "shortTest"; }); expected = "shortTest"; }; testDir = { - expr = lazyUtils.helpers.getName (nullPlugin // { dir = ./empty.txt; }); + expr = lazyUtils.helpers.getPluginName (nullPlugin // { dir = ./empty.txt; }); expected = "empty.txt"; }; testDrv = { - expr = lazyUtils.helpers.getName (nullPlugin // { dir = miniDrv; }); + expr = lazyUtils.helpers.getPluginName (nullPlugin // { dir = miniDrv; }); expected = "test"; }; testInvalidInput = { - expr = lazyUtils.helpers.getName { }; + expr = lazyUtils.helpers.getPluginName { }; expectedError = { type = "ThrownError"; # For some reason there is whitespace after the newline