modified algorithm

Author: McSam

src/scratch/blocks/Advanced/Variable/variables_get.js

@@ -2,7 +2,10 @@ import { translate } from '../../../../utils/lang/i18n';
 
 Blockly.Blocks.variables_get = {
     init() {
-        this.jsonInit({
+        this.jsonInit(this.definition());
+    },
+    definition(){
+        return {
             type    : 'variables_get',
             message0: '%1',
             args0   : [
@@ -17,8 +20,15 @@ Blockly.Blocks.variables_get = {
             colour         : Blockly.Colours.Binary.colour,
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
-            tooltip        : '',
-        });
+            tooltip        : translate('Get Variable Tooltip'),
+            category       : translate('variables'),
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Get Variable Value'),
+            'description' : translate('Get Variable Value Description'),
+        };
     },
 };
 

src/scratch/blocks/Advanced/Variable/variables_set.js

@@ -2,7 +2,10 @@ import { translate } from '../../../../utils/lang/i18n';
 
 Blockly.Blocks.variables_set = {
     init() {
-        this.jsonInit({
+        this.jsonInit(this.definition());
+    },
+    definition(){
+        return {
             type    : 'field_variable',
             message0: translate('set %1 to %2'),
             args0   : [
@@ -21,8 +24,15 @@ Blockly.Blocks.variables_set = {
             colourTertiary   : Blockly.Colours.Binary.colourTertiary,
             previousStatement: null,
             nextStatement    : null,
-            tooltip          : '',
-        });
+            tooltip          : translate('Set Variable Tooltip'),
+            category         : translate('variables'),
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Set Variable'),
+            'description' : translate('Set Variable Description'),
+        };
     },
 };
 

src/scratch/blocks/Math/math_single.js

@@ -2,7 +2,10 @@ import { translate } from '../../../utils/lang/i18n';
 
 Blockly.Blocks.math_single = {
     init() {
-        this.jsonInit({
+        this.jsonInit(this.definition());
+    },
+    definition(){
+        return {
             message0: translate('%1 %2'),
             args0   : [
                 {
@@ -28,7 +31,15 @@ Blockly.Blocks.math_single = {
             colour         : Blockly.Colours.Binary.colour,
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
-        });
+            tooltip        : translate('Mathematical Single Tooltip'),
+            category       : translate('mathematical'),
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Mathematical Single'),
+            'description' : translate('Mathematical Single Description'),
+        };
     },
 };
 

src/scratch/blocks/Math/math_trig.js

@@ -2,7 +2,10 @@ import { translate } from '../../../utils/lang/i18n';
 
 Blockly.Blocks.math_trig = {
     init() {
-        this.jsonInit({
+        this.jsonInit(this.definition());
+    },
+    definition(){
+        return {
             message0: translate('%1 %2'),
             args0   : [
                 {
@@ -28,7 +31,15 @@ Blockly.Blocks.math_trig = {
             colour         : Blockly.Colours.Binary.colour,
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
-        });
+            tooltip        : translate('Mathematical Trig Tooltip'),
+            category       : translate('mathematical'),
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Mathematical Trig'),
+            'description' : translate('Mathematical Trig Description'),
+        };
     },
 };
 

src/scratch/hooks/data_category.js

@@ -8,11 +8,18 @@ import { translate } from '../../utils/lang/i18n';
  */
 Blockly.DataCategory = function(workspace) {
     const variableModelList = workspace.getVariablesOfType('');
-    const xmlList = [];
+    let xmlList = [];
 
     // `Create Variable`-button
     Blockly.DataCategory.addCreateButton(xmlList, workspace);
 
+    xmlList = Blockly.DataCategory.search(variableModelList);
+
+    return xmlList;
+};
+
+Blockly.DataCategory.search = function(variableModelList){
+    const xmlList = [];
     if (variableModelList.length > 0) {
         const generateVariableFieldXmlString = variableModel => {
             // The variable name may be user input, so it may contain characters that

src/scratch/hooks/flyout_base.js

@@ -1,3 +1,6 @@
+
+import { translate } from '../../utils/lang/i18n';
+
 /* eslint-disable func-names, no-underscore-dangle */
 
 /**
@@ -38,7 +41,7 @@ Blockly.Flyout.prototype.scrollAnimationFraction = 1.0;
  * @param {number} y The computed y origin of the flyout's SVG group.
  * @protected
  */
-Blockly.Flyout.prototype.positionAt_ = function(width, height, x, y) {
+Blockly.Flyout.prototype.positionAt_ = function (width, height, x, y) {
     this.svgGroup_.setAttribute('width', width);
     this.svgGroup_.setAttribute('height', height);
 
@@ -73,26 +76,52 @@ Blockly.Flyout.prototype.positionAt_ = function(width, height, x, y) {
  * @return {number} The width of the flyout.
  * deriv-bot: Return actual width rather than this.DEFAULT_WIDTH.
  */
-Blockly.Flyout.prototype.getWidth = function() {
+Blockly.Flyout.prototype.getWidth = function () {
     return this.width_;
 };
 
 const addSearchFlyout = (callback, xmlList, flyout) => {
     let xmlSearchList = xmlList;
-    if (xmlList.type === Blockly.Search.NAME_TYPE) {
-        const blocksLength = Object.keys(xmlList.blocks).length;
-        const nodesLength = Object.keys(xmlList.nodes).length;
-        const noResult = !blocksLength && !nodesLength;
-        
-        xmlSearchList =
-            Blockly.Search.flyoutCategory(xmlList.blocks, flyout.workspace_, noResult);
-        xmlSearchList = xmlSearchList.concat(xmlList.nodes);
+    if (xmlList.type === 'search') {
+        const blocks = xmlList.blocks;
+        const fn_blocks = xmlList.fnBlocks;
+        const var_blocks = xmlList.varBlocks;
+        const noResult = !blocks.length
+            && !Object.keys(fn_blocks).length
+            && !var_blocks.length;
+
+        xmlSearchList = [];
+
+        if (noResult) {
+            const label = document.createElement('label');
+            label.setAttribute('text', translate('No Blocks Found'));
+            xmlSearchList.push(label);
+        } else {
+            const label = document.createElement('label');
+            label.setAttribute('text', translate('Result(s)'));
+            
+            xmlSearchList.push(label);
+        }
+
+        if (Object.keys(fn_blocks).length) {
+            const func_xml_list = Blockly.Procedures.flyoutCategory(flyout.workspace_);
+
+            xmlSearchList = xmlSearchList.concat(func_xml_list);
+        }
+
+        if (var_blocks.length) {
+            const var_xml_list = Blockly.DataCategory.search(var_blocks);
+
+            xmlSearchList = xmlSearchList.concat(var_xml_list);
+        }
+
+        xmlSearchList = xmlSearchList.concat(blocks);
     }
 
     callback(xmlSearchList);
 };
 
 const originalFlyoutShowFn = Blockly.Flyout.prototype.show;
-Blockly.Flyout.prototype.show = function(xmlList){
+Blockly.Flyout.prototype.show = function (xmlList) {
     addSearchFlyout(originalFlyoutShowFn.bind(this), xmlList, this);
 };

src/scratch/hooks/index.js

@@ -11,4 +11,3 @@ import './icon';
 import './procedures';
 import './toolbox';
 import './variables';
-import './search';