zzos/react-native-devtools-frontend
1
0
Fork 0
mirror of https://github.com/react/react-native-devtools-frontend.git synced 2026-09-29 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[sources] Fix raw<->UI location mapping for formatted inline scripts."

Browse Source 
This reverts commit 2c3fbc1c99.

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 <yangguo@chromium.org>
> Commit-Queue: Benedikt Meurer <bmeurer@chromium.org>

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 <yangguo@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
This commit is contained in:
Yang Guo
2019-10-22 13:21:04 +00:00
committed by Commit Bot
parent 2c3fbc1c99
commit c39b45a505
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front_end/sources/SourceFormatter.js
+5 -16
View File
@@ -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));
}
/**