cleanup

Author: sumneko

.luarc.json

@@ -1,5 +1,4 @@
 {
-    "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
     "diagnostics": {
         "disable": [
             "close-non-object"

script/core/semantic-tokens.lua

@@ -92,6 +92,7 @@ local Care = util.switch()
         }
     end)
     : case 'local'
+    : case 'self'
     : case 'getlocal'
     : case 'setlocal'
     : call(function (source, options, results)

script/parser/newparser.lua

@@ -1752,7 +1752,6 @@ local function addDummySelf(node, call)
     local self = createLocal {
         start  = node.colon.start,
         finish = node.colon.finish,
-        method = node,
         parent = call.args,
         [1]    = 'self',
     }
@@ -2301,7 +2300,6 @@ local function parseFunction(isLocal, isAction)
             params[1] = createLocal {
                 start  = funcRight,
                 finish = funcRight,
-                method = func.name,
                 parent = params,
                 [1]    = 'self',
             }

script/vm/compiler.lua

@@ -731,7 +731,13 @@ local function compileLocalBase(source)
     local hasMarkParam
     if source.type == 'self' and not hasMarkDoc then
         hasMarkParam = true
-        vm.setNode(source, vm.compileNode(source.method.node))
+        if source.parent.parent.type == 'call' then
+            -- obj:func(...)
+            vm.setNode(source, vm.compileNode(source.parent.parent.node.node))
+        else
+            -- function obj:func(...)
+            vm.setNode(source, vm.compileNode(source.parent.parent.parent.node))
+        end
     end
     local hasMarkValue
     if source.value then