Skip to content

Commit 228d095

Browse files
jyameojyameo
committed
fixed linting errors
1 parent 2b465d0 commit 228d095

File tree

62 files changed

+651
-543
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+651
-543
lines changed

‎dwds/lib/dart_web_debug_service.dart‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,23 @@
44

55
import 'dart:async';
66

7-
import 'package:dwds/data/build_result.dart';
8-
import 'package:dwds/src/config/tool_configuration.dart';
9-
import 'package:dwds/src/connections/app_connection.dart';
10-
import 'package:dwds/src/connections/debug_connection.dart';
11-
import 'package:dwds/src/events.dart';
12-
import 'package:dwds/src/handlers/dev_handler.dart';
13-
import 'package:dwds/src/handlers/injector.dart';
14-
import 'package:dwds/src/handlers/socket_connections.dart';
15-
import 'package:dwds/src/readers/asset_reader.dart';
16-
import 'package:dwds/src/servers/devtools.dart';
17-
import 'package:dwds/src/servers/extension_backend.dart';
187
import 'package:logging/logging.dart';
198
import 'package:shelf/shelf.dart';
209
import 'package:sse/server/sse_handler.dart';
2110
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
2211

12+
import 'data/build_result.dart';
13+
import 'src/config/tool_configuration.dart';
14+
import 'src/connections/app_connection.dart';
15+
import 'src/connections/debug_connection.dart';
16+
import 'src/events.dart';
17+
import 'src/handlers/dev_handler.dart';
18+
import 'src/handlers/injector.dart';
19+
import 'src/handlers/socket_connections.dart';
20+
import 'src/readers/asset_reader.dart';
21+
import 'src/servers/devtools.dart';
22+
import 'src/servers/extension_backend.dart';
23+
2324
typedef ConnectionProvider = Future<ChromeConnection> Function();
2425

