Skip to content

Commit f33f60d

Browse files
Remove unused code from services/ (#9919)
1 parent b95a83d commit f33f60d

10 files changed

Lines changed: 57 additions & 42 deletions

File tree

analysis_options.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ analyzer:
1818
- '**/build/**'
1919
- '**.freezed.dart'
2020
- tool/flutter-sdk/
21+
- build/**
22+
- android/**
23+
- ios/**
24+
- web/**
25+
- windows/**
26+
- macos/**
27+
- linux/**
2128

2229
linter:
2330
rules:
@@ -166,7 +173,6 @@ dart_code_metrics:
166173
- integration_test/**
167174
# Investigate internal usages of inspector_controller before removing.
168175
- lib/src/screens/inspector/**_controller.dart
169-
- lib/src/service/**
170176
- lib/src/shared/**
171177
- test/**
172178
rules:

packages/devtools_app/analysis_options.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ analyzer:
1313
# these files if you want to ensure code is not invalid except where
1414
# expected.
1515
- test/test_infra/test_data/syntax_highlighting/**
16+
- android/**
17+
- ios/**
18+
- web/**
19+
- windows/**
20+
- macos/**
21+
- linux/**
1622

1723
dart_code_metrics:
1824
metrics-exclude:

packages/devtools_app/lib/src/service/service_extensions.dart

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -226,15 +226,6 @@ class ServiceExtensionDescription<T> extends extensions.ServiceExtension<T>
226226
String get gaItemTooltipLink => '${gaItem}TooltipLink';
227227
}
228228

229-
final debugAllowBanner = ToggleableServiceExtensionDescription<bool>.from(
230-
extensions.debugAllowBanner,
231-
title: 'Debug Banner',
232-
iconAsset: 'icons/debug_banner@2x.png',
233-
gaScreenName: gac.inspector,
234-
gaItem: gac.debugBanner,
235-
tooltip: 'Toggle Debug Banner',
236-
);
237-
238229
final invertOversizedImages = ToggleableServiceExtensionDescription<bool>.from(
239230
extensions.invertOversizedImages,
240231
title: 'Highlight Oversized Images',
@@ -363,6 +354,8 @@ final slowAnimations = ToggleableServiceExtensionDescription<num>.from(
363354
gaDocsItem: gac.slowAnimationDocs,
364355
);
365356

357+
// TODO(https://github.com/flutter/devtools/issues/2780): hook this up in the UI.
358+
// ignore: unused-code, TODO(https://github.com/flutter/devtools/issues/2780).
366359
final togglePlatformMode = ServiceExtensionDescription<String>.from(
367360
extensions.togglePlatformMode,
368361
title: 'Override target platform',

packages/devtools_app/lib/src/service/timeline_streams.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class TimelineStreamManager with DisposerMixin {
6363
List<TimelineStream> get advancedStreams =>
6464
_streamsWhere((stream) => stream.advanced);
6565

66+
@visibleForTesting
6667
List<TimelineStream> get recordedStreams =>
6768
_streamsWhere((stream) => stream.recorded.value);
6869

packages/devtools_app/lib/src/service/vm_service_wrapper.dart

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@ class VmServiceWrapper extends VmService {
9494

9595
final _activeStreams = <String, Future<Success>>{};
9696

97-
final activeFutures = <TrackedFuture<Object>>{};
97+
final activeFutureNames = <String>[];
9898

99+
@visibleForTesting
99100
Future<void> get allFuturesCompleted => _allFuturesCompleter.future;
100101

101102
Completer<bool> _allFuturesCompleter = Completer<bool>()
@@ -326,20 +327,6 @@ class VmServiceWrapper extends VmService {
326327

327328
// End Dart IO extension method wrappers.
328329

329-
/// Testing only method to indicate that we don't really need to await all
330-
/// currently pending futures.
331-
///
332-
/// If you use this method be sure to indicate why you believe all pending
333-
/// futures are safe to ignore. Currently the theory is this method should be
334-
/// used after a hot restart to avoid bugs where we have zombie futures lying
335-
/// around causing tests to flake.
336-
@visibleForTesting
337-
void doNotWaitForPendingFuturesBeforeExit() {
338-
_allFuturesCompleter = Completer<bool>();
339-
_allFuturesCompleter.complete(true);
340-
activeFutures.clear();
341-
}
342-
343330
@visibleForTesting
344331
int vmServiceCallCount = 0;
345332

@@ -383,15 +370,14 @@ class VmServiceWrapper extends VmService {
383370
vmServiceCallCount++;
384371
vmServiceCalls.add(name);
385372

386-
final trackedFuture = TrackedFuture(name, localFuture as Future<Object>);
387373
if (_allFuturesCompleter.isCompleted) {
388374
_allFuturesCompleter = Completer<bool>();
389375
}
390-
activeFutures.add(trackedFuture);
376+
activeFutureNames.add(name);
391377

392378
void futureComplete() {
393-
activeFutures.remove(trackedFuture);
394-
if (activeFutures.isEmpty) {
379+
activeFutureNames.remove(name);
380+
if (activeFutureNames.isEmpty) {
395381
_allFuturesCompleter.safeComplete(true);
396382
}
397383
}
@@ -428,10 +414,6 @@ class VmServiceWrapper extends VmService {
428414
return parser(result.json);
429415
}
430416

431-
/// Forces the VM to perform a full garbage collection.
432-
Future<Success?> collectAllGarbage() =>
433-
_privateRpcInvoke('collectAllGarbage', parser: Success.parse);
434-
435417
Future<InstanceRef?> getReachableSize(String isolateId, String targetId) =>
436418
_privateRpcInvoke(
437419
'getReachableSize',
@@ -512,10 +494,3 @@ class VmServiceWrapper extends VmService {
512494
return response.dapResponse.body;
513495
}
514496
}
515-
516-
class TrackedFuture<T> {
517-
TrackedFuture(this.name, this.future);
518-
519-
final String name;
520-
final Future<T> future;
521-
}

packages/devtools_app/test/test_infra/flutter_test_environment.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ class FlutterTestEnvironment {
200200
const Duration(seconds: 20),
201201
onTimeout: () {
202202
throw 'Timed out waiting for futures to complete during teardown. '
203-
'${_service.activeFutures.length} futures remained:\n\n'
204-
' ${_service.activeFutures.map((tf) => tf.name).join('\n ')}';
203+
'${_service.activeFutureNames.length} futures remained:\n\n'
204+
' ${_service.activeFutureNames.join('\\n ')}';
205205
},
206206
);
207207
await _flutter!.stop();

packages/devtools_extensions/example/app_that_uses_foo/analysis_options.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@
77

88
# The following line activates a set of recommended lints for Flutter apps,
99
# packages, and plugins designed to encourage good coding practices.
10+
analyzer:
11+
exclude:
12+
- build/**
13+
- android/**
14+
- ios/**
15+
- web/**
16+
- windows/**
17+
- macos/**
18+
- linux/**
1019
include: package:flutter_lints/flutter.yaml
1120

1221
linter:
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1+
analyzer:
2+
exclude:
3+
- build/**
4+
- android/**
5+
- ios/**
6+
- web/**
7+
- windows/**
8+
- macos/**
9+
- linux/**
110
include: package:flutter_lints/flutter.yaml
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1+
analyzer:
2+
exclude:
3+
- build/**
4+
- android/**
5+
- ios/**
6+
- web/**
7+
- windows/**
8+
- macos/**
9+
- linux/**
110
include: package:flutter_lints/flutter.yaml

tool/analysis_options.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ include: package:lints/recommended.yaml
66
analyzer:
77
exclude:
88
- flutter-sdk/
9+
- build/**
10+
- android/**
11+
- ios/**
12+
- web/**
13+
- windows/**
14+
- macos/**
15+
- linux/**
916

1017
linter:
1118
rules:

0 commit comments

Comments
 (0)