fix format on save bug causing loadfile calls and other related calls to become empty

Author: CapsAdmin

language_server/editor_helper.lua

@@ -604,8 +604,17 @@ function META:Format(code, path, extra_emitter_config)
 	config.emitter.remove_unused = do_remove_unused or false
 	config.analyzer.remove_unused = do_remove_unused or false
 	local file_data = self:IsLoaded(path) and self:GetFile(path)
-
-	if file_data and file_data.compiler and file_data.code:GetString() == code then
+	local loaded_parser_cfg = file_data and
+		file_data.compiler and
+		file_data.compiler.Config and
+		file_data.compiler.Config.parser or
+		{}
+	local can_reuse_loaded_tree = file_data and
+		file_data.compiler and
+		file_data.code:GetString() == code and
+		loaded_parser_cfg.skip_import == config.parser.skip_import
+
+	if can_reuse_loaded_tree then
 		local cfg_copy = {}
 
 		for k, v in pairs(config.emitter) do

nattlua/parser/parser.lua

@@ -387,6 +387,7 @@ function META:ParseFile(path--[[#: string]], config--[[#: nil | any]])
 	config.file_path = config.file_path or path
 	config.file_name = config.file_name or "@" .. path
 	return self:ParseString(code, config)
+
 end
 
 local imported_index = nil

test/tests/language_server/editor_helper.lua

@@ -175,6 +175,23 @@ do
 	helper:Recompile("./main.nlua")
 end
 
+do
+	local helper = EditorHelper.New()
+	helper:Initialize()
+	local format_path = "./main.lua"
+	local code = [[
+		assert(loadfile("game/run.lua"))()
+		local f = assert(loadfile("test/run.lua"))
+		assert(loadfile("game/run.lua"))()
+	]]
+	helper:OpenFile(format_path, code)
+	local formatted = helper:Format(code, format_path)
+	assert(formatted:find("assert%(loadfile%(\"game/run%.lua\"%)%)%(") ~= nil)
+	assert(formatted:find("local f = assert%(loadfile%(\"test/run%.lua\"%)%)") ~= nil)
+	assert(formatted:find("assert%(loadfile%)%(") == nil)
+	assert(formatted:find("local f = assert%(loadfile%)") == nil)
+end
+
 do
 	local helper = EditorHelper.New()
 	helper:Initialize()

test/tests/nattlua/emitter.lua

@@ -607,6 +607,32 @@ check(
 
 local x = import("platforms/windows/filesystem.nlua")]=]
 )
+do
+	local input = [[
+		assert(loadfile("game/run.lua"))()
+		local f = assert(loadfile("test/run.lua"))
+		assert(loadfile("game/run.lua"))()
+	]]
+	local output = assert(
+		nl.Compiler(
+			input,
+			nil,
+			{
+				parser = {skip_import = true},
+				emitter = {
+					pretty_print = true,
+					force_parenthesis = true,
+					string_quote = "\"",
+					skip_import = true,
+				},
+			}
+		):Emit()
+	)
+	assert(output:find("assert%(loadfile%(\"game/run%.lua\"%)%)%(") ~= nil)
+	assert(output:find("local f = assert%(loadfile%(\"test/run%.lua\"%)%)") ~= nil)
+	assert(output:find("assert%(loadfile%)%(") == nil)
+	assert(output:find("local f = assert%(loadfile%)") == nil)
+end
 identical([[hook.Add("Foo", "bar_foo", function(ply, pos)
     for i = 1, 10 do
         ply:SetPos(pos + VectorRand())