Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lib: do not filter out empty attrs in toLuaObject #289

Merged
merged 5 commits into from
May 21, 2024
Merged

lib: do not filter out empty attrs in toLuaObject #289

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8aa3a23
lib: do not filter out empty attrs in toLuaObject
horriblename May 12, 2024
af72dc1
lib: remove unused __empty special case in toLuaObject
horriblename May 18, 2024
ac20dfb
lib: add deprecation warning for `__empty`
FrothyMarrow May 21, 2024
69257c0
docs: add entry for `__empty` deprecation
FrothyMarrow May 21, 2024
68ca227
lib: remove alias `lib.warn`
FrothyMarrow May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions lib/lua.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ in rec {
then
if isLuaInline args
then args.expr
else if hasAttr "__empty" args
then "{ }"
else
"{"
+ (concatStringsSep ","
Expand All @@ -76,10 +74,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
Expand Down
7 changes: 1 addition & 6 deletions modules/wrapper/rc/config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading