fix filtering and snippets for blockAliasFor in monaco (#11035)

Author: riknoll

pxtcompiler/emitter/languageservice.ts

@@ -607,6 +607,7 @@ namespace ts.pxtc.service {
             blocksInfo,
             screenSize,
             apis: lastApiInfo.apis,
+            decls: lastApiInfo.decls,
             checker: service?.getProgram()?.getTypeChecker()
         }
         resultSymbols.forEach(sym => patchSymbolWithSnippet(sym.symbol, isPython, context))

pxtcompiler/emitter/service.ts

@@ -1025,7 +1025,7 @@ namespace ts.pxtc.service {
             }
 
             const { bannedCategories, screenSize } = v.runtime;
-            const { apis } = lastApiInfo;
+            const { apis, decls } = lastApiInfo;
             const blocksInfo = blocksInfoOp(apis, bannedCategories);
             const checker = service && service.getProgram().getTypeChecker();
             // needed for blocks that have parent wraps like music.play(...)
@@ -1039,7 +1039,8 @@ namespace ts.pxtc.service {
                 bannedCategories,
                 screenSize,
                 checker,
-                includeParentSnippet
+                includeParentSnippet,
+                decls
             }
             const snippetNode = getSnippet(snippetContext, fn, n as FunctionLikeDeclaration, isPython)
             const snippet = snippetStringify(snippetNode)

pxtcompiler/emitter/snippets.ts

@@ -106,6 +106,7 @@ namespace ts.pxtc.service {
         screenSize?: pxt.Size;
         parameterOverride?: { [key: string]: SnippetNode };
         includeParentSnippet?: boolean;
+        decls?: pxt.Map<ts.Declaration>;
     }
 
     export function getSnippet(context: SnippetContext, fn: SymbolInfo, decl: ts.FunctionLikeDeclaration, python?: boolean, recursionDepth = 0): SnippetNode {
@@ -116,6 +117,11 @@ namespace ts.pxtc.service {
         const PY_INDENT: string = (pxt as any).py.INDENT;
         const fileType = python ? "python" : "typescript";
 
+        if (fn.attributes.blockAliasFor) {
+            fn = apis.byQName[fn.attributes.blockAliasFor] || fn;
+            decl = context.decls?.[fn.qName] as ts.FunctionLikeDeclaration || decl;
+        }
+
         let snippetPrefix = fn.namespace;
         let addNamespace = false;
         let namespaceToUse = "";

webapp/src/monaco.tsx

@@ -2007,7 +2007,7 @@ export class Editor extends toolboxeditor.ToolboxEditor {
     private filterBlocks(subns: string, blocks: toolbox.BlockDefinition[]) {
         return blocks.filter((block => !(block.attributes.blockHidden)
             && !(block.attributes.deprecated && !this.parent.isTutorial())
-            && (block.name.indexOf('_') != 0)
+            && (block.name.indexOf('_') != 0 || block.attributes.blockAliasFor)
             && ((!subns && !block.attributes.subcategory && !block.attributes.advanced)
                 || (subns && ((block.attributes.advanced && subns == lf("more"))
                     || (block.attributes.subcategory && subns == block.attributes.subcategory))))));

webapp/src/toolbox.tsx

@@ -56,6 +56,7 @@ export interface BlockDefinition {
         _def?: pxtc.ParsedBlockDef;
         parentBlock?: BlockDefinition;
         toolboxParentArgument?: string;
+        blockAliasFor?: string;
     };
     retType?: string;
     blockXml?: string;