LuaLS#3014. Fixed parsing of ... Symbol but still separated 2 dots …

…`..`, added changelog.
TIMONz1535 · Dec 29, 2024 · e66a8ab · e66a8ab
1 parent f4a69bc
commit e66a8ab
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/changelog.md b/changelog.md
@@ -2,6 +2,15 @@
 
 ## Unreleased
 <!-- Add all new changes here. They will be moved under a version at release -->
+* `CHG` [#3014] Generic pattern now supports definition after capture
+  ```lua
+  ---@generic T
+  ---@param t `T`.Cat
+  ---@return T
+  local function f(t) end
+
+  local t = f('Smile') --> t is `Smile.Cat`
+  ```
 
 ## 3.13.5
 `2024-12-20`

diff --git a/script/parser/luadoc.lua b/script/parser/luadoc.lua
@@ -54,12 +54,13 @@ EChar               <-  'a' -> ea
                     /   ([0-9] [0-9]? [0-9]?) -> Char10
                     /   ('u{' {X16*} '}')    -> CharUtf8
 Symbol              <-  ({} {
-                            [:|,;<>()?+#{}.*]
+                            [:|,;<>()?+#{}*]
                         /   '[]'
                         /   '...'
                         /   '['
                         /   ']'
                         /   '-' !'-'
+                        /   '.' !'..'
                         } {})
                     ->  Symbol
 ]], {

diff --git a/test/definition/luadoc.lua b/test/definition/luadoc.lua
@@ -375,12 +375,12 @@ print(v1.<?bar1?>)
 ]]
 
 TEST [[
----@class n.Foo*
+---@class n.Foo.2
 local Foo = {}
 function Foo:bar1() end
 
 ---@generic T
----@param arg1 n.`T`*
+---@param arg1 n.`T`.2
 ---@return T
 function Generic(arg1) print(arg1) end
 
@@ -389,12 +389,12 @@ print(v1.<?bar1?>)
 ]]
 
 TEST [[
----@class n.Foo*
+---@class n.Foo.2
 local Foo = {}
 function Foo:<!bar1!>() end
 
 ---@generic T
----@param arg1 n.`T`*
+---@param arg1 n.`T`.2
 ---@return T
 function Generic(arg1) print(arg1) end