From c39b45a50522ede5dd7b6df0cdeab4566561c3e7 Mon Sep 17 00:00:00 2001 From: Yang Guo Date: Tue, 22 Oct 2019 13:20:50 +0000 Subject: [PATCH] Revert "[sources] Fix raw<->UI location mapping for formatted inline scripts." This reverts commit 2c3fbc1c99d41976002581185761bb51fcef69f6. Reason for revert: test failure: https://ci.chromium.org/p/devtools-frontend/builders/ci/DevTools%20Linux/b8898896189013659616 Original change's description: > [sources] Fix raw<->UI location mapping for formatted inline scripts. > > For formatted inline scripts we also need to take into account the > script line and column offsets to get the mapping correct, otherwise > stepping and breakpoints will not work correctly. > > Bug: chromium:1003497 > Change-Id: I85caec550ce66823f7d48fdf3881c22cfc936b8b > Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/1873745 > Reviewed-by: Yang Guo > Commit-Queue: Benedikt Meurer TBR=yangguo@chromium.org,bmeurer@chromium.org Change-Id: I49e37efbe291ff1c8db48ff114a0a10a044a0747 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:1003497 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/1873749 Reviewed-by: Yang Guo Commit-Queue: Yang Guo --- front_end/sources/SourceFormatter.js | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/front_end/sources/SourceFormatter.js b/front_end/sources/SourceFormatter.js index 738fc1bba2..dca9ea6d51 100644 --- a/front_end/sources/SourceFormatter.js +++ b/front_end/sources/SourceFormatter.js @@ -170,8 +170,8 @@ Sources.SourceFormatter.ScriptMapping = class { if (!formatData) { return null; } - const lineNumber = rawLocation.lineNumber - script.lineOffset; - const columnNumber = (rawLocation.columnNumber || 0) - (lineNumber === 0 ? script.columnOffset : 0); + const lineNumber = rawLocation.lineNumber; + const columnNumber = rawLocation.columnNumber || 0; const formattedLocation = formatData.mapping.originalToFormatted(lineNumber, columnNumber); return formatData.formattedSourceCode.uiLocation(formattedLocation[0], formattedLocation[1]); } @@ -189,20 +189,9 @@ Sources.SourceFormatter.ScriptMapping = class { return []; } const [originalLine, originalColumn] = formatData.mapping.formattedToOriginal(lineNumber, columnNumber); - const scripts = this._scriptsForUISourceCode(formatData.originalSourceCode).filter(script => { - const [scriptLine, scriptColumn] = originalToScript(script); - return script.containsLocation(scriptLine, scriptColumn); - }); - return scripts.map(script => { - const [scriptLine, scriptColumn] = originalToScript(script); - return script.debuggerModel.createRawLocation(script, scriptLine, scriptColumn); - }); - - function originalToScript(script) { - const scriptLine = originalLine + script.lineOffset; - const scriptColumn = originalColumn + (originalLine === 0 ? script.columnOffset : 0); - return [scriptLine, scriptColumn]; - } + const scripts = this._scriptsForUISourceCode(formatData.originalSourceCode) + .filter(script => script.containsLocation(originalLine, originalColumn)); + return scripts.map(script => script.debuggerModel.createRawLocation(script, originalLine, originalColumn)); } /**