fix table dump style

5 files changed, 19 insertions, 4 deletions

diff --git a/xmake/core/base/dump.lua b/xmake/core/base/dump.lua
index 7a9b5ee56..42f09e2c6 100644
--- a/xmake/core/base/dump.lua
+++ b/xmake/core/base/dump.lua
@@ -86,6 +86,11 @@ function dump._print_udata_scalar(value)
     io.write(dump._translate("${color.dump.udata}"), dump._format("text.dump.udata_format", "%s", value), dump._translate("${reset}"))
 end
 
+-- print table value with scalar format
+function dump._print_table_scalar(value)
+    io.write(dump._translate("${color.dump.table}"), dump._format("text.dump.table_format", "%s", value), dump._translate("${reset}"))
+end
+
 -- print scalar value
 function dump._print_scalar(value, as_key)
     if type(value) == "nil" then
@@ -100,6 +105,8 @@ function dump._print_scalar(value, as_key)
         dump._print_function(value, as_key)
     elseif type(value) == "userdata" then
         dump._print_udata_scalar(value)
+    elseif type(value) == "table" then
+        dump._print_table_scalar(value)
     else
         dump._print_default(value)
     end
@@ -223,7 +230,7 @@ function dump._print_table(value, first_indent, remain_indent, printed_set)
     if not first_level and tostringmethod then
         local ok, strrep = pcall(tostringmethod, value, value)
         if ok then
-            return dump._print_default(strrep)
+            return dump._print_table_scalar(strrep)
         end
     end
     printed_set = printed_set or { len = 0 }
@@ -231,7 +238,7 @@ function dump._print_table(value, first_indent, remain_indent, printed_set)
     local first_value = true
 
     -- print open brackets
-    io.write(dump._translate("${reset}${dim}{${reset}"))
+    io.write(dump._translate("${reset}${color.dump.table}{${reset}"))
 
     local function print_newline()
         if first_value then
@@ -285,9 +292,9 @@ function dump._print_table(value, first_indent, remain_indent, printed_set)
 
     -- print close brackets
     if first_value then
-        io.write(dump._translate(" ${dim}}${reset}"))
+        io.write(dump._translate(" ${color.dump.table}}${reset}"))
     else
-        io.write("\b \n", remain_indent, dump._translate("${reset}${dim}}${reset}"))
+        io.write("\b \n", remain_indent, dump._translate("${reset}${color.dump.table}}${reset}"))
     end
 end
 
diff --git a/xmake/themes/dark/xmake.lua b/xmake/themes/dark/xmake.lua
index c0eb30c34..cb9c6a093 100644
--- a/xmake/themes/dark/xmake.lua
+++ b/xmake/themes/dark/xmake.lua
@@ -54,12 +54,14 @@ theme("dark")
     -- color dump
     set_text("dump.default_format", "<%s>")
     set_text("dump.udata_format", "[%s]")
+    set_text("dump.table_format", "{%s}")
     set_text("dump.anchor", "&%s")
     set_text("dump.reference", "*%s")
     set_color("dump.anchor", "yellow")
     set_color("dump.reference", "yellow")
     set_color("dump.default", "bright")
     set_color("dump.udata", "yellow")
+    set_color("dump.table", "bright")
     set_color("dump.string", "magenta bright")
     set_color("dump.string_quote", "magenta")
     set_color("dump.keyword", "blue")
diff --git a/xmake/themes/default/xmake.lua b/xmake/themes/default/xmake.lua
index 294d0e543..568e351e2 100644
--- a/xmake/themes/default/xmake.lua
+++ b/xmake/themes/default/xmake.lua
@@ -54,12 +54,14 @@ theme("default")
     -- color dump
     set_text("dump.default_format", "<%s>")
     set_text("dump.udata_format", "[%s]")
+    set_text("dump.table_format", "{%s}")
     set_text("dump.anchor", "&%s")
     set_text("dump.reference", "*%s")
     set_color("dump.anchor", "yellow")
     set_color("dump.reference", "yellow")
     set_color("dump.default", "bright")
     set_color("dump.udata", "yellow")
+    set_color("dump.table", "bright")
     set_color("dump.string", "magenta bright")
     set_color("dump.string_quote", "magenta")
     set_color("dump.keyword", "blue")
diff --git a/xmake/themes/emoji/xmake.lua b/xmake/themes/emoji/xmake.lua
index 8ba303896..39a1bee8f 100644
--- a/xmake/themes/emoji/xmake.lua
+++ b/xmake/themes/emoji/xmake.lua
@@ -54,12 +54,14 @@ theme("emoji")
     -- color dump
     set_text("dump.default_format", "<%s>")
     set_text("dump.udata_format", "[%s]")
+    set_text("dump.table_format", "{%s}")
     set_text("dump.anchor", "⚓  %s")
     set_text("dump.reference", "⛵  %s")
     set_color("dump.anchor", "yellow")
     set_color("dump.reference", "yellow")
     set_color("dump.default", "bright")
     set_color("dump.udata", "yellow")
+    set_color("dump.table", "bright")
     set_color("dump.string", "magenta bright")
     set_color("dump.string_quote", "magenta")
     set_color("dump.keyword", "blue")
diff --git a/xmake/themes/plain/xmake.lua b/xmake/themes/plain/xmake.lua
index 54e731c06..057d2ddf0 100644
--- a/xmake/themes/plain/xmake.lua
+++ b/xmake/themes/plain/xmake.lua
@@ -54,12 +54,14 @@ theme("plain")
     -- color dump
     set_text("dump.default_format", "<%s>")
     set_text("dump.udata_format", "[%s]")
+    set_text("dump.table_format", "{%s}")
     set_text("dump.anchor", "&%s")
     set_text("dump.reference", "*%s")
     set_color("dump.anchor", "")
     set_color("dump.reference", "")
     set_color("dump.default", "")
     set_color("dump.udata", "")
+    set_color("dump.table", "")
     set_color("dump.string", "")
     set_color("dump.string_quote", "")
     set_color("dump.keyword", "")