fix

5 files changed, 29 insertions, 14 deletions

diff --git a/xmake/core/base/dump.lua b/xmake/core/base/dump.lua
index 3eacd91c6..f7012a539 100644
--- a/xmake/core/base/dump.lua
+++ b/xmake/core/base/dump.lua
@@ -11,11 +11,11 @@
 -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
--- 
+--
 -- Copyright (C) 2015 - 2019, TBOOX Open Source Group.
 --
--- @author      ruki
--- @file        utils.lua
+-- @author      OpportunityLiu
+-- @file        dump.lua
 --
 
 -- define module
@@ -29,13 +29,15 @@ local table   = require("base/table")
 function dump._string(str, as_key)
     local quote = (not as_key) or (not str:match("^[a-zA-Z_][a-zA-Z0-9_]*$"))
     if quote then
-        io.write(colors.translate("\""))
+        io.write(colors.translate("${reset}${color.dump.string_quote}\"${reset}${color.dump.string}", { patch_reset = false }))
+    else
+        io.write(colors.translate("${reset}${color.dump.string}", { patch_reset = false }))
     end
-    io.write(colors.translate("${reset}${color.dump.string}", { patch_reset = false }))
     io.write(str)
-    io.write(colors.translate("${reset}", { patch_reset = false }))
     if quote then
-        io.write(colors.translate("\""))
+        io.write(colors.translate("${reset}${color.dump.string_quote}\"${reset}", { patch_reset = false }))
+    else
+        io.write(colors.translate("${reset}", { patch_reset = false }))
     end
 end
 
@@ -60,9 +62,10 @@ function dump._function(func, as_key)
 end
 
 function dump._default(value)
-    io.write(colors.translate("${dim}<", { patch_reset = false }))
-    io.write(tostring(value))
-    io.write(colors.translate(">${reset}", { patch_reset = false }))
+    io.write(colors.translate("${color.dump.default}", { patch_reset = false }))
+    local fmt = colors.theme():get("text.dump.default_format") or "%s"
+    io.write(string.format(fmt, value))
+    io.write(colors.translate("${reset}", { patch_reset = false }))
 end
 
 function dump._scalar(value, as_key)
@@ -94,7 +97,7 @@ function dump._table(value, first_indent, remain_indent)
             io.write(",\n")
         end
         io.write(inner_indent)
-        if not is_arr then
+        if not is_arr or type(k) ~= "number" then
             dump._scalar(k, true)
             io.write(colors.translate("${dim} = "))
         end
diff --git a/xmake/themes/dark/xmake.lua b/xmake/themes/dark/xmake.lua
index fa112bdf4..e31c32b0a 100644
--- a/xmake/themes/dark/xmake.lua
+++ b/xmake/themes/dark/xmake.lua
@@ -52,7 +52,10 @@ theme("dark")
     set_color("build.target", "magenta")
 
     -- color dump
-    set_color("dump.string", "magenta")
+    set_text("dump.default_format", "<%s>")
+    set_color("dump.default", "bright")
+    set_color("dump.string", "magenta bright")
+    set_color("dump.string_quote", "magenta")
     set_color("dump.keyword", "blue")
     set_color("dump.number", "green")
     set_color("dump.function", "cyan")
diff --git a/xmake/themes/default/xmake.lua b/xmake/themes/default/xmake.lua
index 3fbdbb411..69cef1fd5 100644
--- a/xmake/themes/default/xmake.lua
+++ b/xmake/themes/default/xmake.lua
@@ -52,7 +52,10 @@ theme("default")
     set_color("build.target", "magenta")
 
     -- color dump
-    set_color("dump.string", "magenta")
+    set_text("dump.default_format", "<%s>")
+    set_color("dump.default", "bright")
+    set_color("dump.string", "magenta bright")
+    set_color("dump.string_quote", "magenta")
     set_color("dump.keyword", "blue")
     set_color("dump.number", "green")
     set_color("dump.function", "cyan")
diff --git a/xmake/themes/emoji/xmake.lua b/xmake/themes/emoji/xmake.lua
index 5edc108e8..0148891f7 100644
--- a/xmake/themes/emoji/xmake.lua
+++ b/xmake/themes/emoji/xmake.lua
@@ -52,7 +52,10 @@ theme("emoji")
     set_color("build.target", "magenta")
 
     -- color dump
-    set_color("dump.string", "magenta")
+    set_text("dump.default_format", "<%s>")
+    set_color("dump.default", "bright")
+    set_color("dump.string", "magenta bright")
+    set_color("dump.string_quote", "magenta")
     set_color("dump.keyword", "blue")
     set_color("dump.number", "green")
     set_color("dump.function", "cyan")
diff --git a/xmake/themes/plain/xmake.lua b/xmake/themes/plain/xmake.lua
index 1b782e9e9..0771a857d 100644
--- a/xmake/themes/plain/xmake.lua
+++ b/xmake/themes/plain/xmake.lua
@@ -52,7 +52,10 @@ theme("plain")
     set_color("build.target", "")
 
     -- color dump
+    set_text("dump.default_format", "<%s>")
+    set_color("dump.default", "")
     set_color("dump.string", "")
+    set_color("dump.string_quote", "")
     set_color("dump.keyword", "")
     set_color("dump.number", "")
     set_color("dump.function", "")