Commit d185dfd

committed

fix: type narrowing bugs with literal fields

1 parent 64c7084 commit d185dfdCopy full SHA for d185dfd

File tree

+49

-4

lines changed

+49

-4

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	* `FIX` reimplement section `luals.config` in file doc.json
`9`	`9`	* `FIX` incorrect file names in file doc.json
`10`	`10`	* `FIX` remove extra `./` path prefix in the check report when using `--check=.`
	`11`	+* `FIX` Narrowing of types with literal fields: [#3056](https://github.com/LuaLS/lua-language-server/issues/3056), [#3089](https://github.com/LuaLS/lua-language-server/issues/3089)
`11`	`12`
`12`	`13`	`## 3.13.6`
`13`	`14`	`2025年2月6日`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -268,6 +268,11 @@ local function getNodeTypesWithLiteralField(uri, source, fieldName, literal)`
`268`	`268`	`return`
`269`	`269`	`end`
`270`	`270`
	`271`	`+ -- Literal must has a value`
	`272`	`+ if literal[1] == nil then`
	`273`	`+ return`
	`274`	`+ end`
	`275`	`+`
`271`	`276`	`local tys`
`272`	`277`
`273`	`278`	`for _, c in ipairs(vm.compileNode(loc)) do`
`@@ -277,10 +282,10 @@ local function getNodeTypesWithLiteralField(uri, source, fieldName, literal)`
`277`	`282`	`for _, f in ipairs(set.fields) do`
`278`	`283`	`if f.field[1] == fieldName then`
`279`	`284`	`for _, t in ipairs(f.extends.types) do`
`280`		`- if t[1] == literal[1] then`
`281`		`- tys = tys or {}`
`282`		`- table.insert(tys, {set.class[1], #f.extends.types > 1})`
`283`		`- break`
	`285`	`+ if guide.isLiteral(t) andt[1] ~=nilandt[1] == literal[1] then`
	`286`	`+ tys = tys or {}`
	`287`	`+ table.insert(tys, {set.class[1], #f.extends.types > 1})`
	`288`	`+ break`
`284`	`289`	`end`
`285`	`290`	`end`
`286`	`291`	`break`

Lines changed: 14 additions & 0 deletions

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4606,6 +4606,31 @@ local a = {}`
`4606`	`4606`	`function a:func(<?x?>) end`
`4607`	`4607`	`]]`
`4608`	`4608`
	`4609`	`+-- #3089`
	`4610`	`+TEST 'fun(x: number, y: number)' [[`
	`4611`	`+---@class Person`
	`4612`	`+---@field age? number`
	`4613`	`+---@field foo fun(x: number, y: number)`
	`4614`	`+`
	`4615`	`+---@param person Person`
	`4616`	`+local function test(person)`
	`4617`	`+ if person.foo ~= nil then`
	`4618`	`+ local <?b?> = person.foo`
	`4619`	`+ end`
	`4620`	`+end`
	`4621`	`+]]`
	`4622`	`+`
	`4623`	`+-- #2952`
	`4624`	`+TEST 'A' [[`
	`4625`	`+---@class A`
	`4626`	`+---@field b {[C]:D}`
	`4627`	`+local A`
	`4628`	`+`
	`4629`	`+if A.b ~= {} then`
	`4630`	`+ local C = <?A?>`
	`4631`	`+end`
	`4632`	`+]]`
	`4633`	`+`
`4609`	`4634`	`TEST 'A' [[`
`4610`	`4635`	`---@class A`
`4611`	`4636`	`---@field type 'a'`

Comments

(0)