From e89d9d70eb2f0f516de9734d7da7339513088ba2 Mon Sep 17 00:00:00 2001
From: Richard Knoll <riknoll@microsoft.com>
Date: Wed, 1 Apr 2020 17:35:35 -0700
Subject: [PATCH] Return block should show up in search results

---
 pxtblocks/blocklyloader.ts | 2 +-
 webapp/src/blocks.tsx      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pxtblocks/blocklyloader.ts b/pxtblocks/blocklyloader.ts
index 9fdc4b4d270f..ee096ce58548 100644
--- a/pxtblocks/blocklyloader.ts
+++ b/pxtblocks/blocklyloader.ts
@@ -2860,7 +2860,7 @@ namespace pxt.blocks {
         return fieldBlock;
     }
 
-    function mkReturnStatementBlock() {
+    export function mkReturnStatementBlock() {
         const block = document.createElement("block");
         block.setAttribute("type", "function_return");
 
diff --git a/webapp/src/blocks.tsx b/webapp/src/blocks.tsx
index de6bd6ebae68..154a9600efd6 100644
--- a/webapp/src/blocks.tsx
+++ b/webapp/src/blocks.tsx
@@ -1500,6 +1500,10 @@ export class Editor extends toolboxeditor.ToolboxEditor {
             return undefined;
         }
         if (block.builtinBlock) {
+            // function_return is conditionally added to the toolbox, so it needs a special case
+            if (block.attributes.blockId === "function_return") {
+                return [pxt.blocks.mkReturnStatementBlock()];
+            }
             // Find the block XML for this built in block.
             const builtin = snippets.allBuiltinBlocks()[block.attributes.blockId];
             if (builtin && builtin.blockXml && block.builtinField && block.builtinField.length == 2) {