From a0301a217a3c8ffb6fad69491147d1dba802f2de Mon Sep 17 00:00:00 2001 From: Beka Westberg Date: Mon, 21 Aug 2023 09:05:23 -0700 Subject: [PATCH] feat: make generator quoting methods public (#7392) * feat: make quoting methods public * feat: add quote and multilineQuote methods * fix: update code generators to use new methods * chore: remove aliases * chore: revert changes to generators --- core/generator.ts | 4 ---- generators/dart/dart_generator.js | 2 -- generators/javascript/javascript_generator.js | 2 -- generators/lua/lua_generator.js | 2 -- generators/php/php_generator.js | 2 -- generators/python/python_generator.js | 2 -- 6 files changed, 14 deletions(-) diff --git a/core/generator.ts b/core/generator.ts index f70856367f3..67a30a790fc 100644 --- a/core/generator.ts +++ b/core/generator.ts @@ -170,10 +170,6 @@ export class CodeGenerator { return codeString; } - // The following are some helpful functions which can be used by multiple - - // languages. - /** * Prepend a common prefix onto each line of code. * Intended for indenting code or adding comment markers. diff --git a/generators/dart/dart_generator.js b/generators/dart/dart_generator.js index 5f64e919f34..e43c025a92b 100644 --- a/generators/dart/dart_generator.js +++ b/generators/dart/dart_generator.js @@ -176,7 +176,6 @@ export class DartGenerator extends CodeGenerator { * Encode a string as a properly escaped Dart string, complete with quotes. * @param {string} string Text to encode. * @return {string} Dart string. - * @protected */ quote_(string) { // Can't use goog.string.quote since $ must also be escaped. @@ -192,7 +191,6 @@ export class DartGenerator extends CodeGenerator { * quotes. * @param {string} string Text to encode. * @return {string} Dart string. - * @protected */ multiline_quote_(string) { const lines = string.split(/\n/g).map(this.quote_); diff --git a/generators/javascript/javascript_generator.js b/generators/javascript/javascript_generator.js index 18811011c8b..34e68f5aa0a 100644 --- a/generators/javascript/javascript_generator.js +++ b/generators/javascript/javascript_generator.js @@ -206,7 +206,6 @@ export class JavascriptGenerator extends CodeGenerator { * quotes. * @param {string} string Text to encode. * @return {string} JavaScript string. - * @protected */ quote_(string) { // Can't use goog.string.quote since Google's style guide recommends @@ -222,7 +221,6 @@ export class JavascriptGenerator extends CodeGenerator { * with quotes. * @param {string} string Text to encode. * @return {string} JavaScript string. - * @protected */ multiline_quote_(string) { // Can't use goog.string.quote since Google's style guide recommends diff --git a/generators/lua/lua_generator.js b/generators/lua/lua_generator.js index 587fea90bc8..ce115963917 100644 --- a/generators/lua/lua_generator.js +++ b/generators/lua/lua_generator.js @@ -149,7 +149,6 @@ export class LuaGenerator extends CodeGenerator { * quotes. * @param {string} string Text to encode. * @return {string} Lua string. - * @protected */ quote_(string) { string = string.replace(/\\/g, '\\\\') @@ -163,7 +162,6 @@ export class LuaGenerator extends CodeGenerator { * quotes. * @param {string} string Text to encode. * @return {string} Lua string. - * @protected */ multiline_quote_(string) { const lines = string.split(/\n/g).map(this.quote_); diff --git a/generators/php/php_generator.js b/generators/php/php_generator.js index 59d595b83df..59e1e67c688 100644 --- a/generators/php/php_generator.js +++ b/generators/php/php_generator.js @@ -184,7 +184,6 @@ export class PhpGenerator extends CodeGenerator { * quotes. * @param {string} string Text to encode. * @return {string} PHP string. - * @protected */ quote_(string) { string = string.replace(/\\/g, '\\\\') @@ -198,7 +197,6 @@ export class PhpGenerator extends CodeGenerator { * quotes. * @param {string} string Text to encode. * @return {string} PHP string. - * @protected */ multiline_quote_(string) { const lines = string.split(/\n/g).map(this.quote_); diff --git a/generators/python/python_generator.js b/generators/python/python_generator.js index 2f0aabe0c13..5e5836c476f 100644 --- a/generators/python/python_generator.js +++ b/generators/python/python_generator.js @@ -228,7 +228,6 @@ export class PythonGenerator extends CodeGenerator { * Encode a string as a properly escaped Python string, complete with quotes. * @param {string} string Text to encode. * @return {string} Python string. - * @protected */ quote_(string) { string = string.replace(/\\/g, '\\\\').replace(/\n/g, '\\\n'); @@ -250,7 +249,6 @@ export class PythonGenerator extends CodeGenerator { * with quotes. * @param {string} string Text to encode. * @return {string} Python string. - * @protected */ multiline_quote_(string) { const lines = string.split(/\n/g).map(this.quote_);