Skip to content

Commit cd80d32

Browse files
authored
[DevTools] Add column number to viewSourceLineFunction (#24814)
Add column number for `viewSourceLineFunction` and renamed the function to `viewUrlSourceFunction` to match the other source function naming conventions
1 parent f01e119 commit cd80d32

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

packages/react-devtools-extensions/src/main.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ function createPanelIfReactLoaded() {
255255
}
256256
};
257257

258-
const viewSourceLineFunction = (url, line) => {
259-
chrome.devtools.panels.openResource(url, line);
258+
const viewUrlSourceFunction = (url, line, col) => {
259+
chrome.devtools.panels.openResource(url, line, col);
260260
};
261261

262262
let debugIDCounter = 0;
@@ -395,7 +395,7 @@ function createPanelIfReactLoaded() {
395395
warnIfUnsupportedVersionDetected: true,
396396
viewAttributeSourceFunction,
397397
viewElementSourceFunction,
398-
viewSourceLineFunction,
398+
viewUrlSourceFunction,
399399
}),
400400
);
401401
};

packages/react-devtools-shared/src/devtools/views/Components/ViewSourceContext.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
import {createContext} from 'react';
1111

12-
import type {ViewSourceLine} from 'react-devtools-shared/src/devtools/views/DevTools';
12+
import type {ViewUrlSource} from 'react-devtools-shared/src/devtools/views/DevTools';
1313

1414
export type Context = {|
15-
viewSourceLineFunction: ViewSourceLine | null,
15+
viewUrlSourceFunction: ViewUrlSource | null,
1616
|};
1717

1818
const ViewSourceContext = createContext<Context>(((null: any): Context));

packages/react-devtools-shared/src/devtools/views/DevTools.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export type ViewElementSource = (
5858
id: number,
5959
inspectedElement: InspectedElement,
6060
) => void;
61-
export type ViewSourceLine = (url: string, row: number, column: number) => void;
61+
export type ViewUrlSource = (url: string, row: number, column: number) => void;
6262
export type ViewAttributeSource = (
6363
id: number,
6464
path: Array<string | number>,
@@ -79,7 +79,7 @@ export type Props = {|
7979
warnIfUnsupportedVersionDetected?: boolean,
8080
viewAttributeSourceFunction?: ?ViewAttributeSource,
8181
viewElementSourceFunction?: ?ViewElementSource,
82-
viewSourceLineFunction?: ?ViewSourceLine,
82+
viewUrlSourceFunction?: ?ViewUrlSource,
8383
readOnly?: boolean,
8484
hideSettings?: boolean,
8585
hideToggleErrorAction?: boolean,
@@ -139,7 +139,7 @@ export default function DevTools({
139139
warnIfUnsupportedVersionDetected = false,
140140
viewAttributeSourceFunction,
141141
viewElementSourceFunction,
142-
viewSourceLineFunction,
142+
viewUrlSourceFunction,
143143
readOnly,
144144
hideSettings,
145145
hideToggleErrorAction,
@@ -205,11 +205,11 @@ export default function DevTools({
205205

206206
const viewSource = useMemo(
207207
() => ({
208-
viewSourceLineFunction: viewSourceLineFunction || null,
208+
viewUrlSourceFunction: viewUrlSourceFunction || null,
209209
// todo(blakef): Add inspect(...) method here and remove viewElementSource
210210
// to consolidate source code inspection.
211211
}),
212-
[viewSourceLineFunction],
212+
[viewUrlSourceFunction],
213213
);
214214

215215
const contextMenu = useMemo(

packages/react-devtools-shared/src/devtools/views/Profiler/SidebarEventInfo.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export type Props = {||};
2222

2323
export default function SidebarEventInfo(_: Props) {
2424
const {profilingData, selectedCommitIndex} = useContext(ProfilerContext);
25-
const {viewSourceLineFunction} = useContext(ViewSourceContext);
25+
const {viewUrlSourceFunction} = useContext(ViewSourceContext);
2626

2727
const {stack} = useMemo(() => {
2828
if (
@@ -55,8 +55,8 @@ export default function SidebarEventInfo(_: Props) {
5555
const hasSource = source != null;
5656

5757
const onClick = () => {
58-
if (viewSourceLineFunction != null && source != null) {
59-
viewSourceLineFunction(...source);
58+
if (viewUrlSourceFunction != null && source != null) {
59+
viewUrlSourceFunction(...source);
6060
}
6161
};
6262

0 commit comments

Comments
 (0)