diff options
| author | 最萌小汐 <sumneko@hotmail.com> | 2022-11-03 17:20:30 +0800 |
|---|---|---|
| committer | 最萌小汐 <sumneko@hotmail.com> | 2022-11-03 17:20:30 +0800 |
| commit | 45ba0743c75d0f2b68765db0240f150681808205 (patch) | |
| tree | 7dc6c8f4e4ca776abc6c87cc80b9859f3c08d17d /script/vm | |
| parent | 213f5176ff3125feab1e743ef57abba0e18a44a5 (diff) | |
| download | lua-language-server-45ba0743c75d0f2b68765db0240f150681808205.zip | |
support `self` type
#1505
Diffstat (limited to 'script/vm')
| -rw-r--r-- | script/vm/compiler.lua | 23 | ||||
| -rw-r--r-- | script/vm/global.lua | 3 |
2 files changed, 26 insertions, 0 deletions
diff --git a/script/vm/compiler.lua b/script/vm/compiler.lua index dcd32e77..2e481edf 100644 --- a/script/vm/compiler.lua +++ b/script/vm/compiler.lua @@ -1564,6 +1564,29 @@ local compilerSwitch = util.switch() : call(function (source) vm.setNode(source, source) end) + : case 'doc.type.name' + : call(function (source) + if source[1] == 'self' then + local state = guide.getDocState(source) + if state.type == 'doc.return' + or state.type == 'doc.param' then + local func = state.bindSource + if func.type == 'function' then + local node = guide.getFunctionSelfNode(func) + if node then + vm.setNode(source, vm.compileNode(node)) + return + end + end + elseif state.type == 'doc.field' then + local class = state.class + if class then + vm.setNode(source, vm.compileNode(class)) + return + end + end + end + end) : case 'doc.generic.name' : call(function (source) vm.setNode(source, source) diff --git a/script/vm/global.lua b/script/vm/global.lua index e94f9239..027b096a 100644 --- a/script/vm/global.lua +++ b/script/vm/global.lua @@ -404,6 +404,9 @@ local compilerGlobalSwitch = util.switch() if name == '_' then return end + if name == 'self' then + return + end local type = vm.declareGlobal('type', name, uri) type:addGet(uri, source) source._globalNode = type |