From 94c7e823bed9ff6d8f0deb0d545665a896d5b9a8 Mon Sep 17 00:00:00 2001 From: Alexandre Ardhuin Date: Wed, 5 Feb 2020 08:00:32 +0100 Subject: [PATCH] remove unnecessary string escapes (#50096) --- .../bin/tasks/plugin_dependencies_test.dart | 12 ++++++------ dev/devicelab/lib/framework/running_processes.dart | 2 +- .../lib/demo/fortnightly/fortnightly.dart | 2 +- packages/flutter_tools/lib/src/project.dart | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dev/devicelab/bin/tasks/plugin_dependencies_test.dart b/dev/devicelab/bin/tasks/plugin_dependencies_test.dart index 6e32c2d65e..ed47d7850b 100644 --- a/dev/devicelab/bin/tasks/plugin_dependencies_test.dart +++ b/dev/devicelab/bin/tasks/plugin_dependencies_test.dart @@ -183,16 +183,16 @@ public class DummyPluginAClass { const String kExpectedPluginsDependenciesContent = '[' '{' - '\"name\":\"plugin_a\",' - '\"dependencies\":[\"plugin_b\",\"plugin_c\"]' + '"name":"plugin_a",' + '"dependencies":["plugin_b","plugin_c"]' '},' '{' - '\"name\":\"plugin_b\",' - '\"dependencies\":[]' + '"name":"plugin_b",' + '"dependencies":[]' '},' '{' - '\"name\":\"plugin_c\",' - '\"dependencies\":[]' + '"name":"plugin_c",' + '"dependencies":[]' '}' ']'; final String graphString = json.encode(dependencyGraph); diff --git a/dev/devicelab/lib/framework/running_processes.dart b/dev/devicelab/lib/framework/running_processes.dart index 399b957465..07488ab63d 100644 --- a/dev/devicelab/lib/framework/running_processes.dart +++ b/dev/devicelab/lib/framework/running_processes.dart @@ -85,7 +85,7 @@ Stream windowsRunningProcesses(String processName) async* { // a process. // See: https://docs.microsoft.com/en-us/windows/desktop/cimwin32prov/win32-process final String script = processName != null - ? '"Get-CimInstance Win32_Process -Filter \\\"name=\'$processName\'\\\" | Select-Object ProcessId,CreationDate,CommandLine | Format-Table -AutoSize | Out-String -Width 4096"' + ? '"Get-CimInstance Win32_Process -Filter \\"name=\'$processName\'\\" | Select-Object ProcessId,CreationDate,CommandLine | Format-Table -AutoSize | Out-String -Width 4096"' : '"Get-CimInstance Win32_Process | Select-Object ProcessId,CreationDate,CommandLine | Format-Table -AutoSize | Out-String -Width 4096"'; // Unfortunately, there doesn't seem to be a good way to get ProcessManager to // run this. May be a bug in Dart. diff --git a/examples/flutter_gallery/lib/demo/fortnightly/fortnightly.dart b/examples/flutter_gallery/lib/demo/fortnightly/fortnightly.dart index 18b165e008..bfa82c815c 100644 --- a/examples/flutter_gallery/lib/demo/fortnightly/fortnightly.dart +++ b/examples/flutter_gallery/lib/demo/fortnightly/fortnightly.dart @@ -76,7 +76,7 @@ class FruitPage extends StatelessWidget { static final String paragraph2 = '''Pomegranates on the other hand have become almost ubiquitous. You can find its juice in any bodega, Walmart, and even some gas stations. But at what cost? The pomegranate juice craze of the aughts made - \"megafarmers\" Lynda and Stewart Resnick billions. Unfortunately, it takes a lot + "megafarmers" Lynda and Stewart Resnick billions. Unfortunately, it takes a lot of water to make that much pomegranate juice. Water the Resnicks get from their majority stake in the Kern Water Bank. How did one family come to hold control over water meant for the whole central valley of California? The story will shock you. diff --git a/packages/flutter_tools/lib/src/project.dart b/packages/flutter_tools/lib/src/project.dart index d6b3fd081c..30cec4766d 100644 --- a/packages/flutter_tools/lib/src/project.dart +++ b/packages/flutter_tools/lib/src/project.dart @@ -602,9 +602,9 @@ class AndroidProject extends FlutterProjectPlatform { @override String get pluginConfigKey => AndroidPlugin.kConfigKey; - static final RegExp _applicationIdPattern = RegExp('^\\s*applicationId\\s+[\'\"](.*)[\'\"]\\s*\$'); - static final RegExp _kotlinPluginPattern = RegExp('^\\s*apply plugin\:\\s+[\'\"]kotlin-android[\'\"]\\s*\$'); - static final RegExp _groupPattern = RegExp('^\\s*group\\s+[\'\"](.*)[\'\"]\\s*\$'); + static final RegExp _applicationIdPattern = RegExp('^\\s*applicationId\\s+[\'"](.*)[\'"]\\s*\$'); + static final RegExp _kotlinPluginPattern = RegExp('^\\s*apply plugin\:\\s+[\'"]kotlin-android[\'"]\\s*\$'); + static final RegExp _groupPattern = RegExp('^\\s*group\\s+[\'"](.*)[\'"]\\s*\$'); /// The Gradle root directory of the Android host app. This is the directory /// containing the `app/` subdirectory and the `settings.gradle` file that