Merge branch 'symbols-and-functions'

Author: Guillaume Chau

shells/dev/target/NativeTypes.vue

@@ -93,7 +93,11 @@ export default {
       html: '<b>Bold</b> <i>Italic</i>',
       htmlReg: /<b>hey<\/b>/i,
       'html <b>key</b>': (h, t, m, l) => {},
-      proxy1
+      proxy1,
+      sym: Symbol('test'),
+      multiLineParameterFunction: function(a,
+                                  b,
+                                  c) {}
     }
   },
   computed: {

shells/dev/target/store.js

@@ -8,7 +8,8 @@ export default new Vuex.Store({
     count: 0,
     date: new Date(),
     set: new Set(),
-    map: new Map()
+    map: new Map(),
+    sym: Symbol('test')
   },
   mutations: {
     INCREMENT: state => state.count++,

src/util.js

@@ -125,6 +125,8 @@ function replacer (key) {
     return NEGATIVE_INFINITY
   } else if (type === 'function') {
     return getCustomFunctionDetails(val)
+  } else if (type === 'symbol') {
+    return `[native Symbol ${Symbol.prototype.toString.call(val)}]`
   } else if (val !== null && type === 'object') {
     if (val instanceof Map) {
       return encodeCache.cache(val, () => getCustomMapDetails(val))
@@ -251,8 +253,9 @@ export function getCustomFunctionDetails (func) {
   } catch (e) {
     // Func is probably a Proxy, which can break Function.prototype.toString()
   }
-  const matches = string.match(/\(.*\)/)
-  const args = matches ? matches[0] : '(?)'
+  const matches = string.match(/\([\s\S]*?\)/)
+  // Trim any excess whitespace from the argument string
+  const args = matches ? `(${matches[0].substr(1, matches[0].length - 2).split(',').map(a => a.trim()).join(', ')})` : '(?)'
   return {
     _custom: {
       type: 'function',
@@ -268,6 +271,7 @@ export function parse (data, revive) {
 }
 
 const specialTypeRE = /^\[native (\w+) (.*)\]$/
+const symbolRE = /^\[native Symbol Symbol\((.*)\)\]$/
 
 function reviver (key, val) {
   if (val === UNDEFINED) {
@@ -286,6 +290,9 @@ function reviver (key, val) {
     } else if (val._custom.type === 'set') {
       return reviveSet(val)
     }
+  } else if (symbolRE.test(val)) {
+    const [, string] = symbolRE.exec(val)
+    return Symbol.for(string)
   } else if (specialTypeRE.test(val)) {
     const [, type, string] = specialTypeRE.exec(val)
     return new window[type](string)