fix(generators): Improve consistency of migrated language generators (#7662)

* docs(generators): @fileoverview -> @file; delete @suppress

* fix(generators): Fix return type of getAdjusted

  And improve its documentation too.

  Fix the @returns doc for PythonGenerator's getAdjustedInt but
  (for now) don't change the type because it does actually
  return numbers in some circumstances.
This commit is contained in:
Christopher Allen
2023-11-28 16:57:31 +00:00
committed by GitHub
parent ac362fd57a
commit b198e2f4ae
33 changed files with 41 additions and 43 deletions

View File

@@ -5,9 +5,9 @@
*/ */
/** /**
* @fileoverview Complete helper functions for generating Dart for * @file Instantiate a DartGenerator and populate it with the complete
* blocks. This is the entrypoint for dart_compressed.js. * set of block generator functions for Dart. This is the entrypoint
* @suppress {extraRequire} * for dart_compressed.js.
*/ */
// Former goog.module ID: Blockly.Dart.all // Former goog.module ID: Blockly.Dart.all

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Dart for colour blocks. * @file Generating Dart for colour blocks.
*/ */
// Former goog.module ID: Blockly.Dart.colour // Former goog.module ID: Blockly.Dart.colour

View File

@@ -269,7 +269,7 @@ export class DartGenerator extends CodeGenerator {
* @param delta Value to add. * @param delta Value to add.
* @param negate Whether to negate the value. * @param negate Whether to negate the value.
* @param order The highest order acting on this value. * @param order The highest order acting on this value.
* @returns The adjusted value. * @returns The adjusted value or code that evaluates to it.
*/ */
getAdjusted( getAdjusted(
block: Block, block: Block,
@@ -277,7 +277,7 @@ export class DartGenerator extends CodeGenerator {
delta = 0, delta = 0,
negate = false, negate = false,
order = Order.NONE, order = Order.NONE,
): string | number { ): string {
if (block.workspace.options.oneBasedIndex) { if (block.workspace.options.oneBasedIndex) {
delta--; delta--;
} }

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Dart for list blocks. * @file Generating Dart for list blocks.
*/ */
// Former goog.module ID: Blockly.Dart.lists // Former goog.module ID: Blockly.Dart.lists

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Dart for logic blocks. * @file Generating Dart for logic blocks.
*/ */
// Former goog.module ID: Blockly.Dart.logic // Former goog.module ID: Blockly.Dart.logic

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Dart for loop blocks. * @file Generating Dart for loop blocks.
*/ */
// Former goog.module ID: Blockly.Dart.loops // Former goog.module ID: Blockly.Dart.loops

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Dart for math blocks. * @file Generating Dart for math blocks.
*/ */
// Former goog.module ID: Blockly.Dart.math // Former goog.module ID: Blockly.Dart.math

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Dart for procedure blocks. * @file Generating Dart for procedure blocks.
*/ */
// Former goog.module ID: Blockly.Dart.procedures // Former goog.module ID: Blockly.Dart.procedures

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Dart for text blocks. * @file Generating Dart for text blocks.
*/ */
// Former goog.module ID: Blockly.Dart.texts // Former goog.module ID: Blockly.Dart.texts

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Dart for variable blocks. * @file Generating Dart for variable blocks.
*/ */
// Former goog.module ID: Blockly.Dart.variables // Former goog.module ID: Blockly.Dart.variables

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Dart for dynamic variable blocks. * @file Generating Dart for dynamic variable blocks.
*/ */
// Former goog.module ID: Blockly.Dart.variablesDynamic // Former goog.module ID: Blockly.Dart.variablesDynamic

View File

@@ -5,9 +5,9 @@
*/ */
/** /**
* @fileoverview Complete helper functions for generating JavaScript for * @file Instantiate a JavascriptGenerator and populate it with the
* blocks. This is the entrypoint for javascript_compressed.js. * complete set of block generator functions for JavaScript. This is
* @suppress {extraRequire} * the entrypoint for javascript_compressed.js.
*/ */
// Former goog.module ID: Blockly.JavaScript.all // Former goog.module ID: Blockly.JavaScript.all

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating JavaScript for colour blocks. * @file Generating JavaScript for colour blocks.
*/ */
// Former goog.module ID: Blockly.JavaScript.colour // Former goog.module ID: Blockly.JavaScript.colour

View File

@@ -295,7 +295,7 @@ export class JavascriptGenerator extends CodeGenerator {
* @param delta Value to add. * @param delta Value to add.
* @param negate Whether to negate the value. * @param negate Whether to negate the value.
* @param order The highest order acting on this value. * @param order The highest order acting on this value.
* @returns The adjusted value. * @returns The adjusted value or code that evaluates to it.
*/ */
getAdjusted( getAdjusted(
block: Block, block: Block,
@@ -303,7 +303,7 @@ export class JavascriptGenerator extends CodeGenerator {
delta = 0, delta = 0,
negate = false, negate = false,
order = Order.NONE, order = Order.NONE,
): string | number { ): string {
if (block.workspace.options.oneBasedIndex) { if (block.workspace.options.oneBasedIndex) {
delta--; delta--;
} }

View File

@@ -5,8 +5,7 @@
*/ */
/** /**
* @fileoverview Generating JavaScript for list blocks. * @file Generating JavaScript for list blocks.
* @suppress {missingRequire}
*/ */
// Former goog.module ID: Blockly.JavaScript.lists // Former goog.module ID: Blockly.JavaScript.lists

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating JavaScript for logic blocks. * @file Generating JavaScript for logic blocks.
*/ */
// Former goog.module ID: Blockly.JavaScript.logic // Former goog.module ID: Blockly.JavaScript.logic

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating JavaScript for loop blocks. * @file Generating JavaScript for loop blocks.
*/ */
// Former goog.module ID: Blockly.JavaScript.loops // Former goog.module ID: Blockly.JavaScript.loops

View File

@@ -5,8 +5,7 @@
*/ */
/** /**
* @fileoverview Generating JavaScript for math blocks. * @file Generating JavaScript for math blocks.
* @suppress {missingRequire}
*/ */
// Former goog.module ID: Blockly.JavaScript.math // Former goog.module ID: Blockly.JavaScript.math

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating JavaScript for procedure blocks. * @file Generating JavaScript for procedure blocks.
*/ */
// Former goog.module ID: Blockly.JavaScript.procedures // Former goog.module ID: Blockly.JavaScript.procedures

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating JavaScript for text blocks. * @file Generating JavaScript for text blocks.
*/ */
// Former goog.module ID: Blockly.JavaScript.texts // Former goog.module ID: Blockly.JavaScript.texts

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating JavaScript for variable blocks. * @file Generating JavaScript for variable blocks.
*/ */
// Former goog.module ID: Blockly.JavaScript.variables // Former goog.module ID: Blockly.JavaScript.variables

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating JavaScript for dynamic variable blocks. * @file Generating JavaScript for dynamic variable blocks.
*/ */
// Former goog.module ID: Blockly.JavaScript.variablesDynamic // Former goog.module ID: Blockly.JavaScript.variablesDynamic

View File

@@ -5,9 +5,9 @@
*/ */
/** /**
* @fileoverview Complete helper functions for generating Python for * @file Instantiate a PythonGenerator and populate it with the
* blocks. This is the entrypoint for python_compressed.js. * complete set of block generator functions for Python. This is the
* @suppress {extraRequire} * entrypoint for python_compressed.js.
*/ */
// Former goog.module ID: Blockly.Python.all // Former goog.module ID: Blockly.Python.all

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Python for colour blocks. * @file Generating Python for colour blocks.
*/ */
// Former goog.module ID: Blockly.Python.colour // Former goog.module ID: Blockly.Python.colour

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Python for list blocks. * @file Generating Python for list blocks.
*/ */
// Former goog.module ID: Blockly.Python.lists // Former goog.module ID: Blockly.Python.lists

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Python for logic blocks. * @file Generating Python for logic blocks.
*/ */
// Former goog.module ID: Blockly.Python.logic // Former goog.module ID: Blockly.Python.logic

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Python for loop blocks. * @file Generating Python for loop blocks.
*/ */
// Former goog.module ID: Blockly.Python.loops // Former goog.module ID: Blockly.Python.loops

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Python for math blocks. * @file Generating Python for math blocks.
*/ */
// Former goog.module ID: Blockly.Python.math // Former goog.module ID: Blockly.Python.math

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Python for procedure blocks. * @file Generating Python for procedure blocks.
*/ */
// Former goog.module ID: Blockly.Python.procedures // Former goog.module ID: Blockly.Python.procedures

View File

@@ -318,7 +318,7 @@ export class PythonGenerator extends CodeGenerator {
* @param atId The ID of the input block to get (and adjust) the value of. * @param atId The ID of the input block to get (and adjust) the value of.
* @param delta Value to add. * @param delta Value to add.
* @param negate Whether to negate the value. * @param negate Whether to negate the value.
* @returns The adjusted value. * @returns The adjusted value or code that evaluates to it.
*/ */
getAdjustedInt( getAdjustedInt(
block: Block, block: Block,

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Python for text blocks. * @file Generating Python for text blocks.
*/ */
// Former goog.module ID: Blockly.Python.texts // Former goog.module ID: Blockly.Python.texts

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Python for variable blocks. * @file Generating Python for variable blocks.
*/ */
// Former goog.module ID: Blockly.Python.variables // Former goog.module ID: Blockly.Python.variables

View File

@@ -5,7 +5,7 @@
*/ */
/** /**
* @fileoverview Generating Python for dynamic variable blocks. * @file Generating Python for dynamic variable blocks.
*/ */
// Former goog.module ID: Blockly.Python.variablesDynamic // Former goog.module ID: Blockly.Python.variablesDynamic