Merge branch 'develop' into bugfix/modelling/modelling-overlapping

ls1intum · Jan 16, 2025 · 6708f62 · 6708f62
2 parents 7009803 + 247e7fb
commit 6708f62
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts
@@ -311,6 +311,13 @@ export class TextSubmissionAssessmentComponent extends TextAssessmentBaseCompone
                     // ("squish" the existing text block)
                     existingBlockRef.block!.startIndex = end;
                     newTextBlockRefs.push(existingBlockRef);
+                } else if (exEnd == end) {
+                    // existing:       |-----|
+                    // to add:    |----------|
+                    // ->         |-add--|ex-|
+                    // ("squish" the new text block)
+                    refToAdd.block!.endIndex = exStart;
+                    newTextBlockRefs.push(existingBlockRef);
                 }
             }
         }

diff --git a/...pt/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts b/...pt/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts
@@ -559,6 +559,28 @@ describe('TextSubmissionAssessmentComponent', () => {
                 [10, 15],
             ],
         },
+        // Two blocks, same end index
+        {
+            input: [
+                [377, 719],
+                [453, 719],
+            ],
+            output: [
+                [377, 453],
+                [453, 719],
+            ],
+        },
+        // Two blocks, same end index, wrong order
+        {
+            input: [
+                [453, 719],
+                [377, 719],
+            ],
+            output: [
+                [377, 453],
+                [453, 719],
+            ],
+        },
         // Two blocks, shifted
         {
             input: [