Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show machine annotations on the last line if index out of range #5012

Merged
merged 1 commit into from
Sep 27, 2023
Merged

Show machine annotations on the last line if index out of range #5012

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion app/assets/javascripts/state/MachineAnnotations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import { stateProperty } from "state/state_system/StateProperty";
import { StateMap } from "state/state_system/StateMap";
import { createStateFromInterface } from "state/state_system/CreateStateFromInterface";
import { submissionState } from "state/Submissions";

export interface MachineAnnotationData {
type: AnnotationType;
Expand Down Expand Up @@ -30,7 +31,13 @@
for (const data of annotations) {
const annotation = new MachineAnnotation(data);
const markedLength = annotation.rows ?? 1;
const line = annotation.row ? annotation.row + markedLength : 1;
let line = annotation.row ? annotation.row + markedLength : 1;

// show annotation on the last line if it is out of range
if (line > submissionState.codeByLine.length) {
line = submissionState.codeByLine.length;

Check warning on line 38 in app/assets/javascripts/state/MachineAnnotations.ts

View check run for this annotation

Codecov / codecov/patch

app/assets/javascripts/state/MachineAnnotations.ts#L38 

Added line #L38 was not covered by tests
}

if (this.byLine.has(line)) {
this.byLine.get(line)?.push(annotation);
} else {
Expand Down