mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 00:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

lib/lua: only quote table keys when needed

Browse source
This commit is contained in:
Matt Sturgeon 2024-06-26 12:27:55 +01:00
parent 01cf43dbaa
commit 00ce71f51a
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
2 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/to-lua.nix
View file

@ -47,16 +47,18 @@ rec {
mapAttrsToList (
n: v:
let
keyString =
if n == "__emptyString" then
"['']"
else if hasPrefix "__rawKey__" n then
"[${removePrefix "__rawKey__" n}]"
else if isIdentifier n then
n
else
"[${toLuaObject n}]";
valueString = toLuaObject v;
in
if hasPrefix "__unkeyed" n then
valueString
else if hasPrefix "__rawKey__" n then
''[${removePrefix "__rawKey__" n}] = '' + valueString
else if n == "__emptyString" then
"[''] = " + valueString
else
"[${toLuaObject n}] = " + valueString
if hasPrefix "__unkeyed" n then valueString else "${keyString} = ${valueString}"
) (filterAttrs (n: v: v != null && (toLuaObject v != "{}")) args)
))
+ "}"

20
tests/lib-tests.nix
View file

@ -55,7 +55,7 @@ let
3
];
};
expected = ''{["foo"] = "bar",["qux"] = {1,2,3}}'';
expected = ''{foo = "bar",qux = {1,2,3}}'';
};
testToLuaObjectRawLua = {
@ -68,7 +68,7 @@ let
"__unkeyed...." = "foo";
bar = "baz";
};
expected = ''{"foo",["bar"] = "baz"}'';
expected = ''{"foo",bar = "baz"}'';
};
testToLuaObjectNestedAttrs = {
@ -81,7 +81,7 @@ let
};
};
};
expected = ''{["a"] = {["b"] = 1,["c"] = 2,["d"] = {["e"] = 3}}}'';
expected = ''{a = {b = 1,c = 2,d = {e = 3}}}'';
};
testToLuaObjectNestedList = {
@ -109,7 +109,7 @@ let
d = false;
e = null;
};
expected = ''{["a"] = 1.000000,["b"] = 2,["c"] = true,["d"] = false}'';
expected = ''{a = 1.000000,b = 2,c = true,d = false}'';
};
testToLuaObjectNilPrim = {
@ -150,7 +150,17 @@ let
g = helpers.emptyTable;
};
};
expected = ''{["c"] = { },["d"] = {["g"] = { }}}'';
expected = ''{c = { },d = {g = { }}}'';
};
testToLuaObjectQuotedKeys = {
expr = helpers.toLuaObject {
"1_a" = "a";
_b = "b";
c = "c";
d-d = "d";
};
expected = ''{["1_a"] = "a",_b = "b",c = "c",["d-d"] = "d"}'';
};
testIsLuaKeyword = {