fix forward declaration of some types not getting reset

Author: CapsAdmin

nattlua/base_environment.lua

@@ -114,6 +114,23 @@ return {
 
 		assert(compiler:Analyze(analyzer))
 
+		do
+			local globals = {
+				"require",
+				"getmetatable",
+				"setmetatable",
+				"rawget",
+				"type",
+			}
+
+			for i = 1, #globals do
+				local key = LStringNoMeta(globals[i])
+				local val = typesystem_env:Get(key)
+
+				if val then runtime_env:Set(key, val) end
+			end
+		end
+
 		if parent_analyzer then
 			for path, _ in pairs(compiler.analyzer.parsed_paths) do
 				parent_analyzer.parsed_paths[path] = true

test/tests/language_server/editor_helper.lua

@@ -1,5 +1,6 @@
 _G.TEST = true
 local EditorHelper = require("language_server.editor_helper")
+local LStringNoMeta = require("nattlua.types.string").LStringNoMeta
 local path = "./test.nlua"
 
 local function single_file(code)
@@ -29,6 +30,17 @@ do
 	assert(editor:GetHover(path, 0, 13).obj:GetData() == 2)
 end
 
+do
+	local helper = EditorHelper.New()
+	local runtime_env, typesystem_env = helper:GetEnvironment()
+
+	for _, env in ipairs({runtime_env, typesystem_env}) do
+		assert(env:Get(LStringNoMeta("type")).Type == "function")
+		assert(env:Get(LStringNoMeta("require")).Type == "function")
+		assert(env:Get(LStringNoMeta("rawget")).Type == "function")
+	end
+end
+
 do
 	local code = [[
         local a: number = 1