From 73aa0861bc750f1d4dd767d39e9833ef0b7f3ddb Mon Sep 17 00:00:00 2001 From: Anna Gringauze Date: Thu, 3 Nov 2022 16:22:21 -0700 Subject: [PATCH 1/2] Update analysis options --- dwds/analysis_options.yaml | 8 +++++++- dwds/debug_extension/tool/update_dev_files.dart | 6 +++--- dwds/debug_extension_mv3/tool/update_dev_files.dart | 5 +++-- dwds/lib/src/services/batched_expression_evaluator.dart | 4 ++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dwds/analysis_options.yaml b/dwds/analysis_options.yaml index 84b117387..3106b5c9b 100644 --- a/dwds/analysis_options.yaml +++ b/dwds/analysis_options.yaml @@ -5,9 +5,15 @@ include: package:lints/recommended.yaml analyzer: exclude: - # Ignore generated files + # Ignore generated files - "lib/data/*" + # Ignore debug extension builds + - "debug_extension/dev_build/*" + - "debug_extension/prod_build/*" + - "debug_extension_mv3/dev_build/*" + - "debug_extension_mv3/prod_build/*" linter: rules: - prefer_final_locals + - unawaited_futures diff --git a/dwds/debug_extension/tool/update_dev_files.dart b/dwds/debug_extension/tool/update_dev_files.dart index 24ec970be..f4e393570 100644 --- a/dwds/debug_extension/tool/update_dev_files.dart +++ b/dwds/debug_extension/tool/update_dev_files.dart @@ -2,11 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'dart:async'; import 'dart:io'; void main() async { - _updateManifestJson(); - _updateDevtoolsJs(); + await Future.wait([_updateManifestJson(), _updateDevtoolsJs()]); } /// Adds the Googler extension key, updates the extension icon, and prefixes the @@ -17,7 +17,7 @@ Future _updateManifestJson() async { final extensionKey = await extensionKeyTxt.exists() ? await extensionKeyTxt.readAsString() : null; - _transformDevFile(manifestJson, (line) { + return _transformDevFile(manifestJson, (line) { if (_matchesKey(line: line, key: 'name')) { return [ _newKeyValue( diff --git a/dwds/debug_extension_mv3/tool/update_dev_files.dart b/dwds/debug_extension_mv3/tool/update_dev_files.dart index 22bb4c4cb..99d7db809 100644 --- a/dwds/debug_extension_mv3/tool/update_dev_files.dart +++ b/dwds/debug_extension_mv3/tool/update_dev_files.dart @@ -2,10 +2,11 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'dart:async'; import 'dart:io'; void main() async { - _updateManifestJson(); + await _updateManifestJson(); } /// Adds the Googler extension key. @@ -15,7 +16,7 @@ Future _updateManifestJson() async { final extensionKey = await extensionKeyTxt.exists() ? await extensionKeyTxt.readAsString() : null; - _transformDevFile(manifestJson, (line) { + return _transformDevFile(manifestJson, (line) { if (_matchesKey(line: line, key: 'name')) { return [ line, diff --git a/dwds/lib/src/services/batched_expression_evaluator.dart b/dwds/lib/src/services/batched_expression_evaluator.dart index 64338fd38..e0caa8a8e 100644 --- a/dwds/lib/src/services/batched_expression_evaluator.dart +++ b/dwds/lib/src/services/batched_expression_evaluator.dart @@ -121,7 +121,7 @@ class BatchedExpressionEvaluator extends ExpressionEvaluator { final request = requests[i]; if (request.completer.isCompleted) continue; _logger.fine('Getting result out of a batch for ${request.expression}'); - _debugger + unawaited(_debugger .getProperties(list.objectId!, offset: i, count: 1, length: requests.length) .then((v) { @@ -129,7 +129,7 @@ class BatchedExpressionEvaluator extends ExpressionEvaluator { _logger.fine( 'Got result out of a batch for ${request.expression}: $result'); request.completer.complete(result); - }); + })); } } } From 7cae5f203a415a43d8385652cf9f91a19a30e744 Mon Sep 17 00:00:00 2001 From: Anna Gringauze Date: Thu, 3 Nov 2022 17:38:09 -0700 Subject: [PATCH 2/2] Format --- dwds/debug_extension/tool/update_dev_files.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dwds/debug_extension/tool/update_dev_files.dart b/dwds/debug_extension/tool/update_dev_files.dart index f4e393570..ece741349 100644 --- a/dwds/debug_extension/tool/update_dev_files.dart +++ b/dwds/debug_extension/tool/update_dev_files.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'dart:io'; void main() async { - await Future.wait([_updateManifestJson(), _updateDevtoolsJs()]); + await Future.wait([_updateManifestJson(), _updateDevtoolsJs()]); } /// Adds the Googler extension key, updates the extension icon, and prefixes the