Skip to content

Commit 002e6a8

Browse files
jyameojyameo
committed
fixed linting - lib
1 parent 13e36f1 commit 002e6a8

File tree

8 files changed

+46
-37
lines changed

8 files changed

+46
-37
lines changed

‎dwds/lib/src/connections/debug_connection.dart‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@
44

55
import 'dart:async';
66

7-
import 'package:dwds/src/services/app_debug_services.dart';
8-
import 'package:dwds/src/services/chrome/chrome_proxy_service.dart';
97
import 'package:vm_service/vm_service.dart';
108

9+
import '../services/app_debug_services.dart';
10+
import '../services/chrome/chrome_proxy_service.dart';
11+
1112
/// A debug connection between the application in the browser and DWDS.
1213
///
1314
/// Supports debugging your running application through the Dart VM Service
1415
/// Protocol.
1516
class DebugConnection {
1617
final AppDebugServices _appDebugServices;
17-
final _onDoneCompleter = Completer();
18+
final _onDoneCompleter = Completer<void>();
1819

1920
/// Null until [close] is called.
2021
///

‎dwds/lib/src/debugging/frame_computer.dart‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
import 'package:dwds/src/debugging/debugger.dart';
6-
import 'package:dwds/src/utilities/synchronized.dart';
75
import 'package:logging/logging.dart';
86
import 'package:vm_service/vm_service.dart';
97
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
108

9+
import '../utilities/synchronized.dart';
10+
import 'debugger.dart';
11+
1112
class FrameComputer {
1213
static final logger = Logger('FrameComputer');
1314

@@ -112,7 +113,7 @@ class FrameComputer {
112113
'url': callFrame.url,
113114
'functionName': callFrame.functionName,
114115
'location': location.json,
115-
'scopeChain': [],
116+
'scopeChain': <Object>[],
116117
});
117118

118119
final frame = await debugger.calculateDartFrameFor(

‎dwds/lib/src/debugging/metadata/module_metadata.dart‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,11 @@ class ModuleMetadata {
163163
);
164164
}
165165

166-
for (final l in _readRequiredList(json, 'libraries')) {
167-
addLibrary(LibraryMetadata.fromJson(l as Map<String, dynamic>));
166+
for (final l in _readRequiredList<Map<String, dynamic>>(
167+
json,
168+
'libraries',
169+
)) {
170+
addLibrary(LibraryMetadata.fromJson(l));
168171
}
169172
}
170173

‎dwds/lib/src/debugging/metadata/provider.dart‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
import 'dart:convert';
66

77
import 'package:async/async.dart';
8-
import 'package:dwds/src/debugging/metadata/module_metadata.dart';
9-
import 'package:dwds/src/readers/asset_reader.dart';
108
import 'package:logging/logging.dart';
119
import 'package:path/path.dart' as p;
1210

11+
import '../../readers/asset_reader.dart';
12+
import 'module_metadata.dart';
13+
1314
/// A provider of metadata in which data is collected through DDC outputs.
1415
class MetadataProvider {
1516
final AssetReader _assetReader;
@@ -22,7 +23,7 @@ class MetadataProvider {
2223
final Map<String, String> _moduleToModulePath = {};
2324
final Map<String, Set<String>> _moduleToLibraries = {};
2425
final Map<String, List<String>> _scripts = {};
25-
final _metadataMemoizer = AsyncMemoizer();
26+
final AsyncMemoizer<void> _metadataMemoizer = AsyncMemoizer<void>();
2627

2728
/// Implicitly imported libraries in any DDC component.
2829
///

‎dwds/lib/src/dwds_vm_client.dart‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,6 @@
55
import 'dart:async';
66
import 'dart:convert';
77

8-
import 'package:dwds/src/config/tool_configuration.dart';
9-
import 'package:dwds/src/events.dart';
10-
import 'package:dwds/src/loaders/ddc_library_bundle.dart';
11-
import 'package:dwds/src/services/chrome/chrome_debug_exception.dart';
12-
import 'package:dwds/src/services/chrome/chrome_debug_service.dart';
13-
import 'package:dwds/src/services/chrome/chrome_proxy_service.dart';
14-
import 'package:dwds/src/services/debug_service.dart';
15-
import 'package:dwds/src/services/proxy_service.dart';
16-
import 'package:dwds/src/services/web_socket/web_socket_debug_service.dart';
17-
import 'package:dwds/src/services/web_socket/web_socket_proxy_service.dart';
18-
import 'package:dwds/src/utilities/synchronized.dart';
198
import 'package:logging/logging.dart';
209
import 'package:meta/meta.dart';
2110
import 'package:uuid/uuid.dart';
@@ -24,6 +13,18 @@ import 'package:vm_service/vm_service_io.dart';
2413
import 'package:vm_service_interface/vm_service_interface.dart';
2514
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
2615

16+
import 'config/tool_configuration.dart';
17+
import 'events.dart';
18+
import 'loaders/ddc_library_bundle.dart';
19+
import 'services/chrome/chrome_debug_exception.dart';
20+
import 'services/chrome/chrome_debug_service.dart';
21+
import 'services/chrome/chrome_proxy_service.dart';
22+
import 'services/debug_service.dart';
23+
import 'services/proxy_service.dart';
24+
import 'services/web_socket/web_socket_debug_service.dart';
25+
import 'services/web_socket/web_socket_proxy_service.dart';
26+
import 'utilities/synchronized.dart';
27+
2728
/// Type of requests added to the request controller.
2829
typedef VmRequest = Map<String, Object>;
2930

@@ -415,7 +416,7 @@ final class ChromeDwdsVmClient
415416
for (var retry = 0; retry < retries; retry++) {
416417
final tryId = await chromeProxyService.executionContext.id;
417418
if (tryId != null) return tryId;
418-
await Future.delayed(const Duration(milliseconds: waitInMs));
419+
await Future<void>.delayed(const Duration(milliseconds: waitInMs));
419420
}
420421
throw StateError('No context with the running Dart application.');
421422
}

‎dwds/lib/src/services/batched_expression_evaluator.dart‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@
55
import 'dart:async';
66

77
import 'package:collection/collection.dart';
8-
import 'package:dwds/shared/batched_stream.dart';
9-
import 'package:dwds/src/debugging/chrome_inspector.dart';
10-
import 'package:dwds/src/debugging/debugger.dart';
11-
import 'package:dwds/src/debugging/location.dart';
12-
import 'package:dwds/src/debugging/modules.dart';
13-
import 'package:dwds/src/services/expression_compiler.dart';
14-
import 'package:dwds/src/services/expression_evaluator.dart';
15-
import 'package:dwds/src/utilities/shared.dart';
168
import 'package:logging/logging.dart';
179
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
1810

11+
import '../../shared/batched_stream.dart';
12+
import '../debugging/chrome_inspector.dart';
13+
import '../debugging/debugger.dart';
14+
import '../debugging/location.dart';
15+
import '../debugging/modules.dart';
16+
import '../utilities/shared.dart';
17+
import 'expression_compiler.dart';
18+
import 'expression_evaluator.dart';
19+
1920
class EvaluateRequest {
2021
final String isolateId;
2122
final String? libraryUri;
@@ -84,15 +85,15 @@ class BatchedExpressionEvaluator extends ExpressionEvaluator {
8485

8586
if (libraryUri != request.libraryUri ||
8687
isolateId != request.isolateId ||
87-
!MapEquality().equals(scope, request.scope)) {
88+
!const MapEquality<String, String>().equals(scope, request.scope)) {
8889
_logger.fine('New batch due to');
8990
if (libraryUri != request.libraryUri) {
9091
_logger.fine(' - library uri: $libraryUri != ${request.libraryUri}');
9192
}
9293
if (isolateId != request.isolateId) {
9394
_logger.fine(' - isolateId: $isolateId != ${request.isolateId}');
9495
}
95-
if (!MapEquality().equals(scope, request.scope)) {
96+
if (!const MapEquality<String, String>().equals(scope, request.scope)) {
9697
_logger.fine(' - scope: $scope != ${request.scope}');
9798
}
9899

‎dwds/lib/src/services/expression_compiler_service.dart‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ import 'dart:async';
66
import 'dart:isolate';
77

88
import 'package:async/async.dart';
9-
import 'package:dwds/src/services/expression_compiler.dart';
10-
import 'package:dwds/src/utilities/sdk_configuration.dart';
119
import 'package:logging/logging.dart';
1210

11+
import '../utilities/sdk_configuration.dart';
12+
import 'expression_compiler.dart';
13+
1314
class _Compiler {
1415
static final _logger = Logger('ExpressionCompilerService');
1516
final StreamQueue<dynamic> _responseQueue;
@@ -107,7 +108,7 @@ class _Compiler {
107108
}
108109

109110
Future<bool> updateDependencies(Map<String, ModuleInfo> modules) async {
110-
final updateCompleter = Completer();
111+
final updateCompleter = Completer<void>();
111112
_dependencyUpdate = updateCompleter.future;
112113

113114
_logger.info('Updating dependencies...');

‎dwds/lib/src/utilities/shared.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Future<T> wrapInErrorHandlerAsync<T>(
3535
String command,
3636
Future<T> Function() asyncCallback,
3737
) {
38-
return asyncCallback().catchError((error) {
38+
return asyncCallback().catchError((Object error) {
3939
return Future<T>.error(
4040
RPCError(
4141
command,

0 commit comments

Comments
 (0)