From ea43173cf4d34fd22b556164a04cf1c3fc4e1516 Mon Sep 17 00:00:00 2001 From: "yangguo@chromium.org" Date: Thu, 28 Nov 2013 08:59:45 +0000 Subject: [PATCH] Shorten autogenerated error message. R=rossberg@chromium.org BUG=v8:3019 LOG=Y Review URL: https://codereview.chromium.org/88393002 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18115 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/messages.js | 4 ++ test/mjsunit/error-tostring-omit.js | 61 +++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 test/mjsunit/error-tostring-omit.js diff --git a/src/messages.js b/src/messages.js index 197ab9f169..085b4d8518 100644 --- a/src/messages.js +++ b/src/messages.js @@ -198,6 +198,10 @@ function FormatString(format, args) { // str is one of %0, %1, %2 or %3. try { str = NoSideEffectToString(args[arg_num]); + if (str.length > 256) { + str = %SubString(str, 0, 239) + "......" + + %SubString(str, str.length - 2, str.length); + } } catch (e) { if (%IsJSModule(args[arg_num])) str = "module"; diff --git a/test/mjsunit/error-tostring-omit.js b/test/mjsunit/error-tostring-omit.js new file mode 100644 index 0000000000..ce7b2dc88e --- /dev/null +++ b/test/mjsunit/error-tostring-omit.js @@ -0,0 +1,61 @@ +// Copyright 2013 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +function veryLongString() { + return "Lorem ipsum dolor sit amet, consectetur adipiscing elit." + + "Nam vulputate metus est. Maecenas quis pellentesque eros," + + "ac mattis augue. Nam porta purus vitae tincidunt blandit." + + "Aliquam lacus dui, blandit id consectetur id, hendrerit ut" + + "felis. Class aptent taciti sociosqu ad litora torquent per" + + "conubia nostra, per inceptos himenaeos. Ut posuere eros et" + + "tempus luctus. Nullam condimentum aliquam odio, at dignissim" + + "augue tincidunt in. Nam mattis vitae mauris eget dictum." + + "Nam accumsan dignissim turpis a turpis duis."; +} + + +var re = /omitted/; + +try { + veryLongString.nonexistentMethod(); +} catch (e) { + assertTrue(e.message.length < 350); + assertTrue(re.test(e.message)); +} + +try { + veryLongString().nonexistentMethod(); +} catch (e) { + assertTrue(e.message.length < 350); + assertTrue(re.test(e.message)); +} + +try { + throw Error(veryLongString()); +} catch (e) { + assertEquals(veryLongString(), e.message); +}