Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

Fix 4261 - Sort breakpoints by line number #4264

Merged
jasonLaster merged 3 commits into from
Oct 5, 2017
Merged

Fix 4261 - Sort breakpoints by line number #4264

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3861726
Fix 4261 - Sort breakpoints by line number
darkwing Oct 3, 2017
92095b3
Fix flow issues
darkwing Oct 4, 2017
06a1968
Use lodash's sortBy for breakpoint sorting
darkwing Oct 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/components/SecondaryPanes/Breakpoints.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { getFilename } from "../../utils/source";
import { showMenu, buildMenu } from "devtools-launchpad";
import CloseButton from "../shared/Button/Close";
import "./Breakpoints.css";
import { get } from "lodash";
import { get, sortBy } from "lodash";

import type { Breakpoint, Location } from "../../types";

Expand Down Expand Up @@ -57,8 +57,12 @@ function isCurrentlyPausedAtBreakpoint(pause, breakpoint) {
return bpId === pausedId;
}

function getBreakpointFilename(source) {
return source && source.toJS ? getFilename(source.toJS()) : "";
}

function renderSourceLocation(source, line, column) {
const filename = source ? getFilename(source.toJS()) : null;
const filename = getBreakpointFilename(source);
const isWasm = source && source.get("isWasm");
const columnVal =
isEnabled("columnBreakpoints") && column ? `:${column}` : "";
Expand Down Expand Up @@ -393,7 +397,13 @@ class Breakpoints extends PureComponent {
breakpoints.size === 0 ? (
<div className="pane-info">{L10N.getStr("breakpoints.none")}</div>
) : (
breakpoints.valueSeq().map(bp => this.renderBreakpoint(bp))
sortBy(
[...breakpoints.valueSeq()],
[
bp => getBreakpointFilename(bp.location.source),
bp => bp.location.line
]
).map(bp => this.renderBreakpoint(bp))
);

return <div className="pane breakpoints-list">{children}</div>;
Expand Down