Permalink
Browse files

Check for tabs in source line in DisplayExceptionLine

  • Loading branch information...
1 parent ca642b0 commit 968b49ba0a6329af83b46c598524d7ae2460df57 @Sannis Sannis committed with bnoordhuis May 21, 2012
Showing with 44 additions and 3 deletions.
  1. +3 −3 src/node.cc
  2. +35 −0 test/message/throw_in_line_with_tabs.js
  3. +6 −0 test/message/throw_in_line_with_tabs.out
View
@@ -1271,13 +1271,13 @@ void DisplayExceptionLine (TryCatch &try_catch) {
// Print wavy underline (GetUnderline is deprecated).
int start = message->GetStartColumn();
for (int i = offset; i < start; i++) {
- fprintf(stderr, " ");
+ fputc((sourceline_string[i] == '\t') ? '\t' : ' ', stderr);
}
int end = message->GetEndColumn();
for (int i = start; i < end; i++) {
- fprintf(stderr, "^");
+ fputc('^', stderr);
}
- fprintf(stderr, "\n");
+ fputc('\n', stderr);
}
}
@@ -0,0 +1,35 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+
+var common = require('../common');
+var assert = require('assert');
+
+common.error('before');
+
+(function () {
+ // these lines should contain tab!
+ throw ({ foo: 'bar' });
+})();
+
+common.error('after');
@@ -0,0 +1,6 @@
+before
+
+*/test/message/throw_in_line_with_tabs.js:32
+ throw ({ foo: 'bar' });
+ ^
+[object Object]

0 comments on commit 968b49b

Please sign in to comment.