From a4054938ce09719f44cc3984ac931abe14bbe9bc Mon Sep 17 00:00:00 2001 From: Alexandre Ardhuin Date: Wed, 26 Feb 2020 03:12:17 +0100 Subject: [PATCH] unnecessary multiline strings (#50806) --- dev/customer_testing/run_tests.dart | 2 +- dev/docs/dashing_postprocess.dart | 2 +- dev/tools/gen_keycodes/lib/key_data.dart | 16 ++++++++-------- .../flutter_tools/lib/src/android/gradle.dart | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dev/customer_testing/run_tests.dart b/dev/customer_testing/run_tests.dart index 3008ee661d..dc5acb87df 100644 --- a/dev/customer_testing/run_tests.dart +++ b/dev/customer_testing/run_tests.dart @@ -259,7 +259,7 @@ class TestFile { const TestFile._(this.contacts, this.fetch, this.update, this.tests); // (e-mail regexp from HTML standard) - static final RegExp _email = RegExp(r'''^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$'''); + static final RegExp _email = RegExp(r"^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$"); static final RegExp _fetch1 = RegExp(r'^git(?: -c core.longPaths=true)? clone https://github.com/[-a-zA-Z0-9]+/[-_a-zA-Z0-9]+.git tests$'); static final RegExp _fetch2 = RegExp(r'^git(?: -c core.longPaths=true)? -C tests checkout [0-9a-f]+$'); diff --git a/dev/docs/dashing_postprocess.dart b/dev/docs/dashing_postprocess.dart index e2c42f4b32..9f186e4f2c 100644 --- a/dev/docs/dashing_postprocess.dart +++ b/dev/docs/dashing_postprocess.dart @@ -21,7 +21,7 @@ void main(List args) { // Since I didn't want to add the XML package as a dependency just for this, // I just used a regular expression to make this simple change. - final RegExp findRe = RegExp(r'''(\s*DocSetPlatformFamily\s*)[^<]+()''', multiLine: true); + final RegExp findRe = RegExp(r'(\s*DocSetPlatformFamily\s*)[^<]+()', multiLine: true); contents = contents.replaceAllMapped(findRe, (Match match) { return '${match.group(1)}dartlang${match.group(2)}'; }); diff --git a/dev/tools/gen_keycodes/lib/key_data.dart b/dev/tools/gen_keycodes/lib/key_data.dart index 8853f73acc..6f7ec5c4a0 100644 --- a/dev/tools/gen_keycodes/lib/key_data.dart +++ b/dev/tools/gen_keycodes/lib/key_data.dart @@ -146,7 +146,7 @@ class KeyData { /// Also, note that some keys (notably MEDIA_EJECT) can be mapped to more than /// one scan code, so the mapping can't just be 1:1, it has to be 1:many. Map> _readAndroidScanCodes(String keyboardLayout) { - final RegExp keyEntry = RegExp(r'''#?\s*key\s+([0-9]+)\s*"?(?:KEY_)?([0-9A-Z_]+|\(undefined\))"?\s*(FUNCTION)?'''); + final RegExp keyEntry = RegExp(r'#?\s*key\s+([0-9]+)\s*"?(?:KEY_)?([0-9A-Z_]+|\(undefined\))"?\s*(FUNCTION)?'); final Map> result = >{}; keyboardLayout.replaceAllMapped(keyEntry, (Match match) { if (match.group(3) == 'FUNCTION') { @@ -176,7 +176,7 @@ class KeyData { final RegExp enumBlock = RegExp(r'enum\s*\{(.*)\};', multiLine: true); // Eliminate everything outside of the enum block. headerFile = headerFile.replaceAllMapped(enumBlock, (Match match) => match.group(1)); - final RegExp enumEntry = RegExp(r'''AKEYCODE_([A-Z0-9_]+)\s*=\s*([0-9]+),?'''); + final RegExp enumEntry = RegExp(r'AKEYCODE_([A-Z0-9_]+)\s*=\s*([0-9]+),?'); final Map result = {}; for (final Match match in enumEntry.allMatches(headerFile)) { result[match.group(1)] = int.parse(match.group(2)); @@ -191,7 +191,7 @@ class KeyData { /// #define GLFW_KEY_SPACE 32, Map _readGlfwKeyCodes(String headerFile) { // Only get the KEY definitions, ignore the rest (mouse, joystick, etc). - final RegExp enumEntry = RegExp(r'''define GLFW_KEY_([A-Z0-9_]+)\s*([A-Z0-9_]+),?'''); + final RegExp enumEntry = RegExp(r'define GLFW_KEY_([A-Z0-9_]+)\s*([A-Z0-9_]+),?'); final Map replaced = {}; for (final Match match in enumEntry.allMatches(headerFile)) { replaced[match.group(1)] = int.tryParse(match.group(2)) ?? match.group(2).replaceAll('GLFW_KEY_', ''); @@ -216,8 +216,8 @@ class KeyData { List _readHidEntries(String input) { final List entries = []; final RegExp usbMapRegExp = RegExp( - r'''USB_KEYMAP\s*\(\s*0x([a-fA-F0-9]+),\s*0x([a-fA-F0-9]+),''' - r'''\s*0x([a-fA-F0-9]+),\s*0x([a-fA-F0-9]+),\s*0x([a-fA-F0-9]+),\s*"?([^\s]+?)"?,\s*([^\s]+?)\s*\)''', + r'USB_KEYMAP\s*\(\s*0x([a-fA-F0-9]+),\s*0x([a-fA-F0-9]+),' + r'\s*0x([a-fA-F0-9]+),\s*0x([a-fA-F0-9]+),\s*0x([a-fA-F0-9]+),\s*"?([^\s]+?)"?,\s*([^\s]+?)\s*\)', multiLine: true); final RegExp commentRegExp = RegExp(r'//.*$', multiLine: true); input = input.replaceAll(commentRegExp, ''); @@ -418,9 +418,9 @@ class Key { @override String toString() { return """'$constantName': (name: "$name", usbHidCode: ${toHex(usbHidCode)}, """ - '''linuxScanCode: ${toHex(linuxScanCode)}, xKbScanCode: ${toHex(xKbScanCode)}, ''' - '''windowsKeyCode: ${toHex(windowsScanCode)}, macOsScanCode: ${toHex(macOsScanCode)}, ''' - '''chromiumSymbolName: $chromiumName'''; + 'linuxScanCode: ${toHex(linuxScanCode)}, xKbScanCode: ${toHex(xKbScanCode)}, ' + 'windowsKeyCode: ${toHex(windowsScanCode)}, macOsScanCode: ${toHex(macOsScanCode)}, ' + 'chromiumSymbolName: $chromiumName'; } /// Returns the static map of printable representations. diff --git a/packages/flutter_tools/lib/src/android/gradle.dart b/packages/flutter_tools/lib/src/android/gradle.dart index b52a99a49e..f959db1d1a 100644 --- a/packages/flutter_tools/lib/src/android/gradle.dart +++ b/packages/flutter_tools/lib/src/android/gradle.dart @@ -641,8 +641,8 @@ ${globals.terminal.bolden('Consuming the Module')} dependencies {'''); for (final String buildMode in buildModes) { - globals.printStatus(''' - ${buildMode}Implementation '$androidPackage:flutter_$buildMode:$buildNumber\''''); + globals.printStatus(""" + ${buildMode}Implementation '$androidPackage:flutter_$buildMode:$buildNumber'"""); } globals.printStatus('''