Browse Source

Check for tabs in source line in DisplayExceptionLine

Fix for joyent/node#3280
v0.9.1-release
Oleg Efimov 13 years ago
committed by Ben Noordhuis
parent
commit
968b49ba0a
  1. 6
      src/node.cc
  2. 35
      test/message/throw_in_line_with_tabs.js
  3. 6
      test/message/throw_in_line_with_tabs.out

6
src/node.cc

@ -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);
}
}

35
test/message/throw_in_line_with_tabs.js

@ -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');

6
test/message/throw_in_line_with_tabs.out

@ -0,0 +1,6 @@
before
*/test/message/throw_in_line_with_tabs.js:32
throw ({ foo: 'bar' });
^
[object Object]
Loading…
Cancel
Save