fixup! feat(editor): add option to insert newline when folding last line

Author: akyTheDev

src/vs/editor/contrib/folding/browser/foldingModel.ts

@@ -64,7 +64,7 @@ export class FoldingModel {
 			let k = 0; // index from [0 ... this.regions.length]
 			let dirtyRegionEndLine = -1; // end of the range where decorations need to be updated
 			let lastHiddenLine = -1; // the end of the last hidden lines
-			let isNewLineNeededAtEnd: boolean = false;
+			let isNewlineNeededAtEnd: boolean = false;
 			const updateDecorationsUntil = (index: number) => {
 				while (k < index) {
 					const endLineNumber = this._regions.getEndLineNumber(k);
@@ -92,34 +92,31 @@ export class FoldingModel {
 
 					dirtyRegionEndLine = Math.max(dirtyRegionEndLine, this._regions.getEndLineNumber(index));
 
-					// If isNewLineNeededAtEnd is already true, we can skip this check
-					if (!isNewLineNeededAtEnd && this.editor.getOption(EditorOption.foldingAddNewlineAtEnd) && newCollapseState && dirtyRegionEndLine === this._textModel.getLineCount()) {
-						isNewLineNeededAtEnd = true;
+					// If isNewlineNeededAtEnd is already true, we can skip this check
+					if (!isNewlineNeededAtEnd && this.editor.getOption(EditorOption.foldingAddNewlineAtEnd) && newCollapseState && dirtyRegionEndLine === this._textModel.getLineCount()) {
+						const lastLineContent = this._textModel.getLineContent(dirtyRegionEndLine);
+						// Only insert a newline if the last line is not already empty
+						if (lastLineContent.trim().length > 0) {
+							this._textModel.pushEditOperations(
+								null,
+								[{
+									range: {
+										startLineNumber: dirtyRegionEndLine,
+										startColumn: lastLineContent.length + 1,
+										endLineNumber: dirtyRegionEndLine,
+										endColumn: lastLineContent.length + 1,
+									},
+									text: this._textModel.getEOL(),
+									forceMoveMarkers: true
+								}],
+								() => null
+							);
+						}
 					}
+					isNewlineNeededAtEnd = true;
 				}
 			}
 
-			if (isNewLineNeededAtEnd) {
-				const lastLineContent = this._textModel.getLineContent(dirtyRegionEndLine);
-
-				// Only insert if the line isn't already empty
-				if (lastLineContent.trim().length > 0) {
-					this._textModel.pushEditOperations(
-						null,
-						[{
-							range: {
-								startLineNumber: dirtyRegionEndLine,
-								startColumn: lastLineContent.length + 1,
-								endLineNumber: dirtyRegionEndLine,
-								endColumn: lastLineContent.length + 1,
-							},
-							text: this._textModel.getEOL(),
-							forceMoveMarkers: true
-						}],
-						() => null
-					);
-				}
-			}
 
 			updateDecorationsUntil(this._regions.length);
 		});

src/vs/editor/contrib/folding/test/browser/foldingModel.test.ts

@@ -955,7 +955,7 @@ suite('Folding Model', () => {
 		}
 	});
 
-	test('foldingAddNewlineAtEnd - should add newline when folding last line', () => {
+	test('add newline when foldingAddNewlineAtEnd is enabled', () => {
 		const lines = [
 			/* 1*/	'class A:',
 			/* 2*/	'    def foo(self):',
@@ -985,7 +985,7 @@ suite('Folding Model', () => {
 	});
 
 
-	test('foldingAddNewlineAtEnd - should not add newline when option is disabled', () => {
+	test('no newline when foldingAddNewlineAtEnd is disabled', () => {
 		const lines = [
 			/* 1*/	'class A:',
 			/* 2*/	'    def foo(self):',
@@ -1011,7 +1011,7 @@ suite('Folding Model', () => {
 		}
 	});
 
-	test('foldingAddNewlineAtEnd - should not add newline when last line is already empty', () => {
+	test('no newline when last line is already empty', () => {
 		const lines = [
 			/* 1*/	'class A:',
 			/* 2*/	'    def foo(self):',
@@ -1039,7 +1039,7 @@ suite('Folding Model', () => {
 		}
 	});
 
-	test('foldingAddNewlineAtEnd - should not add newline when folding non-last line', () => {
+	test('no newline when folding non-last line', () => {
 		const lines = [
 			/* 1*/	'class A:',
 			/* 2*/	'    def foo(self):',

src/vs/editor/contrib/folding/test/browser/hiddenRangeModel.test.ts

@@ -111,6 +111,4 @@ suite('Hidden Range Model', () => {
 			hiddenRangeModel.dispose();
 		}
 	});
-
-
 });