fix format on save vs project format obeying different newline rules

Author: CapsAdmin

language_server/editor_helper.lua

@@ -30,6 +30,23 @@ local Token = require("nattlua.lexer.token")
 local META = class.CreateTemplate("editor_helper")
 META:GetSet("WorkingDirectory", "./")
 
+local format_emitter_defaults = {
+	pretty_print = true,
+	string_quote = "\"",
+	no_semicolon = true,
+	comment_type_annotations = true,
+	type_annotations = "explicit",
+	force_parenthesis = true,
+	omit_parentheses_for_single_table_call = true,
+	trailing_newline = true,
+}
+
+local function apply_format_emitter_defaults(emitter_config)
+	for k, v in pairs(format_emitter_defaults) do
+		if emitter_config[k] == nil then emitter_config[k] = v end
+	end
+end
+
 function META:SetWorkingDirectory(dir)
 	self.WorkingDirectory = dir
 end
@@ -522,6 +539,9 @@ function META:Recompile(path, lol, diagnostics, on_save_path)
 							cfg_copy[k] = v
 						end
 
+
+						if cfg_copy.trailing_newline == nil then cfg_copy.trailing_newline = true end
+
 						cfg_copy.remove_unused = true
 						cfg_copy.skip_import = true
 						cfg_copy.no_pipeline = true
@@ -653,19 +673,7 @@ end
 function META:Format(code, path, extra_emitter_config)
 	path = path_util.Normalize(path)
 	local config = self:GetCompilerConfig(path)
-	local emitter_cfg = {
-		pretty_print = true,
-		string_quote = "\"",
-		no_semicolon = true,
-		comment_type_annotations = true,
-		type_annotations = "explicit",
-		force_parenthesis = true,
-		omit_parentheses_for_single_table_call = true,
-	}
-
-	for k, v in pairs(emitter_cfg) do
-		if config.emitter[k] == nil then config.emitter[k] = v end
-	end
+	apply_format_emitter_defaults(config.emitter)
 
 	config.parser = {skip_import = true}
 	config.emitter.comment_type_annotations = path:sub(-#".lua") == ".lua"

language_server/lsp.lua

@@ -254,8 +254,6 @@ lsp.methods["nattlua/format"] = function(params)
 	local path = to_fs_path(params.textDocument.uri)
 	local code = editor_helper:Format(params.code, path)
 
-	if code:sub(#code, #code) ~= "\n" then code = code .. "\n" end
-
 	return {
 		code = b64.encode(code),
 	}

test/tests/language_server/editor_helper.lua

@@ -204,6 +204,34 @@ do
 	assert(formatted:find("local f = assert%(loadfile%)") == nil)
 end
 
+do
+	local helper = EditorHelper.New()
+	helper:Initialize()
+	local format_path = "./main.nlua"
+	local code = [[
+		local a=1
+		local b=2]]
+	helper:OpenFile(format_path, code)
+	local formatted = helper:Format(code, format_path)
+	assert(formatted:sub(#formatted, #formatted) == "\n")
+
+	helper:SetConfigFunction(function(path)
+		return {
+			["get-compiler-config"] = function()
+				return {
+					emitter = {
+						trailing_newline = false,
+					},
+					lsp = {entry_point = path},
+				}
+			end,
+		}
+	end)
+
+	formatted = helper:Format(code, format_path)
+	assert(formatted:sub(#formatted, #formatted) ~= "\n")
+end
+
 do
 	local helper = EditorHelper.New()
 	helper:Initialize()

test/tests/language_server/integration.lua

@@ -85,6 +85,56 @@ do
 	assert(#highlights > 0, "Should have highlights for 'a'")
 end
 
+do
+	lsp.editor_helper:SetConfigFunction(function(path)
+		return {
+			["get-compiler-config"] = function()
+				return {
+					lsp = {entry_point = path},
+				}
+			end,
+		}
+	end)
+
+	local client = LSPClient.New()
+	client:SetWorkingDirectory("/workspace")
+	local root_uri = "file:///workspace"
+	client:Initialize(lsp, root_uri)
+	local file_uri = root_uri .. "/format.nlua"
+	local code = [[
+		local a=1
+		local b=2]]
+	client:Notify(
+		lsp,
+		"textDocument/didOpen",
+		{
+			textDocument = {
+				uri = file_uri,
+				languageId = "nattlua",
+				version = 1,
+				text = code,
+			},
+		}
+	)
+	local edits = client:Call(
+		lsp,
+		"textDocument/formatting",
+		{
+			textDocument = {uri = file_uri},
+			options = {
+				tabSize = 4,
+				insertSpaces = true,
+			},
+		}
+	)
+	assert(#edits > 0, "Formatting should return edits for unformatted code")
+	assert(edits[1].newText:sub(#edits[1].newText, #edits[1].newText) == "\n")
+
+	lsp.editor_helper:SetConfigFunction(function()
+		return
+	end)
+end
+
 do
 	local client = LSPClient.New()
 	client:SetWorkingDirectory("/workspace")