fix analyze bug

Author: CapsAdmin

nattlua/analyzer/operators/newindex.lua

@@ -85,7 +85,19 @@ return {
 								return true
 							end
 						else
-							analyzer:Error(err)
+							if existing.Type == "symbol" and existing:IsNil() then
+								local contract_keyval = contract:FindKeyValWide(key)
+
+								if contract_keyval then
+									local ok, reason = shared.IsSubsetOf(val, contract_keyval.val)
+
+									if not ok then analyzer:Error(reason) end
+								else
+									analyzer:Error(err)
+								end
+							else
+								analyzer:Error(err)
+							end
 						end
 					elseif err then
 						analyzer:Error(err)

test/helpers/profiler.lua

@@ -56,10 +56,10 @@ local function get_time_function()
 	end
 end
 
-local function format_error(err--[[#: number]], arg--[[#: any]])--[[#: string]]
+local function format_error(err--[[#: number]], arg--[[#: nil | number]])--[[#: string]]
 	local fmt = vmdef.traceerr[err]
 
-	if not fmt then return "unknown error: " .. err end
+	if not fmt then return "unknown error: " .. tostring(err) end
 
 	if not arg then return fmt end
 
@@ -283,7 +283,7 @@ do
 		func--[[#: AnyFunction]],
 		pc--[[#: number]],
 		code--[[#: number]],
-		reason--[[#: number | string]]
+		reason--[[#: number]]
 	)
 		local trace = self._traces[id]
 
@@ -318,7 +318,7 @@ do
 		end
 	end
 
-	local function on_trace_flush(self)
+	local function on_trace_flush(self--[[#: TProfile]])
 		if self._trace_count > 0 then
 			local x, interval = self._should_warn_abort()
 

test/tests/language_server/editor_helper.lua

@@ -423,4 +423,4 @@ do
 	assert(#diagnostics_calls == 0)
 end
 
-_G.TEST = false
+_G.TEST = false

test/tests/nattlua/analyzer/table.lua

@@ -661,8 +661,23 @@ analyze(
     }
     t.foo["test"] = true
 ]],
-	"is not a subset of nil"
+	"true is not a subset of nil"
 )
+analyze(
+	[[
+    local t = {} as {
+        foo = {foo = string}    
+    }
+    t.bar = 1
+]],
+	"has no key \"bar\""
+)
+analyze([[
+    local t = {} as {
+        foo = {foo = string, [string] = string | nil}    
+    }
+    t.foo["test"] = "bar"
+]])
 analyze[[
     local t = {} as {[1 .. inf] = number}
     attest.equal(#t, _ as 1 .. inf)
@@ -1071,4 +1086,32 @@ for i, v in ipairs(x) do
 	x[i] = nil
 end
 attest.equal(x, _ as {foo = 1, bar = 2, faz = 3})
-]]
+]]
+
+test("repro number is not a subset of nil", function()
+	analyze([=[
+		local type TProfile = {
+			_strings = {[number] = string | nil},
+			_string_lookup = {[string] = number | nil},
+			_string_count = number,
+			_strings_flushed = number,
+		}
+
+		local function intern(self, s)
+			self = self--[[# as TProfile]]
+			s = s--[[# as string | nil]]
+			if not s then return -1 end
+
+			local sl = self._string_lookup
+			local idx = sl[s]
+
+			if idx then return idx end
+
+			idx = self._string_count
+			self._string_count = self._string_count + 1
+			self._strings[idx] = s
+			sl[s] = idx
+			return idx
+		end
+	]=])
+end)