Merge pull request #3240 from codecrafters-io/fix-collapse-unchanged

Fix `collapseUnchanged` hiding changed lines in some diffs

Author: rohitpaulk

app/utils/code-mirror-collapse-unchanged.ts

@@ -129,7 +129,7 @@ const ChunkField = StateField.define<readonly Chunk[]>({
 
 function buildCollapsedRanges(state: EditorState, margin: number, minLines: number) {
   const builder = new RangeSetBuilder<Decoration>();
-  const isA = true; // state.facet(mergeConfig).side == 'a';
+  const isA = false; // state.facet(mergeConfig).side == 'a';
   const chunks = state.field(ChunkField);
   let prevLine = 1;
 

tests/acceptance/course-admin/view-diffs-test.js

@@ -103,7 +103,7 @@ module('Acceptance | course-admin | view-diffs', function (hooks) {
 
     assert.strictEqual(
       submissionsPage.diffTab.changedFiles[0].codeMirror.content.collapsedLinesPlaceholders[2].text,
-      'Expand 9 unchanged lines',
+      'Expand 7 unchanged lines',
       'The third placeholder should show correct number of lines',
     );