Incorrect folding range when a function with an inline comment follows an annotation

[Orion351]

How are you using the lua-language-server?

Visual Studio Code Extension (sumneko.lua)

Which OS are you using?

Windows

What is the issue affecting?

Formatting

Expected Behaviour

The folding chevron will be next to the function declaration and will fold the function.

Actual Behaviour

The folding chevron is next to the annotation and will only fold the one line of the function, leaving the rest of the function unfolded.

Reproduction steps

This code reproduces it:
---@param bar integer function foo(bar) -- comment local whee = bar + 3 return whee end

Additional Notes

Removing the inline comment fixes it.
Putting a blank line between the annotation and the function declaration line, even if it still has the inline comment, fixes it.

Log File

I couldn't get the thing to upload it, I'm sorry :(

[tomlau10]

a fix for function ?

I tested around in the codebase, and seems removing line19 from script/core/folding.lua solves this issue 🤔

lua-language-server/script/core/folding.lua

Lines 7 to 19 in 32fec3c

	['function'] = function (source, _text, results)
	local folding = {
	start = source.start,
	finish = source.finish,
	kind = 'region',
	}
	results[#results+1] = folding
	if source.bindDocs then
	results[#results+1] = {
	start = source.bindDocs[1].start,
	finish = source.bindDocs[#source.bindDocs].finish,
	kind = 'comment',
	hideLastLine = true,

• removing the hideLastLine = true in the function type

However I am not sure if it would cause any other side effects or not 😕

---

not over yet ... @class also has this issue

I just found that @class annotation also suffers from this issue 🤦‍♂

---@class MyClass
local MyClass = { -- comment
    a = 1,
    b = 2,
}

but this time, I cannot ❌ just remove hideLastLine = true in doc.class case

lua-language-server/script/core/folding.lua

Lines 138 to 143 in 32fec3c

	['doc.class'] = function (source, _text, results)
	local folding = {
	start = source.start,
	finish = source.bindGroup[#source.bindGroup].finish,
	kind = 'comment',
	hideLastLine = true,

Otherwise the folding of the following will be incorrect 😇
=> it will keep the last line, which I believe the expected behavior of this case is keeping the @class line only after folding

---@class MyClass
---@field a integer
---@field b integer