Merge pull request #289 from horriblename/lua-include-empty-attrs

lib: do not filter out empty attrs in toLuaObject
NotAShelf · May 21, 2024 · 2c9a9b4 · 2c9a9b4
2 parents 9074b6e + 68ca227
commit 2c9a9b4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md
@@ -19,6 +19,8 @@ Release notes for release 0.7
 [horriblename](https://github.com/horriblename):
 
 - Fix broken treesitter-context keybinds in visual mode
+- Depcrecate use of `__empty` to define empty tables in lua. Empty attrset are
+  no longer filtered and thus should be used instead.
 
 [NotAShelf](https://github.com/notashelf)
 

diff --git a/lib/lua.nix b/lib/lua.nix
@@ -3,7 +3,7 @@
   inherit (builtins) hasAttr head throw typeOf isList isAttrs isBool isInt isString isPath isFloat toJSON;
   inherit (lib.attrsets) mapAttrsToList filterAttrs;
   inherit (lib.strings) concatStringsSep concatMapStringsSep stringToCharacters;
-  inherit (lib.trivial) boolToString;
+  inherit (lib.trivial) boolToString warn;
 in rec {
   wrapLuaConfig = {
     luaBefore ? "",
@@ -66,7 +66,10 @@ in rec {
       if isLuaInline args
       then args.expr
       else if hasAttr "__empty" args
-      then "{ }"
+      then
+        warn ''
+          Using `__empty` to define an empty lua table is deprecated. Use an empty attrset instead.
+        '' "{ }"
       else
         "{"
         + (concatStringsSep ","
@@ -76,10 +79,7 @@ in rec {
               then toLuaObject v
               else "[${toLuaObject n}] = " + (toLuaObject v))
             (filterAttrs
-              (
-                _: v:
-                  (v != null) && (toLuaObject v != "{}")
-              )
+              (_: v: v != null)
               args)))
         + "}"
     else if isList args

diff --git a/modules/wrapper/rc/config.nix b/modules/wrapper/rc/config.nix
@@ -60,16 +60,11 @@
       config = (attrs) the configuration options for this mapping (noremap, silent...)
     }
     */
-    normalizeAction = action: let
+    normalizeAction = action: {
       # Extract the values of the config options that have been explicitly set by the user
       config =
         filterAttrs (_: v: v != null)
         (getAttrs (attrNames mapConfigOptions) action);
-    in {
-      config =
-        if config == {}
-        then {"__empty" = null;}
-        else config;
       action =
         if action.lua
         then mkLuaInline action.action