2526
/// The Dart Web Debug Service.
@@ -145,8 +146,9 @@ class Dwds {
145146
debugSettings.expressionCompiler,
146147
injected,
147148
DartDevelopmentServiceConfiguration(
148-
// This technically isn't correct, but DartDevelopmentServiceConfiguration.enable
149-
// is true by default, so this won't break unmigrated tools.
149+
// This technically isn't correct, but
150+
// DartDevelopmentServiceConfiguration.enable is true by default,
151+
// so this won't break unmigrated tools.
150152
// ignore: deprecated_member_use_from_same_package
151153
enable: debugSettings.spawnDds && debugSettings.ddsConfiguration.enable,
152154
// ignore: deprecated_member_use_from_same_package

‎dwds/lib/dwds.dart‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
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-
export 'dart_web_debug_service.dart' show Dwds, ConnectionProvider;
5+
export 'dart_web_debug_service.dart' show ConnectionProvider, Dwds;
66
export 'src/config/tool_configuration.dart'
77
show
88
AppMetadata,
9-
UrlEncoder,
109
DartDevelopmentServiceConfiguration,
11-
DevToolsLauncher,
1210
DebugSettings,
13-
ToolConfiguration;
11+
DevToolsLauncher,
12+
ToolConfiguration,
13+
UrlEncoder;
1414
export 'src/connections/app_connection.dart' show AppConnection;
1515
export 'src/connections/debug_connection.dart' show DebugConnection;
1616
export 'src/debugging/metadata/provider.dart'
17-
show MetadataProvider, AbsoluteImportUriException;
17+
show AbsoluteImportUriException, MetadataProvider;
1818
export 'src/events.dart' show DwdsEvent;
1919
export 'src/handlers/dev_handler.dart' show AppConnectionException;
2020
export 'src/handlers/socket_connections.dart';
@@ -28,7 +28,7 @@ export 'src/loaders/frontend_server_strategy_provider.dart'
2828
FrontendServerRequireStrategyProvider;
2929
export 'src/loaders/require.dart' show RequireStrategy;
3030
export 'src/loaders/strategy.dart'
31-
show LoadStrategy, ReloadConfiguration, BuildSettings;
31+
show BuildSettings, LoadStrategy, ReloadConfiguration;
3232
export 'src/readers/asset_reader.dart' show AssetReader, PackageUriMapper;
3333
export 'src/readers/frontend_server_asset_reader.dart'
3434
show FrontendServerAssetReader;
@@ -38,12 +38,12 @@ export 'src/services/chrome/chrome_debug_exception.dart'
3838
show ChromeDebugException;
3939
export 'src/services/expression_compiler.dart'
4040
show
41+
CompilerOptions,
4142
ExpressionCompilationResult,
4243
ExpressionCompiler,
43-
ModuleInfo,
44-
CompilerOptions;
44+
ModuleInfo;
4545
export 'src/services/expression_compiler_service.dart'
4646
show ExpressionCompilerService;
4747
export 'src/utilities/ddc_names.dart';
4848
export 'src/utilities/sdk_configuration.dart'
49-
show SdkLayout, SdkConfiguration, SdkConfigurationProvider;
49+
show SdkConfiguration, SdkConfigurationProvider, SdkLayout;

‎dwds/lib/expression_compiler.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
export 'src/services/expression_compiler.dart'
66
show
7+
CompilerOptions,
78
ExpressionCompilationResult,
89
ExpressionCompiler,
9-
CompilerOptions,
1010
ModuleFormat,
1111
ModuleInfo;

‎dwds/lib/sdk_configuration.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
export 'src/utilities/sdk_configuration.dart'
66
show
7-
SdkLayout,
7+
DefaultSdkConfigurationProvider,
88
SdkConfiguration,
99
SdkConfigurationProvider,
10-
DefaultSdkConfigurationProvider;
10+
SdkLayout;

‎dwds/lib/shared/batched_stream.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'dart:async';
66
import 'dart:math';
77
import 'package:async/async.dart';
8-
import 'package:dwds/src/utilities/shared.dart';
8+
import '../src/utilities/shared.dart';
99

1010
/// Stream controller allowing to batch events.
1111
class BatchedStreamController<T> {

‎dwds/lib/src/config/tool_configuration.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
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/loaders/strategy.dart';
6-
import 'package:dwds/src/servers/devtools.dart';
7-
import 'package:dwds/src/services/expression_compiler.dart';
5+
import '../loaders/strategy.dart';
6+
import '../servers/devtools.dart';
7+
import '../services/expression_compiler.dart';
88

99
/// Configuration about the app, debug settings, and file system.
1010
///

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

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

8-
import 'package:dwds/data/connect_request.dart';
9-
import 'package:dwds/data/run_request.dart';
10-
import 'package:dwds/data/serializers.dart';
11-
import 'package:dwds/src/handlers/socket_connections.dart';
12-
import 'package:dwds/src/utilities/shared.dart';
8+
import '../../data/connect_request.dart';
9+
import '../../data/run_request.dart';
10+
import '../../data/serializers.dart';
11+
import '../handlers/socket_connections.dart';
12+
import '../utilities/shared.dart';
1313

1414
/// A connection between the application loaded in the browser and DWDS.
1515
class AppConnection {

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

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,30 @@
44

55
import 'dart:math' as math;
66

7-
import 'package:dwds/src/config/tool_configuration.dart';
8-
import 'package:dwds/src/connections/app_connection.dart';
9-
import 'package:dwds/src/debugging/classes.dart';
10-
import 'package:dwds/src/debugging/debugger.dart';
11-
import 'package:dwds/src/debugging/execution_context.dart';
12-
import 'package:dwds/src/debugging/inspector.dart';
13-
import 'package:dwds/src/debugging/instance.dart';
14-
import 'package:dwds/src/debugging/libraries.dart';
15-
import 'package:dwds/src/debugging/location.dart';
16-
import 'package:dwds/src/debugging/metadata/provider.dart';
17-
import 'package:dwds/src/debugging/remote_debugger.dart';
18-
import 'package:dwds/src/loaders/ddc_library_bundle.dart';
19-
import 'package:dwds/src/readers/asset_reader.dart';
20-
import 'package:dwds/src/utilities/conversions.dart';
21-
import 'package:dwds/src/utilities/dart_uri.dart';
22-
import 'package:dwds/src/utilities/domain.dart';
23-
import 'package:dwds/src/utilities/objects.dart';
24-
import 'package:dwds/src/utilities/server.dart';
25-
import 'package:dwds/src/utilities/shared.dart';
267
import 'package:logging/logging.dart';
278
import 'package:vm_service/vm_service.dart';
289
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
2910

11+
import '../config/tool_configuration.dart';
12+
import '../connections/app_connection.dart';
13+
import '../loaders/ddc_library_bundle.dart';
14+
import '../readers/asset_reader.dart';
15+
import '../utilities/conversions.dart';
16+
import '../utilities/dart_uri.dart';
17+
import '../utilities/domain.dart';
18+
import '../utilities/objects.dart';
19+
import '../utilities/server.dart';
20+
import '../utilities/shared.dart';
21+
import 'classes.dart';
22+
import 'debugger.dart';
23+
import 'execution_context.dart';
24+
import 'inspector.dart';
25+
import 'instance.dart';
26+
import 'libraries.dart';
27+
import 'location.dart';
28+
import 'metadata/provider.dart';
29+
import 'remote_debugger.dart';
30+
3031
/// An inspector for a running Dart application contained in the
3132
/// [WipConnection].
3233
///

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
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/config/tool_configuration.dart';
6-
import 'package:dwds/src/debugging/chrome_inspector.dart';
7-
import 'package:dwds/src/debugging/metadata/class.dart';
8-
import 'package:dwds/src/services/chrome/chrome_debug_exception.dart';
9-
import 'package:dwds/src/utilities/shared.dart';
105
import 'package:vm_service/vm_service.dart';
116
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
127

8+
import '../config/tool_configuration.dart';
9+
import '../services/chrome/chrome_debug_exception.dart';
10+
import '../utilities/shared.dart';
11+
import 'chrome_inspector.dart';
12+
import 'metadata/class.dart';
13+
1314
/// Keeps track of Dart classes available in the running application.
1415
class ChromeAppClassHelper {
1516
/// Map of class ID to [Class].

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

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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/loaders/strategy.dart';
5+
import '../loaders/strategy.dart';
66

77
class DartRuntimeDebugger {
88
final LoadStrategy _loadStrategy;
@@ -104,15 +104,18 @@ class DartRuntimeDebugger {
104104
return _wrapInIIFE(expression);
105105
}
106106

107-
/// Generates a JS expression for retrieving Dart Developer Extension Names.
107+
/// Generates a JS expression for retrieving Dart Developer Extension
108+
/// Names.
108109
String getDartDeveloperExtensionNamesJsExpression() {
109110
return _generateJsExpression(
110-
"${_loadStrategy.loadModuleSnippet}('dart_sdk').developer._extensions.keys.toList();",
111+
"${_loadStrategy.loadModuleSnippet}('dart_sdk').developer"
112+
'._extensions.keys.toList();',
111113
'dartDevEmbedder.debugger.extensionNames',
112114
);
113115
}
114116

115-
/// Generates a JS expression for retrieving metadata of classes in a library.
117+
/// Generates a JS expression for retrieving metadata of classes in a
118+
/// library.
116119
String getClassesInLibraryJsExpression(String libraryUri) {
117120
final expression = _buildExpression(
118121
'',
@@ -167,32 +170,39 @@ class DartRuntimeDebugger {
167170
);
168171
}
169172

170-
/// Generates a JS expression for calling an instance method on an object.
173+
/// Generates a JS expression for calling an instance method on an
174+
/// object.
171175
String callInstanceMethodJsExpression(String methodName) {
172176
String generateInstanceMethodJsExpression(String functionCall) {
173177
return '''
174178
function () {
175-
if (!Object.getPrototypeOf(this)) { return 'Instance of PlainJavaScriptObject'; }
179+
if (!Object.getPrototypeOf(this)) {
180+
return 'Instance of PlainJavaScriptObject';
181+
}
176182
return $functionCall;
177183
}
178184
''';
179185
}
180186

181187
return _generateJsExpression(
182188
generateInstanceMethodJsExpression(
183-
'${_loadStrategy.loadModuleSnippet}("dart_sdk").dart.dsendRepl(this, "$methodName", arguments)',
189+
'${_loadStrategy.loadModuleSnippet}("dart_sdk").dart'
190+
'.dsendRepl(this, "$methodName", arguments)',
184191
),
185192
generateInstanceMethodJsExpression(
186-
'dartDevEmbedder.debugger.callInstanceMethod(this, "$methodName", arguments)',
193+
'dartDevEmbedder.debugger'
194+
'.callInstanceMethod(this, "$methodName", arguments)',
187195
),
188196
);
189197
}
190198

191199
/// Generates a JS expression to invoke a Dart extension method.
192200
String invokeExtensionJsExpression(String methodName, String encodedJson) {
193201
return _generateJsExpression(
194-
"${_loadStrategy.loadModuleSnippet}('dart_sdk').developer.invokeExtension('$methodName', JSON.stringify($encodedJson));",
195-
"dartDevEmbedder.debugger.invokeExtension('$methodName', JSON.stringify($encodedJson));",
202+
"${_loadStrategy.loadModuleSnippet}('dart_sdk').developer"
203+
".invokeExtension('$methodName', JSON.stringify($encodedJson));",
204+
'dartDevEmbedder.debugger'
205+
".invokeExtension('$methodName', JSON.stringify($encodedJson));",
196206
);
197207
}
198208

@@ -209,14 +219,15 @@ class DartRuntimeDebugger {
209219
})();
210220
''';
211221

212-
// `callLibraryMethod` expects an array of arguments. Chrome DevTools spreads
213-
// arguments individually when calling functions. This code reconstructs the
214-
// expected argument array.
222+
// `callLibraryMethod` expects an array of arguments. Chrome DevTools
223+
// spreads arguments individually when calling functions. This code
224+
// reconstructs the expected argument array.
215225
return _generateJsExpression(
216226
findLibraryExpression,
217227
_wrapWithBundleLoader(
218228
'',
219-
'callLibraryMethod("$libraryUri", "$methodName", Array.from(arguments))',
229+
'callLibraryMethod("$libraryUri", "$methodName", '
230+
'Array.from(arguments))',
220231
),
221232
);
222233
}

0 commit comments

Comments
 (0)