wip

Author: tomlau10

script/core/diagnostics/inject-field.lua

@@ -115,13 +115,35 @@ return function (uri, callback)
     local function checkExtraTableField(src)
         await.delay()
 
-        if not src.bindSource then
-            return
-        end
-        if not vm.docHasAttr(src, 'exact') then
-            return
+        local value
+        if src.type == 'table' then
+            -- any table with a class type should not allow field injection
+            local isTyped = false
+            for _, def in ipairs(vm.getDefs(src)) do
+                -- logic below is largely based on `missing-fields` diagnostics
+                if def.type == 'doc.class' then
+                    if def.bindSource
+                    and guide.isInRange(def.bindSource, src.start)
+                    then
+                        -- this is a table binded with `@class`, will be checked in `doc.class` case
+                        return
+                    end
+                    isTyped = true
+                end
+            end
+            if not isTyped then
+                return
+            end
+            value = src
+        elseif src.type == 'doc.class' then
+            if not src.bindSource then
+                return
+            end
+            if not vm.docHasAttr(src, 'exact') then
+                return
+            end
+            value = src.bindSource.value
         end
-        local value = src.bindSource.value
         if not value or value.type ~= 'table' then
             return
         end
@@ -134,7 +156,7 @@ return function (uri, callback)
             end
             local message = lang.script('DIAG_INJECT_FIELD', {
                 class = vm.getInfer(src):view(uri),
-                field = guide.getKeyName(src),
+                field = guide.getKeyName(field),
                 fix   = '',
             })
             callback {
@@ -147,4 +169,5 @@ return function (uri, callback)
     end
 
     guide.eachSourceType(ast.ast, 'doc.class', checkExtraTableField)
+    guide.eachSourceType(ast.ast, 'table', checkExtraTableField)
 end