Fix number of newlines allowed before func/class (tests are failing)

package.json

@@ -243,6 +243,19 @@
 					"default": true,
 					"description": "Whether to reveal the terminal when launching the Godot Editor"
 				},
+				"godotTools.formatter.emptyLinesBeforeFunctions": {
+					"type": "string",
+					"enum": [
+						"one",
+						"two"
+					],
+					"enumDescriptions": [
+						"One line before functions. A more compact style.",
+						"Two lines before functions. Conforms to the official GDScript style guide."
+					],
+					"default": "two",
+					"description": "Number of blank lines to leave before functions."
+				},
 				"godotTools.lsp.serverProtocol": {
 					"type": [
 						"string"

src/formatter/textmate.ts

@@ -3,7 +3,7 @@ import * as fs from "fs";
 import * as vsctm from "vscode-textmate";
 import * as oniguruma from "vscode-oniguruma";
 import { keywords, symbols } from "./symbols";
-import { get_extension_uri, createLogger } from "../utils";
+import { get_configuration, get_extension_uri, createLogger } from "../utils";
 
 const log = createLogger("formatter.tm");
 
@@ -170,8 +170,11 @@ export function format_document(document: TextDocument): TextEdit[] {
 	}
 	const edits: TextEdit[] = [];
 
+	const emptyLinesBetweenFunctions : "one" | "two" = get_configuration("formatter.emptyLinesBetweenFunctions");
+
 	let lineTokens: vsctm.ITokenizeLineResult = null;
 	let onlyEmptyLinesSoFar = true;
+	let emptyLineCount = 0;
 	for (let lineNum = 0; lineNum < document.lineCount; lineNum++) {
 		const line = document.lineAt(lineNum);
 
@@ -181,22 +184,32 @@ export function format_document(document: TextDocument): TextEdit[] {
 			if (onlyEmptyLinesSoFar) {
 				edits.push(TextEdit.delete(line.rangeIncludingLineBreak));
 			} else {
-				// Limit the number of consecutive empty lines
-				const maxEmptyLines: number = 1;
-				if (maxEmptyLines === 1) {
-					if (lineNum < document.lineCount - 1 && document.lineAt(lineNum + 1).isEmptyOrWhitespace) {
-						edits.push(TextEdit.delete(line.rangeIncludingLineBreak));
-					}
-				} else if (maxEmptyLines === 2) {
-					if (lineNum < document.lineCount - 2 && document.lineAt(lineNum + 1).isEmptyOrWhitespace && document.lineAt(lineNum + 2).isEmptyOrWhitespace) {
-						edits.push(TextEdit.delete(line.rangeIncludingLineBreak));
-					}
-				}
+				emptyLineCount++;
 			}
 			continue;
 		}
 		onlyEmptyLinesSoFar = false;
 
+		// delete consecutive empty lines
+		if (emptyLineCount) {
+			let maxEmptyLines = 1;
+
+			const start = line.text.trimStart();
+			if (emptyLinesBetweenFunctions === "two") {
+				if (start.startsWith("func")) {
+					maxEmptyLines++;
+				}
+			}
+			if (start.startsWith("class")) {
+				maxEmptyLines++;
+			}
+
+			for (let i = (emptyLineCount - maxEmptyLines); i; i--) {
+				edits.push(TextEdit.delete(document.lineAt(lineNum - i).rangeIncludingLineBreak));
+			}
+			emptyLineCount = 0;
+		}
+
 		// skip comments
 		if (line.text[line.firstNonWhitespaceCharacterIndex] === "#") {
 			continue;