wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1205353 - Wrong result for string.replace with backslash-dollar (/\$/) inside JS debugger. r=vporof

Browse Source
This commit is contained in:
Shlomi Fish 2015-12-11 06:01:00 +00:00
parent 4bad58401a
commit 36361c11b7
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devtools/client/debugger/debugger-controller.js
View File

@ -1168,7 +1168,7 @@ StackFrames.prototype = {
// Make sure all quotes are escaped in the expression's syntax,
// and add a newline after the statement to avoid comments
// breaking the code integrity inside the eval block.
aString.replace(/"/g, "\\$&") + "\" + " + "'\\n'" + " + \"" +
aString.replace(/\\/g, "\\\\").replace(/"/g, "\\$&") + "\" + " + "'\\n'" + " + \"" +
"} catch (e) {" +
"e.name + ': ' + e.message;" + // TODO: Bug 812765, 812764.
"}" +

31
devtools/client/debugger/test/mochitest/browser_dbg_watch-expressions-02.js
View File

@ -34,6 +34,9 @@ function test() {
});
function addExpressions() {
// https://bugzilla.mozilla.org/show_bug.cgi?id=1205353
// BZ#1205353 - wrong result for string replace with backslash-dollar.
gWatch.addExpression("'$$$'.replace(/\\$/, 'foo')");
gWatch.addExpression("'a'");
gWatch.addExpression("\"a\"");
gWatch.addExpression("'a\"\"'");
@ -61,6 +64,7 @@ function test() {
gWatch.addExpression("throw new Error(\"bazinga\")");
gWatch.addExpression("({ get error() { throw new Error(\"bazinga\") } }).error");
gWatch.addExpression("throw { get name() { throw \"bazinga\" } }");
}
function performTest() {
@ -68,8 +72,8 @@ function test() {
is(gDebugger.document.querySelectorAll(".dbg-expression[hidden=true]").length, 0,
"There should be 0 hidden nodes in the watch expressions container");
is(gDebugger.document.querySelectorAll(".dbg-expression:not([hidden=true])").length, 27,
"There should be 27 visible nodes in the watch expressions container");
is(gDebugger.document.querySelectorAll(".dbg-expression:not([hidden=true])").length, 28,
"There should be 28 visible nodes in the watch expressions container");
test1(function() {
test2(function() {
@ -97,13 +101,13 @@ function test() {
function finishTest() {
is(gDebugger.document.querySelectorAll(".dbg-expression[hidden=true]").length, 0,
"There should be 0 hidden nodes in the watch expressions container");
is(gDebugger.document.querySelectorAll(".dbg-expression:not([hidden=true])").length, 27,
"There should be 27 visible nodes in the watch expressions container");
is(gDebugger.document.querySelectorAll(".dbg-expression:not([hidden=true])").length, 28,
"There should be 28 visible nodes in the watch expressions container");
}
function test1(aCallback) {
gDebugger.once(gDebugger.EVENTS.FETCHED_WATCH_EXPRESSIONS, () => {
checkWatchExpressions(26, {
checkWatchExpressions(27, {
a: "ReferenceError: a is not defined",
this: { type: "object", class: "Object" },
prop: { type: "object", class: "String" },
@ -117,7 +121,7 @@ function test() {
function test2(aCallback) {
gDebugger.once(gDebugger.EVENTS.FETCHED_WATCH_EXPRESSIONS, () => {
checkWatchExpressions(26, {
checkWatchExpressions(27, {
a: { type: "undefined" },
this: { type: "object", class: "Window" },
prop: { type: "undefined" },
@ -133,7 +137,7 @@ function test() {
function test3(aCallback) {
gDebugger.once(gDebugger.EVENTS.FETCHED_WATCH_EXPRESSIONS, () => {
checkWatchExpressions(26, {
checkWatchExpressions(27, {
a: { type: "object", class: "Object" },
this: { type: "object", class: "Window" },
prop: { type: "undefined" },
@ -149,7 +153,7 @@ function test() {
function test4(aCallback) {
gDebugger.once(gDebugger.EVENTS.FETCHED_WATCH_EXPRESSIONS, () => {
checkWatchExpressions(27, {
checkWatchExpressions(28, {
a: 5,
this: { type: "object", class: "Window" },
prop: { type: "undefined" },
@ -164,7 +168,7 @@ function test() {
function test5(aCallback) {
gDebugger.once(gDebugger.EVENTS.FETCHED_WATCH_EXPRESSIONS, () => {
checkWatchExpressions(27, {
checkWatchExpressions(28, {
a: 5,
this: { type: "object", class: "Window" },
prop: { type: "undefined" },
@ -179,7 +183,7 @@ function test() {
function test6(aCallback) {
gDebugger.once(gDebugger.EVENTS.FETCHED_WATCH_EXPRESSIONS, () => {
checkWatchExpressions(27, {
checkWatchExpressions(28, {
a: 5,
this: { type: "object", class: "Window" },
prop: { type: "undefined" },
@ -194,7 +198,7 @@ function test() {
function test7(aCallback) {
gDebugger.once(gDebugger.EVENTS.FETCHED_WATCH_EXPRESSIONS, () => {
checkWatchExpressions(27, {
checkWatchExpressions(28, {
a: 5,
this: { type: "object", class: "Window" },
prop: { type: "undefined" },
@ -209,7 +213,7 @@ function test() {
function test8(aCallback) {
gDebugger.once(gDebugger.EVENTS.FETCHED_WATCH_EXPRESSIONS, () => {
checkWatchExpressions(27, {
checkWatchExpressions(28, {
a: 5,
this: { type: "object", class: "Window" },
prop: { type: "undefined" },
@ -278,6 +282,7 @@ function test() {
let w25 = scope.get("throw new Error(\"bazinga\")");
let w26 = scope.get("({ get error() { throw new Error(\"bazinga\") } }).error");
let w27 = scope.get("throw { get name() { throw \"bazinga\" } }");
let w28 = scope.get("'$$$'.replace(/\\$/, 'foo')");
ok(w1, "The first watch expression should be present in the scope.");
ok(w2, "The second watch expression should be present in the scope.");
@ -306,6 +311,7 @@ function test() {
ok(w25, "The 25th watch expression should be present in the scope.");
ok(w26, "The 26th watch expression should be present in the scope.");
ok(!w27, "The 27th watch expression should not be present in the scope.");
ok(w28, "The 28th watch expression should be present in the scope.");
is(w1.value, "a", "The first value is correct.");
is(w2.value, "a", "The second value is correct.");
@ -367,5 +373,6 @@ function test() {
is(w24.value, "RangeError: precision -4 out of range", "The 24th value is correct.");
is(w25.value, "Error: bazinga", "The 25th value is correct.");
is(w26.value, "Error: bazinga", "The 26th value is correct.");
is(w28.value, 'foo$$', "The 28th value is correct.");
}
}