refactors

typescript-bot · May 26, 2023 · 8a8956a · 8a8956a
1 parent e00ab81
commit 8a8956a
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/src/harness/fourslashImpl.ts b/src/harness/fourslashImpl.ts
@@ -3582,11 +3582,11 @@ export class TestState {
 
         let baselineContent = "";
         let offset = 0;
-        files.forEach(f => {
+        for (const f of files) {
             const result = getLinkedEditingBaselineWorker(f, offset, this.languageService);
             baselineContent += result.baselineContent + `\n\n\n`;
             offset = result.offset;
-        });
+        }
 
         Harness.Baseline.runBaseline(baselineFile, baselineContent);
 
@@ -3610,34 +3610,35 @@ export class TestState {
                 return { baselineContent: baselineContent + activeFile.content + `\n\n--No linked edits found--`, offset };
             }
 
-            let inlineLinkedEditBaseline: { start: number, end: number, index: number }[] = [];
+            let inlineLinkedEditBaselines: { start: number, end: number, index: number }[] = [];
             let linkedEditInfoBaseline = "";
-            linkedEditsByRange.forEach(([linkedEdit, positions]) => {
+            for (const edit of linkedEditsByRange) {
+                const [linkedEdit, positions] = edit;
                 let rangeStart = 0;
                 for (let j = 0; j < positions.length - 1; j++) {
                     // for each distinct range in the list of positions, add an entry to the list of places that need to be annotated in the baseline
                     if (positions[j] + 1 !== positions[j + 1]) {
-                        inlineLinkedEditBaseline.push({ start: positions[rangeStart], end: positions[j], index: offset });
+                        inlineLinkedEditBaselines.push({ start: positions[rangeStart], end: positions[j], index: offset });
                         rangeStart = j + 1;
                     }
                 }
-                inlineLinkedEditBaseline.push({ start: positions[rangeStart], end: positions[positions.length - 1], index: offset });
+                inlineLinkedEditBaselines.push({ start: positions[rangeStart], end: positions[positions.length - 1], index: offset });
 
                 // add the LinkedEditInfo with its index to the baseline
                 linkedEditInfoBaseline += `\n\n=== ${offset} ===\n` + linkedEdit;
                 offset++;
-            });
+            }
 
-            inlineLinkedEditBaseline = inlineLinkedEditBaseline.sort((a, b) => a.start - b.start);
+            inlineLinkedEditBaselines = inlineLinkedEditBaselines.sort((a, b) => a.start - b.start);
             const fileText = activeFile.content;
-            baselineContent += fileText.slice(0, inlineLinkedEditBaseline[0].start);
-            for (let i = 0 ; i < inlineLinkedEditBaseline.length - 1; i++) {
-                const e = inlineLinkedEditBaseline[i];
-                baselineContent += `[|/*${e.index}*/` + fileText.slice(e.start, e.end) + `|]` + fileText.slice(e.end, inlineLinkedEditBaseline[i + 1].start);
+            baselineContent += fileText.slice(0, inlineLinkedEditBaselines[0].start);
+            for (let i = 0; i < inlineLinkedEditBaselines.length; i++) {
+                const e = inlineLinkedEditBaselines[i];
+                const sliceEnd = inlineLinkedEditBaselines[i + 1]?.start;
+                baselineContent += `[|/*${e.index}*/` + fileText.slice(e.start, e.end) + `|]` + fileText.slice(e.end, sliceEnd);
             }
-            const n = inlineLinkedEditBaseline[inlineLinkedEditBaseline.length - 1];
-            baselineContent += `[|/*${n.index}*/` + fileText.slice(n.start, n.end) + `|]` + fileText.slice(inlineLinkedEditBaseline[inlineLinkedEditBaseline.length - 1].end) + linkedEditInfoBaseline;
 
+            baselineContent += linkedEditInfoBaseline;
             return { baselineContent, offset };
         }
     }