Skip to content

Commit b6d8bb2

Browse files
committed
Remove unused code from shared
1 parent 1d6d8c7 commit b6d8bb2

72 files changed

Lines changed: 321 additions & 2038 deletions

File tree

Some content is hidden

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

analysis_options.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,12 @@ dart_code_metrics:
163163
# devtools_app/.
164164
# TODO(https://github.com/flutter/devtools/issues/9906) remove these
165165
# excludes as findings are resolved.
166-
# Investigate internal usages of inspector_controller before removing.
166+
# Investigate internal usages of inspector logic before removing.
167167
- lib/src/screens/inspector/**_controller.dart
168+
- lib/src/shared/diagnostics/inspector_service.dart
169+
- lib/src/shared/diagnostics/diagnostics_node.dart
170+
168171
- lib/src/service/**
169-
- lib/src/shared/**
170172
- lib/src/standalone_ui/**
171173
- test/**
172174
rules:

packages/devtools_app/benchmark/devtools_benchmarks_test.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// Note: this test was modeled after the example test from Flutter Gallery:
66
// https://github.com/flutter/gallery/blob/master/test_benchmarks/benchmarks_test.dart
77

8-
import 'dart:convert' show JsonEncoder;
98
import 'dart:io';
109

1110
import 'package:collection/collection.dart';
11+
import 'package:devtools_app/src/shared/primitives/utils.dart';
1212
import 'package:devtools_test/helpers.dart';
1313
import 'package:test/test.dart';
1414
import 'package:web_benchmarks/metrics.dart';
@@ -92,10 +92,7 @@ Future<void> _runBenchmarks({bool useWasm = false}) async {
9292

9393
stdout.writeln('Web benchmark tests finished.');
9494

95-
expect(
96-
const JsonEncoder.withIndent(' ').convert(taskResult.toJson()),
97-
isA<String>(),
98-
);
95+
expect(taskResult.toJson().prettyPrint(), isA<String>());
9996
expect(taskResult.scores.keys, hasLength(DevToolsBenchmark.values.length));
10097

10198
for (final devToolsBenchmark in DevToolsBenchmark.values) {

packages/devtools_app/benchmark/scripts/compare_benchmarks.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import 'dart:convert';
66
import 'dart:io';
77

8+
import 'package:devtools_app/src/shared/primitives/utils.dart';
89
import 'package:web_benchmarks/analysis.dart';
910

1011
import 'utils.dart';
@@ -61,6 +62,6 @@ void compareBenchmarks(
6162
stdout.writeln('Baseline comparison finished.');
6263
stdout
6364
..writeln('==== Comparison with baseline $baselineSource ====')
64-
..writeln(const JsonEncoder.withIndent(' ').convert(delta.toJson()))
65+
..writeln(delta.toJson().prettyPrint())
6566
..writeln('==== End of baseline comparison ====');
6667
}

packages/devtools_app/lib/src/screens/app_size/app_size_screen.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ class _AppSizeBodyState extends State<AppSizeBody>
212212
if (currentTab.key == AppSizeScreen.diffTabKey) ...[
213213
const SizedBox(width: defaultSpacing),
214214
DiffTreeTypeDropdown(
215+
value: controller.activeDiffTreeType.value,
215216
onChanged: (newDiffTreeType) {
216217
controller.changeActiveDiffTreeType(newDiffTreeType!);
217218
},
@@ -278,9 +279,11 @@ class AppUnitDropdown extends StatelessWidget {
278279
class DiffTreeTypeDropdown extends StatelessWidget {
279280
const DiffTreeTypeDropdown({
280281
super.key,
282+
required this.value,
281283
required this.onChanged,
282284
});
283285

286+
final DiffTreeType value;
284287
final ValueChanged<DiffTreeType?>? onChanged;
285288

286289
@override

packages/devtools_app/lib/src/screens/debugger/span_parser.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
// found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
44

55
import 'dart:collection';
6-
import 'dart:convert';
76

87
import 'package:collection/collection.dart';
98
import 'package:string_scanner/string_scanner.dart';
109

10+
import '../../shared/primitives/utils.dart';
11+
1112
//TODO(jacobr): cleanup.
1213
/// A namespace for [SpanParser] utilities.
1314
extension SpanParser on Never {
@@ -68,12 +69,12 @@ class Grammar {
6869

6970
@override
7071
String toString() {
71-
return const JsonEncoder.withIndent(' ').convert({
72+
return {
7273
'name': name,
7374
'scopeName': scopeName,
7475
'topLevelMatcher': topLevelMatcher.toJson(),
7576
'repository': repository.toJson(),
76-
});
77+
}.prettyPrint();
7778
}
7879
}
7980

packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class InspectorTreeController extends DisposableController
121121
final int? gaId;
122122

123123
InspectorTreeNode createNode() =>
124-
InspectorTreeNode(whenDirty: _handleDirtyNode);
124+
InspectorTreeNode();
125125

126126
SearchTargetType _searchTarget = SearchTargetType.widget;
127127
int _rootSetCount = 0;
@@ -284,15 +284,6 @@ class InspectorTreeController extends DisposableController
284284
}
285285
}
286286

287-
/// Resets the state if the root has been marked as dirty.
288-
void _handleDirtyNode(InspectorTreeNode node) {
289-
if (node == root) {
290-
_cachedSelectedRow = null;
291-
lastContentWidth = null;
292-
_updateRows();
293-
}
294-
}
295-
296287
void setSearchTarget(SearchTargetType searchTarget) {
297288
_searchTarget = searchTarget;
298289
refreshSearchMatches();
@@ -448,10 +439,6 @@ class InspectorTreeController extends DisposableController
448439
return inspectorRowHeight * index;
449440
}
450441

451-
void nodeChanged(InspectorTreeNode node) {
452-
node.isDirty = true;
453-
}
454-
455442
void removeNodeFromParent(InspectorTreeNode node) {
456443
node.parent?.removeChild(node);
457444
}
@@ -767,7 +754,6 @@ class InspectorTreeController extends DisposableController
767754
setupChildren(diagnostic, treeNode, children, expandChildren: true);
768755
refreshTree(
769756
updateTreeAction: () {
770-
nodeChanged(treeNode);
771757
if (treeNode == selection) {
772758
expandPath(treeNode);
773759
}

packages/devtools_app/lib/src/screens/logging/logging_controller.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,8 +1016,6 @@ class LogData with SearchableDataMixin {
10161016
String? _details;
10171017
Future<String> Function()? detailsComputer;
10181018

1019-
static const prettyPrinter = JsonEncoder.withIndent(' ');
1020-
10211019
String? get details => _details;
10221020

10231021
bool get needsComputing => !detailsComputed.isCompleted;
@@ -1040,8 +1038,8 @@ class LogData with SearchableDataMixin {
10401038
}
10411039

10421040
try {
1043-
return prettyPrinter
1044-
.convert(jsonDecode(details!))
1041+
return (jsonDecode(details!) as Object?)
1042+
.prettyPrint()
10451043
.replaceAll(r'\n', '\n')
10461044
.trim();
10471045
} catch (_) {

packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
44

55
// ignore_for_file: non_constant_identifier_names
6+
// ignore_for_file: unused-code, platform specific imports.
67

78
import 'dart:async';
89

packages/devtools_app/lib/src/shared/analytics/analytics_controller.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ bool get isAnalyticsEnabled =>
4343
/// Whether the analytics controller has been initialized.
4444
bool get isAnalyticsControllerInitialized => _analyticsController != null;
4545

46-
typedef AsyncAnalyticsCallback = FutureOr<void> Function();
47-
4846
class AnalyticsController {
4947
AnalyticsController({
5048
required bool enabled,
@@ -67,6 +65,7 @@ class AnalyticsController {
6765
ValueListenable<bool> get shouldPrompt => _shouldPrompt;
6866
final ValueNotifier<bool> _shouldPrompt;
6967

68+
@visibleForTesting
7069
bool get analyticsInitialized => _analyticsInitialized;
7170
bool _analyticsInitialized = false;
7271

packages/devtools_app/lib/src/shared/analytics/constants.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,6 @@ const inspectorSettings = 'inspectorSettings';
9999
const loggingSettings = 'loggingSettings';
100100
const refreshPubRoots = 'refreshPubRoots';
101101

102-
enum InspectorDetailsViewType { layoutExplorer, widgetDetailsTree }
103-
104-
final defaultDetailsViewToLayoutExplorer =
105-
InspectorDetailsViewType.layoutExplorer.name;
106-
final defaultDetailsViewToWidgetDetails =
107-
InspectorDetailsViewType.widgetDetailsTree.name;
108-
109102
enum HomeScreenEvents { connectToApp, connectToNewApp, viewVmFlags }
110103

111104
// Logging UX actions:

0 commit comments

Comments
 (0)