Skip to content

Commit 927c70e

Browse files
parloughparlough
authored
Update to package:lints v3 (#2261)
1 parent 36f943e commit 927c70e

File tree

11 files changed

+55
-87
lines changed

11 files changed

+55
-87
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
66

77
class TargetCrashedEvent extends WipEvent {
8-
TargetCrashedEvent(Map<String, dynamic> json) : super(json);
8+
TargetCrashedEvent(super.json);
99
}
1010

1111
/// A generic debugger used in remote debugging.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
/// Functions for converting between the different object references we use.
6+
library;
7+
68
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
79

810
/// Convert [argument] to a form usable in WIP evaluation calls.

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
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-
/// A library for WebKit mirror objects and support code. These probably should
6-
/// get migrated into webkit_inspection_protocol over time.
5+
/// A library for WebKit mirror objects and support code.
6+
///
7+
/// These probably should get migrated into
8+
/// `package:webkit_inspection_protocol` over time.
9+
library;
710

811
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
912

‎dwds/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ dev_dependencies:
5050
frontend_server_common:
5151
path: ../frontend_server_common
5252
js: ^0.6.4
53-
lints: ^2.0.0
53+
lints: ^3.0.0
5454
pubspec_parse: ^1.2.0
5555
puppeteer: ^3.0.0
5656
stream_channel: ^2.1.0

‎dwds/test/dart_uri_test.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
@TestOn('vm')
66
@Timeout(Duration(minutes: 2))
77

8-
import 'package:dwds/asset_reader.dart';
98
import 'package:dwds/src/utilities/dart_uri.dart';
109
import 'package:path/path.dart' as p;
1110
import 'package:test/test.dart';
@@ -15,7 +14,7 @@ import 'fixtures/fakes.dart';
1514
import 'fixtures/utilities.dart';
1615

1716
class TestStrategy extends FakeStrategy {
18-
TestStrategy(AssetReader assetReader) : super(assetReader);
17+
TestStrategy(super.assetReader);
1918

2019
@override
2120
String? serverPathForAppUri(String appUrl) {
@@ -34,7 +33,7 @@ class TestStrategy extends FakeStrategy {
3433
}
3534

3635
class G3TestStrategy extends FakeStrategy {
37-
G3TestStrategy(AssetReader assetReader) : super(assetReader);
36+
G3TestStrategy(super.assetReader);
3837

3938
@override
4039
String? g3RelativePath(String absolutePath) =>

‎dwds/test/debugger_test.dart‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
@Timeout(Duration(minutes: 2))
77
import 'dart:async';
88

9-
import 'package:dwds/asset_reader.dart';
109
import 'package:dwds/src/debugging/debugger.dart';
1110
import 'package:dwds/src/debugging/frame_computer.dart';
1211
import 'package:dwds/src/debugging/inspector.dart';
@@ -30,9 +29,7 @@ late Locations locations;
3029
late SkipLists skipLists;
3130

3231
class TestStrategy extends FakeStrategy {
33-
TestStrategy(
34-
AssetReader assetReader,
35-
) : super(assetReader);
32+
TestStrategy(super.assetReader);
3633

3734
@override
3835
Future<String> moduleForServerPath(String entrypoint, String appUri) async =>

‎dwds/test/fixtures/debugger_data.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
/// Contains hard-coded test data usable for tests.
6+
library;
7+
68
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
79

810
// ignore_for_file: prefer_single_quotes

‎dwds/test/fixtures/fakes.dart‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,14 +323,13 @@ class FakeStrategy extends LoadStrategy {
323323
final BuildSettings _buildSettings;
324324

325325
FakeStrategy(
326-
AssetReader assetReader, {
327-
String? packageConfigPath,
326+
super.assetReader, {
327+
super.packageConfigPath,
328328
BuildSettings? buildSettings,
329-
}) : _buildSettings = buildSettings ??
329+
}) : _buildSettings = buildSettings ??
330330
TestBuildSettings.dart(
331331
appEntrypoint: Uri.parse('package:myapp/main.dart'),
332-
),
333-
super(assetReader, packageConfigPath: packageConfigPath);
332+
);
334333

335334
@override
336335
Future<String> bootstrapFor(String entrypoint) async => 'dummy_bootstrap';

‎dwds/test/fixtures/utilities.dart‎

Lines changed: 35 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import 'package:build_daemon/client.dart';
88
import 'package:build_daemon/constants.dart';
99
import 'package:build_daemon/data/server_log.dart';
1010
import 'package:dds/devtools_server.dart';
11-
import 'package:dwds/asset_reader.dart';
1211
import 'package:dwds/src/config/tool_configuration.dart';
1312
import 'package:dwds/src/loaders/strategy.dart';
1413
import 'package:dwds/src/servers/devtools.dart';
@@ -117,33 +116,20 @@ class TestDebugSettings extends DebugSettings {
117116

118117
const TestDebugSettings.noDevTools() : super(enableDevToolsLaunch: false);
119118

120-
const TestDebugSettings._({
121-
required bool enableDebugging,
122-
required bool enableDebugExtension,
123-
required bool useSseForDebugBackend,
124-
required bool useSseForDebugProxy,
125-
required bool useSseForInjectedClient,
126-
required bool spawnDds,
127-
required bool enableDevToolsLaunch,
128-
required bool launchDevToolsInNewWindow,
129-
required bool emitDebugEvents,
130-
required DevToolsLauncher? devToolsLauncher,
131-
required ExpressionCompiler? expressionCompiler,
132-
required UrlEncoder? urlEncoder,
133-
}) : super(
134-
enableDebugging: enableDebugging,
135-
enableDebugExtension: enableDebugExtension,
136-
useSseForDebugBackend: useSseForDebugBackend,
137-
useSseForDebugProxy: useSseForDebugProxy,
138-
useSseForInjectedClient: useSseForInjectedClient,
139-
spawnDds: spawnDds,
140-
enableDevToolsLaunch: enableDevToolsLaunch,
141-
launchDevToolsInNewWindow: launchDevToolsInNewWindow,
142-
emitDebugEvents: emitDebugEvents,
143-
devToolsLauncher: devToolsLauncher,
144-
expressionCompiler: expressionCompiler,
145-
urlEncoder: urlEncoder,
146-
);
119+
TestDebugSettings._({
120+
required super.enableDebugging,
121+
required super.enableDebugExtension,
122+
required super.useSseForDebugBackend,
123+
required super.useSseForDebugProxy,
124+
required super.useSseForInjectedClient,
125+
required super.spawnDds,
126+
required super.enableDevToolsLaunch,
127+
required super.launchDevToolsInNewWindow,
128+
required super.emitDebugEvents,
129+
required super.devToolsLauncher,
130+
required super.expressionCompiler,
131+
required super.urlEncoder,
132+
});
147133

148134
TestDebugSettings copyWith({
149135
bool? enableDebugging,
@@ -177,20 +163,16 @@ class TestDebugSettings extends DebugSettings {
177163

178164
class TestAppMetadata extends AppMetadata {
179165
const TestAppMetadata({
180-
bool isInternalBuild = false,
181-
String? workspaceName,
182-
String hostname = 'localhost',
183-
}) : super(
184-
isInternalBuild: isInternalBuild,
185-
workspaceName: workspaceName,
186-
hostname: hostname,
187-
);
166+
super.isInternalBuild,
167+
super.workspaceName,
168+
super.hostname = 'localhost',
169+
});
188170

189171
TestAppMetadata copyWith({
190172
bool? isFlutterApp,
191173
bool? isInternalBuild,
192174
String? workspaceName,
193-
String? hostname = 'localhost',
175+
String? hostname,
194176
}) =>
195177
TestAppMetadata(
196178
isInternalBuild: isInternalBuild ?? this.isInternalBuild,
@@ -205,24 +187,20 @@ class TestAppMetadata extends AppMetadata {
205187

206188
class TestToolConfiguration extends ToolConfiguration {
207189
TestToolConfiguration.withDefaultLoadStrategy({
208-
TestAppMetadata appMetadata = const TestAppMetadata.externalApp(),
209-
TestDebugSettings debugSettings = const TestDebugSettings.noDevTools(),
190+
TestAppMetadata super.appMetadata = const TestAppMetadata.externalApp(),
191+
TestDebugSettings super.debugSettings =
192+
const TestDebugSettings.noDevTools(),
210193
TestBuildSettings buildSettings = const TestBuildSettings.dart(),
211194
}) : super(
212195
loadStrategy: TestStrategy(const FakeAssetReader(), buildSettings),
213-
debugSettings: debugSettings,
214-
appMetadata: appMetadata,
215196
);
216197

217198
TestToolConfiguration.withLoadStrategy({
218-
TestAppMetadata appMetadata = const TestAppMetadata.externalApp(),
219-
TestDebugSettings debugSettings = const TestDebugSettings.noDevTools(),
220-
required LoadStrategy loadStrategy,
221-
}) : super(
222-
loadStrategy: loadStrategy,
223-
debugSettings: debugSettings,
224-
appMetadata: appMetadata,
225-
);
199+
TestAppMetadata super.appMetadata = const TestAppMetadata.externalApp(),
200+
TestDebugSettings super.debugSettings =
201+
const TestDebugSettings.noDevTools(),
202+
required super.loadStrategy,
203+
});
226204
}
227205

228206
void setGlobalsForTesting({
@@ -242,12 +220,9 @@ void setGlobalsForTestingFromBuild({
242220

243221
class TestStrategy extends FakeStrategy {
244222
TestStrategy(
245-
AssetReader assetReader,
223+
super.assetReader,
246224
BuildSettings buildSettings,
247-
) : super(
248-
assetReader,
249-
buildSettings: buildSettings,
250-
);
225+
) : super(buildSettings: buildSettings);
251226

252227
@override
253228
String serverPathForAppUri(String appUri) {
@@ -290,16 +265,11 @@ class TestSettings {
290265
/// App build settings for tests.
291266
class TestBuildSettings extends BuildSettings {
292267
const TestBuildSettings({
293-
Uri? appEntrypoint,
294-
bool canaryFeatures = false,
295-
bool isFlutterApp = true,
296-
List<String> experiments = const <String>[],
297-
}) : super(
298-
appEntrypoint: appEntrypoint,
299-
canaryFeatures: canaryFeatures,
300-
isFlutterApp: isFlutterApp,
301-
experiments: experiments,
302-
);
268+
super.appEntrypoint,
269+
super.canaryFeatures,
270+
super.isFlutterApp,
271+
super.experiments,
272+
});
303273

304274
const TestBuildSettings.dart({Uri? appEntrypoint})
305275
: this(appEntrypoint: appEntrypoint, isFlutterApp: false);
@@ -324,12 +294,11 @@ class TestBuildSettings extends BuildSettings {
324294
class TestCompilerOptions extends CompilerOptions {
325295
TestCompilerOptions({
326296
required NullSafety nullSafety,
327-
required bool canaryFeatures,
297+
required super.canaryFeatures,
328298
required List<String> experiments,
329299
}) : super(
330300
moduleFormat: 'amd',
331301
soundNullSafety: nullSafety == NullSafety.sound,
332-
canaryFeatures: canaryFeatures,
333302
experiments: const <String>[],
334303
);
335304
}

‎dwds/test/location_test.dart‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
@Timeout(Duration(minutes: 2))
66

7-
import 'package:dwds/asset_reader.dart';
87
import 'package:dwds/src/debugging/location.dart';
98
import 'package:dwds/src/utilities/dart_uri.dart';
109
import 'package:test/test.dart';
@@ -188,9 +187,7 @@ const _serverPath = 'web/main.dart';
188187
const _sourceMapPath = 'packages/module.js.map';
189188

190189
class MockLoadStrategy extends FakeStrategy {
191-
MockLoadStrategy(
192-
AssetReader assetReader,
193-
) : super(assetReader);
190+
MockLoadStrategy(super.assetReader);
194191

195192
@override
196193
Future<String?> moduleForServerPath(

0 commit comments

Comments
 (0)