> = (
return newState;
}
case 'SOURCE_CODE_LOADING_SUCCESS': {
- const { file, source } = action;
+ const { file, code } = action;
const newState = new Map(state);
- newState.set(file, { type: 'AVAILABLE', source });
+ newState.set(file, { type: 'AVAILABLE', code });
return newState;
}
case 'SOURCE_CODE_LOADING_ERROR': {
diff --git a/src/test/components/SourceView.test.js b/src/test/components/BottomBox.test.js
similarity index 57%
rename from src/test/components/SourceView.test.js
rename to src/test/components/BottomBox.test.js
index cc9c337bc1..fb28fbc87b 100644
--- a/src/test/components/SourceView.test.js
+++ b/src/test/components/BottomBox.test.js
@@ -29,7 +29,7 @@ jest.mock('../../components/timeline', () => ({
Timeline: 'custom-timeline',
}));
-describe('SourceView', () => {
+describe('BottomBox', () => {
autoMockDomRect();
afterEach(() => {
delete Range.prototype.getClientRects;
@@ -50,9 +50,11 @@ describe('SourceView', () => {
const revision = '997f00815e6bc28806b75448c8829f0259d2cb28';
const filepath = 'widget/cocoa/nsAppShell.mm';
- window.fetch.get(
- `https://hg.mozilla.org/mozilla-central/raw-file/${revision}/${filepath}`,
- stripIndent`
+ window.fetch
+ .post('http://127.0.0.1:8000/source/v1', 500)
+ .get(
+ `https://hg.mozilla.org/mozilla-central/raw-file/${revision}/${filepath}`,
+ stripIndent`
line 1
line 2
line 3
@@ -61,10 +63,30 @@ describe('SourceView', () => {
line 6
line 7
`
- );
+ )
+ .post(
+ 'http://127.0.0.1:8000/asm/v1',
+ JSON.stringify({
+ startAddress: '0x20',
+ size: '0x1a',
+ arch: 'x86_64',
+ syntax: ['Intel'],
+ instructions: [
+ [0, 'push rsi'],
+ [1, 'push rdi'],
+ [2, 'push rbx'],
+ [3, 'sub rsp, 0x20'],
+ [7, 'mov rsi, rcx'],
+ [10, 'mov rdi, qword [rcx + 0x58]'],
+ [14, 'mov ebx, edi'],
+ [16, 'and ebx, 0x1400'],
+ [22, 'call 0x16c5d35'],
+ ],
+ })
+ );
const { profile } = getProfileFromTextSamples(`
- A[file:hg:hg.mozilla.org/mozilla-central:${filepath}:${revision}][line:4]
+ A[file:hg:hg.mozilla.org/mozilla-central:${filepath}:${revision}][line:4][address:30][sym:Asym:20:1a][lib:libA.so]
B[file:git:github.com/rust-lang/rust:library/std/src/sys/unix/thread.rs:53cb7b09b00cbea8754ffb78e7e3cb521cb8af4b]
C[lib:libC.so][file:s3:gecko-generated-sources:a5d3747707d6877b0e5cb0a364e3cb9fea8aa4feb6ead138952c2ba46d41045297286385f0e0470146f49403e46bd266e654dfca986de48c230f3a71c2aafed4/ipc/ipdl/PBackgroundChild.cpp:]
D[lib:libD.so]
@@ -75,7 +97,7 @@ describe('SourceView', () => {
updateUrlState(
stateFromLocation({
pathname: '/from-browser',
- search: '',
+ search: '?symbolServer=http://127.0.0.1:8000',
hash: '',
})
)
@@ -89,22 +111,25 @@ describe('SourceView', () => {
return {
sourceView: () => document.querySelector('.sourceView'),
+ assemblyView: () => document.querySelector('.assemblyView'),
};
}
it('does not show the source view at loadtime', () => {
- const { sourceView } = setup();
+ const { sourceView, assemblyView } = setup();
expect(sourceView()).not.toBeInTheDocument();
+ expect(assemblyView()).not.toBeInTheDocument();
});
- it('should show the source view when double clicking on a line in the tree view', async () => {
- const { sourceView } = setup();
+ it('should show the source view when a line in the tree view is double-clicked', async () => {
+ const { sourceView, assemblyView } = setup();
const frameElement = screen.getByRole('treeitem', { name: /^A/ });
fireFullClick(frameElement);
fireFullClick(frameElement, { detail: 2 });
expect(sourceView()).toBeInTheDocument();
+ expect(assemblyView()).not.toBeInTheDocument();
const sourceViewElement = ensureExists(sourceView());
const sourceViewContent = await within(sourceViewElement).findByRole(
@@ -117,4 +142,44 @@ describe('SourceView', () => {
expect(sourceViewContent).toMatchSnapshot();
});
+
+ it('should show the assembly view when pressing the toggle button', async () => {
+ const { sourceView, assemblyView } = setup();
+
+ const frameElement = screen.getByRole('treeitem', { name: /^A/ });
+
+ fireFullClick(frameElement);
+ fireFullClick(frameElement, { detail: 2 });
+ expect(sourceView()).toBeInTheDocument();
+ expect(assemblyView()).not.toBeInTheDocument();
+
+ const asmViewShowButton = ensureExists(
+ document.querySelector('.bottom-assembly-button')
+ );
+ fireFullClick(asmViewShowButton);
+
+ expect(sourceView()).toBeInTheDocument();
+ expect(assemblyView()).toBeInTheDocument();
+
+ const assemblyViewElement = ensureExists(assemblyView());
+ const assemblyViewContent = await within(assemblyViewElement).findByRole(
+ 'textbox'
+ );
+
+ // Find one of the instructions. Once we have assembly syntax highlighting,
+ // we'll probably have to match on a smaller string.
+ await within(assemblyViewContent).findAllByText(
+ 'mov rdi, qword [rcx + 0x58]'
+ );
+
+ expect(assemblyViewContent).toMatchSnapshot();
+
+ // Click the toggle button again and make sure the assembly view hides.
+ const asmViewHideButton = ensureExists(
+ document.querySelector('.bottom-assembly-button')
+ );
+ fireFullClick(asmViewHideButton);
+
+ expect(assemblyView()).not.toBeInTheDocument();
+ });
});
diff --git a/src/test/components/__snapshots__/SourceView.test.js.snap b/src/test/components/__snapshots__/BottomBox.test.js.snap
similarity index 60%
rename from src/test/components/__snapshots__/SourceView.test.js.snap
rename to src/test/components/__snapshots__/BottomBox.test.js.snap
index 2db3a04310..9620f6c330 100644
--- a/src/test/components/__snapshots__/SourceView.test.js.snap
+++ b/src/test/components/__snapshots__/BottomBox.test.js.snap
@@ -1,6 +1,67 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`SourceView should show the source view when double clicking on a line in the tree view 1`] = `
+exports[`BottomBox should show the assembly view when pressing the toggle button 1`] = `
+
+
+ push rsi
+
+
+ push rdi
+
+
+ push rbx
+
+
+ sub rsp, 0x20
+
+
+ mov rsi, rcx
+
+
+ mov rdi, qword [rcx + 0x58]
+
+
+ mov ebx, edi
+
+
+ and ebx, 0x1400
+
+
+ call 0x16c5d35
+
+
();
+
+// A "state field" for the timings.
+const timingsField = StateField.define({
+ create() {
+ return emptyLineTimings;
+ },
+ update(timings, transaction) {
+ // This is like a reducer. Find an updateTimingsEffect in the transaction
+ // and set this field to the timings in it.
+ let newTimings = timings;
+ for (const effect of transaction.effects) {
+ if (effect.is(updateTimingsEffect)) {
+ newTimings = effect.value;
+ }
+ }
+ return newTimings;
+ },
+});
+
+// Finds all lines with non-zero line timings, for the highlight line.
+// The line numbers are then converted into "positions", i.e. character offsets
+// in the document, for the start of the line.
+// Then they are sorted, because our caller wants to have a sorted list.
+function getSortedStartPositionsOfNonZeroLines(state: EditorState): number[] {
+ const timings = state.field(timingsField);
+ const nonZeroLines = new Set();
+ for (const lineNumber of timings.totalLineHits.keys()) {
+ nonZeroLines.add(lineNumber);
+ }
+ for (const lineNumber of timings.selfLineHits.keys()) {
+ nonZeroLines.add(lineNumber);
+ }
+ const lineCount = state.doc.lines;
+ const positions = [...nonZeroLines]
+ .filter((l) => l <= lineCount)
+ .map((lineNumber) => state.doc.line(lineNumber).from);
+ positions.sort((a, b) => a - b);
+ return positions;
+}
+
+// This is an "extension" which applies the "cm-nonZeroLine" class to all gutter
+// elements for lines with non-zero timings. It is like a piece of derived state;
+// it needs to be recomputed whenever one of the input states change. The input
+// states are the editor contents ("doc") and the value of the timings field.
+// The editor contents are relevant because the output is expressed in terms of
+// positions, i.e. character offsets from the document start, and those positions
+// need to be updated if the amount of text in a line changes. This happens when
+// we replace the file placeholder content with the actual file content.
+const nonZeroLineGutterHighlighter = gutterLineClass.compute(
+ ['doc', timingsField],
+ (state) => {
+ const positions = getSortedStartPositionsOfNonZeroLines(state);
+ return RangeSet.of(positions.map((p) => nonZeroLineGutterMarker.range(p)));
+ }
+);
+
+// Same as the previous extension, but this one is for the main editor. There
+// doesn't seem to be a way to set a class for the entire line, i.e. both the
+// gutter elements and the main editor elements of that line.
+const nonZeroLineDecorationHighlighter = EditorView.decorations.compute(
+ ['doc', timingsField],
+ (state) => {
+ const positions = getSortedStartPositionsOfNonZeroLines(state);
+ return RangeSet.of(positions.map((p) => nonZeroLineDecoration.range(p)));
+ }
+);
+
+// This is a "gutter marker" which renders just a string and nothing else.
+// It is used for the AddressTimings annotations, i.e. for the numbers in the
+// gutter.
+export class StringMarker extends GutterMarker {
+ _s: string;
+
+ constructor(s: string) {
+ super();
+ this._s = s;
+ }
+
+ toDOM() {
+ return document.createTextNode(this._s);
+ }
+}
+
+// The "extension" which manages the elements in the gutter for the "total"
+// column.
+const totalTimingsGutter = gutter({
+ class: 'cm-total-timings-gutter',
+ lineMarker(view, line) {
+ // Return a gutter marker for this line, or null.
+ const lineNumber = view.state.doc.lineAt(line.from).number;
+ const timings = view.state.field(timingsField);
+ const totalTime = timings.totalLineHits.get(lineNumber);
+ return totalTime !== undefined ? new StringMarker(totalTime) : null;
+ },
+ lineMarkerChange(update) {
+ // Return true if the update affects the total timings in the gutter.
+ return update.transactions.some((t) =>
+ t.effects.some((e) => e.is(updateTimingsEffect))
+ );
+ },
+});
+
+// The "extension" which manages the elements in the gutter for the "self"
+// column.
+const selfTimingsGutter = gutter({
+ class: 'cm-self-timings-gutter',
+ lineMarker(view, line) {
+ // Return a gutter marker for this line, or null.
+ const lineNumber = view.state.doc.lineAt(line.from).number;
+ const timings = view.state.field(timingsField);
+ const selfTime = timings.selfLineHits.get(lineNumber);
+ return selfTime !== undefined ? new StringMarker(selfTime) : null;
+ },
+ lineMarkerChange(update) {
+ // Return true if the update affects the self timings in the gutter.
+ return update.transactions.some((t) =>
+ t.effects.some((e) => e.is(updateTimingsEffect))
+ );
+ },
+});
+
+// All extensions which have to do with timings, grouped into one extension.
+export const timingsExtension = [
+ timingsField,
+ totalTimingsGutter,
+ selfTimingsGutter,
+ nonZeroLineGutterHighlighter,
+ nonZeroLineDecorationHighlighter,
+];
diff --git a/src/utils/index.js b/src/utils/index.js
index a2f2922f78..6356a69c8c 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -120,3 +120,21 @@ export function countPositiveValues(arr: Array): number {
}
return count;
}
+
+/**
+ * Find the highest number among the map values and return its key.
+ * Returns undefined if the map is empty.
+ * If multiple entries with the highest value exist, it returns the key of the
+ * first encountered highest value.
+ */
+export function mapGetKeyWithMaxValue(map: Map): K | void {
+ let maxValue = -Infinity;
+ let keyForMaxValue;
+ for (const [key, value] of map) {
+ if (value > maxValue) {
+ maxValue = value;
+ keyForMaxValue = key;
+ }
+ }
+ return keyForMaxValue;
+}