support blocks generated from static class methods (#10188)

microsoft · Sep 16, 2024 · fe3898c · fe3898c
1 parent b269289
commit fe3898c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/localtypings/pxtarget.d.ts b/localtypings/pxtarget.d.ts
@@ -1033,6 +1033,7 @@ declare namespace ts.pxtc {
         pyName?: string;
         pyQName?: string;
         snippetAddsDefinitions?: boolean;
+        isStatic?: boolean;
     }
 
     interface ApisInfo {

diff --git a/pxtcompiler/emitter/annotate.ts b/pxtcompiler/emitter/annotate.ts
@@ -116,7 +116,9 @@ namespace ts.pxtc {
                     case SK.SetAccessor:
                     case SK.MethodDeclaration:
                     case SK.MethodSignature:
-                        isMethod = true
+                        if (!isStatic(decl)) {
+                            isMethod = true
+                        }
                         break;
                     default:
                         break;

diff --git a/pxtcompiler/emitter/service.ts b/pxtcompiler/emitter/service.ts
@@ -204,6 +204,7 @@ namespace ts.pxtc {
                 pkg,
                 pkgs,
                 extendsTypes,
+                isStatic: decl.modifiers?.some(m => m.kind === SyntaxKind.StaticKeyword),
                 retType:
                     stmt.kind == SyntaxKind.Constructor ? "void" :
                         kind == SymbolKind.Module ? "" :

diff --git a/pxtlib/blocks.ts b/pxtlib/blocks.ts
@@ -126,7 +126,7 @@ namespace pxt.blocks {
             handlerArgs: []
         };
 
-        const instance = (fn.kind == ts.pxtc.SymbolKind.Method || fn.kind == ts.pxtc.SymbolKind.Property) && !fn.attributes.defaultInstance;
+        const instance = (fn.kind == ts.pxtc.SymbolKind.Method || fn.kind == ts.pxtc.SymbolKind.Property) && !fn.attributes.defaultInstance && !fn.isStatic;
         const hasBlockDef = !!fn.attributes._def;
         const defParameters = hasBlockDef ? fn.attributes._def.parameters.slice(0) : undefined;
         const optionalStart = hasBlockDef ? defParameters.length : (fn.parameters ? fn.parameters.length : 0);