improve watcher error messages + use debugger when debug: true

yyx990803 · yyx990803 · commit cdd1e095b5ae · 2014-12-06T18:25:26.000-05:00
diff --git a/src/util/debug.js b/src/util/debug.js
@@ -32,8 +32,14 @@ function enableDebug () {
   exports.warn = function (msg) {
     if (hasConsole && !config.silent) {
       console.warn('[Vue warn]: ' + msg)
-      if (config.debug && console.trace) {
-        console.trace()
+      /* istanbul ignore if */
+      if (config.debug) {
+        /* jshint debug: true */
+        debugger
+      } else {
+        console.log(
+          'Set `Vue.config.debug = true` to enable debug mode.'
+        )
       }
     }
   }
diff --git a/src/watcher.js b/src/watcher.js
@@ -77,7 +77,10 @@ p.get = function () {
   try {
     value = this.getter.call(vm, vm)
   } catch (e) {
-    _.warn(e)
+    _.warn(
+      'Error when evaluating expression "' +
+      this.expression + '":\n   ' + e
+    )
   }
   // "touch" every property so they are all tracked as
   // dependencies for deep watching
@@ -102,7 +105,12 @@ p.set = function (value) {
   )
   try {
     this.setter.call(vm, vm, value)
-  } catch (e) {}
+  } catch (e) {
+    _.warn(
+      'Error when evaluating setter "' +
+      this.expression + '":\n   ' + e
+    )
+  }
 }
 
 /**
@@ -134,10 +142,10 @@ p.afterGet = function () {
  */
 
 p.update = function () {
-  if (config.async) {
-    batcher.push(this)
-  } else {
+  if (!config.async || config.debug) {
     this.run()
+  } else {
+    batcher.push(this)
   }
 }
 
diff --git a/test/unit/specs/util/debug_spec.js b/test/unit/specs/util/debug_spec.js
@@ -40,15 +40,5 @@ if (typeof console !== 'undefined') {
       expect(console.warn).not.toHaveBeenCalled()
     })
 
-    if (console.trace) {
-      it('trace when not silent and debugging', function () {
-        config.debug = true
-        config.silent = false
-        _.warn('haha')
-        expect(console.trace).toHaveBeenCalled()
-        config.debug = false
-        config.silent = true
-      })
-    }
   })
 }
diff --git a/test/unit/specs/watcher_spec.js b/test/unit/specs/watcher_spec.js
@@ -391,4 +391,10 @@ describe('Watcher', function () {
     expect(_.warn).toHaveBeenCalled()
   })
 
+  it('warn setter errors', function () {
+    var watcher = new Watcher(vm, 'a + b', spy)
+    watcher.set(123)
+    expect(_.warn).toHaveBeenCalled()
+  })
+
 })

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,14 @@ function enableDebug () {`
`32`	`32`	`exports.warn = function (msg) {`
`33`	`33`	`if (hasConsole && !config.silent) {`
`34`	`34`	`console.warn('[Vue warn]: ' + msg)`
`35`		`- if (config.debug && console.trace) {`
`36`		`- console.trace()`
	`35`	`+ /* istanbul ignore if */`
	`36`	`+ if (config.debug) {`
	`37`	`+ /* jshint debug: true */`
	`38`	`+ debugger`
	`39`	`+ } else {`
	`40`	`+ console.log(`
	`41`	+ 'Set `Vue.config.debug = true` to enable debug mode.'
	`42`	`+ )`
`37`	`43`	`}`
`38`	`44`	`}`
`39`	`45`	`}`