Allow creation of user annotations based on a selection

app/assets/javascripts/code_listing.ts

@@ -9,10 +9,12 @@ import "components/annotations/annotation_options";
 import "components/annotations/annotations_count_badge";
 import { annotationState } from "state/Annotations";
 import { exerciseState } from "state/Exercises";
+import { triggerSelectionEnd } from "components/annotations/select";
 
 const MARKING_CLASS = "marked";
 
 function initAnnotations(submissionId: number, courseId: number, exerciseId: number, userId: number, code: string, codeLines: number, questionMode = false): void {
+    userAnnotationState.reset();
     submissionState.code = code;
     courseState.id = courseId;
     exerciseState.id = exerciseId;
@@ -28,8 +30,8 @@ function initAnnotations(submissionId: number, courseId: number, exerciseId: num
         const codeListingRow = new CodeListingRow();
         codeListingRow.row = i + 1;
         codeListingRow.renderedCode = code;
-        rows[i].innerHTML = "";
-        render(codeListingRow, rows[i]);
+        render(codeListingRow, rows[i].parentElement, { renderBefore: rows[i] });
+        rows[i].remove();
     }
 }
 
@@ -39,6 +41,8 @@ function addMachineAnnotations(data: MachineAnnotationData[]): void {
 
 function initAnnotateButtons(): void {
     userState.addPermission("annotation.create");
+
+    document.addEventListener("pointerup", () => triggerSelectionEnd());
 }
 
 function loadUserAnnotations(): void {

app/assets/javascripts/components/annotations/annotation_marker.ts

@@ -0,0 +1,132 @@
+import { customElement, property } from "lit/decorators.js";
+import { render, html, LitElement, TemplateResult } from "lit";
+import tippy, { Instance as Tippy, createSingleton } from "tippy.js";
+import { AnnotationData, annotationState, compareAnnotationOrders, isUserAnnotation } from "state/Annotations";
+import { StateController } from "state/state_system/StateController";
+
+/**
+ * A marker that styles the slotted content and shows a tooltip with annotations.
+ *
+ * @prop {AnnotationData[]} annotations The annotations to show in the tooltip.
+ *
+ * @element d-annotation-marker
+ */
+@customElement("d-annotation-marker")
+export class AnnotationMarker extends LitElement {
+    @property({ type: Array })
+    annotations: AnnotationData[];
+
+    state = new StateController(this);
+
+
+    static colors = {
+        "error": "var(--error-color, red)",
+        "warning": "var(--warning-color, yellow)",
+        "info": "var(--info-color, blue)",
+        "annotation": "var(--annotation-color, green)",
+        "question": "var(--question-color, orange)",
+        "annotation-intense": "var(--annotation-intense-color, green)",
+        "question-intense": "var(--question-intense-color, orange)",
+    };
+
+    static getStyle(annotation: AnnotationData): string {
+        if (["error", "warning", "info"].includes(annotation.type)) {
+            return `text-decoration: wavy underline ${AnnotationMarker.colors[annotation.type]} ${annotationState.isHovered(annotation) ? 2 : 1}px;`;
+        } else {
+            const colorKey = annotationState.isHovered(annotation) ? `${annotation.type}-intense` : annotation.type;
+            return `
+                background: ${AnnotationMarker.colors[colorKey]};
+                padding-top: 2px;
+                padding-bottom: 2px;
+                margin-top: -2px;
+                margin-bottom: -2px;
+            `;
+        }
+    }
+
+    static tippyInstances: Tippy[] = [];
+    // Using a singleton to avoid multiple tooltips being open at the same time.
+    static tippySingleton = createSingleton([], {
+        placement: "bottom-start",
+        interactive: true,
+        interactiveDebounce: 25,
+        delay: [500, 25],
+        offset: [-10, -2],
+        // This transition fixes a bug where overlap with the previous tooltip was taken into account when positioning
+        moveTransition: "transform 0.001s ease-out",
+        appendTo: () => document.querySelector(".code-table"),
+    });
+    static registerTippyInstance(instance: Tippy): void {
+        this.tippyInstances.push(instance);
+        this.tippySingleton.setInstances(this.tippyInstances);
+    }
+    static unregisterTippyInstance(instance: Tippy): void {
+        this.tippyInstances = this.tippyInstances.filter(i => i !== instance);
+        this.tippySingleton.setInstances(this.tippyInstances);
+    }
+
+    // Annotations that are displayed inline should show up as tooltips.
+    get hiddenAnnotations(): AnnotationData[] {
+        return this.annotations.filter(a => !annotationState.isVisible(a)).sort(compareAnnotationOrders);
+    }
+
+    tippyInstance: Tippy;
+
+    renderTooltip(): void {
+        if (this.tippyInstance) {
+            AnnotationMarker.unregisterTippyInstance(this.tippyInstance);
+            this.tippyInstance.destroy();
+            this.tippyInstance = undefined;
+        }
+
+        if (this.hiddenAnnotations.length === 0) {
+            return;
+        }
+
+        const tooltip = document.createElement("div");
+        tooltip.classList.add("marker-tooltip");
+        render(this.hiddenAnnotations.map(a => isUserAnnotation(a) ?
+            html`<d-user-annotation .data=${a}></d-user-annotation>` :
+            html`<d-machine-annotation .data=${a}></d-machine-annotation>`), tooltip);
+
+        this.tippyInstance = tippy(this, {
+            content: tooltip,
+        });
+        AnnotationMarker.registerTippyInstance(this.tippyInstance);
+    }
+
+    get sortedAnnotations(): AnnotationData[] {
+        return this.annotations.sort( (a, b) => {
+            if (annotationState.isHovered(a)) {
+                return -1;
+            } else if (annotationState.isHovered(b)) {
+                return 1;
+            } else {
+                return compareAnnotationOrders(a, b);
+            }
+        });
+    }
+
+    get machineAnnotationMarkerSVG(): TemplateResult | undefined {
+        const firstMachineAnnotation = this.sortedAnnotations.find(a => !isUserAnnotation(a));
+        const size = annotationState.isHovered(firstMachineAnnotation) ? 20 : 14;
+        return firstMachineAnnotation && html`<svg style="position: absolute; top: ${16 - size/2}px; left: -${size/2}px" width="${size}" height="${size}" viewBox="0 0 24 24">
+            <path fill="${AnnotationMarker.colors[firstMachineAnnotation.type]}" d="M7.41 15.41L12 10.83l4.59 4.58L18 14l-6-6l-6 6l1.41 1.41Z"/>
+        </svg>`;
+    }
+
+    get annotationStyles(): string {
+        return this.sortedAnnotations.reverse().map(a => AnnotationMarker.getStyle(a)).join(" ");
+    }
+
+    render(): TemplateResult {
+        this.renderTooltip();
+
+        return html`<style>
+            :host {
+                position: relative;
+                ${this.annotationStyles}
+            }
+        </style><slot>${this.machineAnnotationMarkerSVG}</slot>`;
+    }
+}

app/assets/javascripts/components/annotations/annotations_cell.ts

@@ -50,6 +50,13 @@ export class AnnotationsCell extends ShadowlessLitElement {
             "saved_annotation_id": e.detail.savedAnnotationId || undefined,
         };
 
+        if (this.row > 0 && userAnnotationState.selectedRange) {
+            annotationData["line_nr"] = userAnnotationState.selectedRange.row;
+            annotationData["rows"] = userAnnotationState.selectedRange.rows;
+            annotationData["column"] = userAnnotationState.selectedRange.column;
+            annotationData["columns"] = userAnnotationState.selectedRange.columns;
+        }
+
         try {
             const mode = annotationState.isQuestionMode ? "question" : "annotation";
             await userAnnotationState.create(annotationData, submissionState.id, mode, e.detail.saveAnnotation, e.detail.savedAnnotationTitle);

app/assets/javascripts/components/annotations/annotations_count_badge.ts

@@ -16,8 +16,8 @@ export class AnnotationsCountBadge extends ShadowlessLitElement {
     }
 
     render(): TemplateResult {
-        return html`
+        return this.annotationsCount ? html`
             <div class="badge rounded-pill">${this.annotationsCount}</div>
-        `;
+        ` : html``;
     }
 }

app/assets/javascripts/components/annotations/code_listing_row.ts

@@ -2,17 +2,21 @@ import { ShadowlessLitElement } from "components/meta/shadowless_lit_element";
 import { customElement, property } from "lit/decorators.js";
 import { html, TemplateResult } from "lit";
 import { unsafeHTML } from "lit/directives/unsafe-html.js";
-import "components/annotations/hidden_annotations_dot";
 import "components/annotations/annotations_cell";
-import "components/annotations/machine_annotation_marker";
+import "components/annotations/annotation_marker";
+import "components/annotations/hidden_annotations_dot";
 import { i18nMixin } from "components/meta/i18n_mixin";
 import { initTooltips } from "util.js";
 import { PropertyValues } from "@lit/reactive-element";
 import { userState } from "state/Users";
-import { annotationState } from "state/Annotations";
+import { AnnotationData, annotationState, compareAnnotationOrders } from "state/Annotations";
 import { MachineAnnotationData, machineAnnotationState } from "state/MachineAnnotations";
-import { MachineAnnotationMarker } from "components/annotations/machine_annotation_marker";
 import { wrapRangesInHtml, range } from "mark";
+import { SelectedRange, UserAnnotationData, userAnnotationState } from "state/UserAnnotations";
+import { AnnotationMarker } from "components/annotations/annotation_marker";
+import "components/annotations/selection_marker";
+import "components/annotations/create_annotation_button";
+import { triggerSelectionStart } from "components/annotations/select";
 
 /**
  * This component represents a row in the code listing.
@@ -28,22 +32,27 @@ import { wrapRangesInHtml, range } from "mark";
 export class CodeListingRow extends i18nMixin(ShadowlessLitElement) {
     @property({ type: Number })
     row: number;
-    @property({ type: String })
+    @property({ type: String, attribute: "rendered-code" })
     renderedCode: string;
 
-    @property({ state: true })
-    showForm: boolean;
 
     /**
      * Calculates the range of the code that is covered by the given annotation.
      * If the annotation spans multiple lines, the range will be the whole line unless this is the first or last line.
      * In that case, the range will be the part of the line that is covered by the annotation.
      * @param annotation The annotation to calculate the range for.
      */
-    getRangeFromAnnotation(annotation: MachineAnnotationData): range {
+    getRangeFromAnnotation(annotation: AnnotationData | SelectedRange): range {
+        const isMachineAnnotation = ["error", "warning", "info"].includes((annotation as AnnotationData).type);
         const rowsLength = annotation.rows ?? 1;
-        const lastRow = annotation.row + rowsLength ?? 0;
-        const firstRow = annotation.row + 1 ?? 0;
+        let lastRow = annotation.row ? annotation.row + rowsLength : 0;
+        let firstRow = annotation.row ? annotation.row + 1 : 0;
+
+        if (!isMachineAnnotation) {
+            // rows on user annotations are 1-based, so we need to subtract 1
+            firstRow -= 1;
+            lastRow -= 1;
+        }
 
         let start = 0;
         if (this.row === firstRow) {
@@ -53,66 +62,103 @@ export class CodeListingRow extends i18nMixin(ShadowlessLitElement) {
         let length = Infinity;
         if (this.row === lastRow) {
             if (annotation.column !== undefined && annotation.column !== null) {
-                length = annotation.columns || 0;
+                const defaultLength = isMachineAnnotation ? 0 : Infinity;
+                length = annotation.columns || defaultLength;
             }
         }
 
         return { start: start, length: length, data: annotation };
     }
 
     get wrappedCode(): string {
-        return wrapRangesInHtml(
-            this.renderedCode,
-            this.machineAnnotationToMark.map(a => this.getRangeFromAnnotation(a)),
-            "d-machine-annotation-marker",
-            (node: MachineAnnotationMarker, range) => {
+        const annotationsToMark = [...this.userAnnotationsToMark, ...this.machineAnnotationsToMark].sort(compareAnnotationOrders);
+        const codeToMark = this.renderedCode;
+        let annotationsMarked = wrapRangesInHtml(
+            codeToMark,
+            annotationsToMark.map(a => this.getRangeFromAnnotation(a)),
+            "d-annotation-marker",
+            (node: AnnotationMarker, range) => {
                 // these nodes will be recompiled to html, so we need to store the data in a json string
                 const annotations = JSON.parse(node.getAttribute("annotations")) || [];
                 annotations.push(range.data);
                 node.setAttribute("annotations", JSON.stringify(annotations));
             });
+        if ( userAnnotationState.showForm && this.shouldMarkSelection ) {
+            annotationsMarked = wrapRangesInHtml(annotationsMarked, [this.getRangeFromAnnotation(userAnnotationState.selectedRange)], "d-selection-marker");
+        }
+        return annotationsMarked;
     }
 
     firstUpdated(_changedProperties: PropertyValues): void {
         super.firstUpdated(_changedProperties);
         initTooltips(this);
+        this.addEventListener("pointerdown", e => triggerSelectionStart(e));
     }
 
     get canCreateAnnotation(): boolean {
         return userState.hasPermission("annotation.create");
     }
 
-    get addAnnotationTitle(): string {
-        return annotationState.isQuestionMode ? I18n.t("js.annotations.options.add_question") : I18n.t("js.annotations.options.add_annotation");
+    get machineAnnotationsToMark(): MachineAnnotationData[] {
+        return machineAnnotationState.byMarkedLine.get(this.row) || [];
     }
 
-    get machineAnnotationToMark(): MachineAnnotationData[] {
-        return machineAnnotationState.byMarkedLine.get(this.row) || [];
+    get userAnnotationsToMark(): UserAnnotationData[] {
+        return userAnnotationState.rootIdsByMarkedLine.get(this.row)?.map(i => userAnnotationState.byId.get(i)) || [];
+    }
+
+    get shouldMarkSelection(): boolean {
+        return userAnnotationState.selectedRange &&
+            userAnnotationState.selectedRange.row <= this.row &&
+            userAnnotationState.selectedRange.row + (userAnnotationState.selectedRange.rows ?? 1) > this.row;
+    }
+
+    get showForm(): boolean {
+        const range = userAnnotationState.selectedRange;
+        return userAnnotationState.showForm && range && range.row + range.rows - 1 === this.row;
+    }
+
+    closeForm(): void {
+        userAnnotationState.showForm = false;
+        userAnnotationState.selectedRange = undefined;
+    }
+
+    get fullLineAnnotations(): UserAnnotationData[] {
+        return this.userAnnotationsToMark
+            .filter(a => !a.column&& !a.columns)
+            .sort(compareAnnotationOrders);
+    }
+
+    get hasFullLineSelection(): boolean {
+        return this.shouldMarkSelection && !userAnnotationState.selectedRange.column && !userAnnotationState.selectedRange.columns;
+    }
+
+    get codeLineClass(): string {
+        return this.hasFullLineSelection ? `code-line-${annotationState.isQuestionMode ? "question" : "annotation"}` : "";
     }
 
     render(): TemplateResult {
         return html`
+            <tr id="line-${this.row}" class="lineno">
                 <td class="rouge-gutter gl">
-                    ${this.canCreateAnnotation ? html`
-                        <button class="btn btn-icon btn-icon-filled bg-primary annotation-button"
-                                @click=${() => this.showForm = true}
-                                data-bs-toggle="tooltip"
-                                data-bs-placement="top"
-                                data-bs-trigger="hover"
-                                title="${this.addAnnotationTitle}">
-                            <i class="mdi mdi-comment-plus-outline mdi-18"></i>
-                        </button>
-                    ` : html``}
+                    ${this.canCreateAnnotation ? html`<d-create-annotation-button row="${this.row}"></d-create-annotation-button>` : html``}
                     <d-hidden-annotations-dot .row=${this.row}></d-hidden-annotations-dot>
-                    <pre>${this.row}</pre>
+                    <pre style="user-select: none;">${this.row}</pre>
                 </td>
                 <td class="rouge-code">
-                    <pre style="overflow: visible; display: inline-block;" >${unsafeHTML(this.wrappedCode)}</pre>
+                    ${this.fullLineAnnotations.length > 0 ? html`
+                        <d-annotation-marker style="width: 100%; display: block" .annotations=${this.fullLineAnnotations}>
+                            <pre class="code-line ${this.codeLineClass}">${unsafeHTML(this.wrappedCode)}</pre>
+                        </d-annotation-marker>
+                    ` : html`
+                        <pre class="code-line ${this.codeLineClass}">${unsafeHTML(this.wrappedCode)}</pre>
+                    `}
                     <d-annotations-cell .row=${this.row}
                                         .showForm="${this.showForm}"
-                                        @close-form=${() => this.showForm = false}
+                                        @close-form=${() => this.closeForm()}
                     ></d-annotations-cell>
                 </td>
+            </tr>
         `;
     }
 }