From 1beb5ffe0955f6dd46eabcecd80c8584120df50e Mon Sep 17 00:00:00 2001 From: Emily Stark Date: Tue, 24 Jun 2014 15:12:33 -0700 Subject: [PATCH] Fix `Log._getCallerDetails()` regex. 1. Now it matches `logging:test`, not `logging:tests`. 2. Now it is okay with server-side source maps, by matching `/packages/logging/foo.js` in addition to `/packages/logging.js`. --- packages/logging/logging.js | 3 +-- packages/logging/logging_test.js | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/logging/logging.js b/packages/logging/logging.js index a163b4a657..6fa04fa616 100644 --- a/packages/logging/logging.js +++ b/packages/logging/logging.js @@ -97,8 +97,7 @@ Log._getCallerDetails = function () { return {file: "eval"}; } - // XXX probably wants to be / or .js in case no source maps - if (!line.match(/packages\/logging(?:\/|(?::tests)?\.js)/)) + if (!line.match(/packages\/logging(?:\/|(?::test)?(\/|\.js))/)) break; } diff --git a/packages/logging/logging_test.js b/packages/logging/logging_test.js index d70c5584f2..b00b0d3c36 100644 --- a/packages/logging/logging_test.js +++ b/packages/logging/logging_test.js @@ -181,4 +181,3 @@ Tinytest.add("logging - format", function (test) { level.charAt(0).toUpperCase() + '20120908-07:06:05.004' + utcOffsetStr + ' (app.js:42) message'); }); }); -