Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ dart_code_metrics:
- lib/src/screens/inspector/**_controller.dart
- lib/src/service/**
- lib/src/shared/**
- lib/src/standalone_ui/**
- test/**
rules:
# - arguments-ordering Too strict
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ class PropertyEditorController extends DisposableController
_editableWidgetData;
final _editableWidgetData = ValueNotifier<EditableWidgetData?>(null);

List<EditableProperty> get allProperties =>
_editableWidgetData.value?.properties ?? [];
String? get widgetName => _editableWidgetData.value?.name;
String? get widgetDocumentation => _editableWidgetData.value?.documentation;
String? get fileUri => _editableWidgetData.value?.fileUri;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,9 @@ class _PropertyEditorPanelState extends State<PropertyEditorPanel> {
future: _editor,
builder: (context, snapshot) =>
switch ((snapshot.connectionState, snapshot.data)) {
(ConnectionState.done, final editor?) =>
_PropertyEditorConnectedPanel(
editor,
controller: _propertyEditorController!,
),
(ConnectionState.done, final _) => _PropertyEditorConnectedPanel(
controller: _propertyEditorController!,
),
_ => const CenteredCircularProgressIndicator(),
},
),
Expand All @@ -76,9 +74,8 @@ class _PropertyEditorPanelState extends State<PropertyEditorPanel> {

/// The property editor panel shown once we know an editor is available.
class _PropertyEditorConnectedPanel extends StatefulWidget {
const _PropertyEditorConnectedPanel(this.editor, {required this.controller});
const _PropertyEditorConnectedPanel({required this.controller});

final EditorClient editor;
final PropertyEditorController controller;

@override
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ class DebugSessions extends StatelessWidget {
const DebugSessions({
required this.editor,
required this.sessions,
required this.devices,
super.key,
});

Expand All @@ -26,9 +25,6 @@ class DebugSessions extends StatelessWidget {
/// A map of debug session IDs to their debug sessions.
final Map<String, EditorDebugSession> sessions;

/// A map of device IDs to their devices.
final Map<String, EditorDevice> devices;

@override
Widget build(BuildContext context) {
return Column(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ class SidebarDevToolsScreens extends StatelessWidget {
(s) => createDevToolsScreenRow(
dataLeft: _buttonDataFromScreen(s),
dataRight: null,
editor: editor,
singleColumn: singleColumn,
hasDebugSessions: debugSessions.isNotEmpty,
onPressed: (data) => openDevToolsScreen(
Expand All @@ -140,7 +139,6 @@ class SidebarDevToolsScreens extends StatelessWidget {
createDevToolsScreenRow(
dataLeft: _buttonDataFromScreen(first),
dataRight: second != null ? _buttonDataFromScreen(second) : null,
editor: editor,
singleColumn: singleColumn,
hasDebugSessions: debugSessions.isNotEmpty,
onPressed: (data) => openDevToolsScreen(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ class _SidebarDevToolsExtensionsState extends State<SidebarDevToolsExtensions>
// because we do not have control over how long the names
// will be and we want to avoid ugly text wrapping.
singleColumn: true,
editor: widget.editor,
hasDebugSessions: widget.debugSessions.isNotEmpty,
onPressed: (data) {
ga.select(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ TableRow createDevToolsScreenRow({
required DevToolsButtonData? dataRight,
required bool singleColumn,
required bool hasDebugSessions,
required EditorClient editor,
required void Function(DevToolsButtonData data) onPressed,
}) {
assert(
Expand All @@ -35,7 +34,6 @@ TableRow createDevToolsScreenRow({
final cellRight = dataRight != null
? _DevToolsScreenButton(
data: dataRight,
editor: editor,
hasDebugSessions: hasDebugSessions,
onPressed: onPressed,
)
Expand All @@ -44,7 +42,6 @@ TableRow createDevToolsScreenRow({
children: [
_DevToolsScreenButton(
data: dataLeft,
editor: editor,
hasDebugSessions: hasDebugSessions,
onPressed: onPressed,
),
Expand All @@ -56,13 +53,11 @@ TableRow createDevToolsScreenRow({
class _DevToolsScreenButton extends StatelessWidget {
const _DevToolsScreenButton({
required this.data,
required this.editor,
required this.hasDebugSessions,
required this.onPressed,
});

final DevToolsButtonData data;
final EditorClient editor;
final bool hasDebugSessions;
final void Function(DevToolsButtonData data) onPressed;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,7 @@ class _EditorConnectedPanelState extends State<_EditorConnectedPanel>
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
DebugSessions(
editor: widget.editor,
sessions: debugSessions,
devices: devices,
),
DebugSessions(editor: widget.editor, sessions: debugSessions),
const SizedBox(height: defaultSpacing),
if (widget.editor.supportsSelectDevice) ...[
Devices(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

import 'package:devtools_app/devtools_app.dart';
import 'package:devtools_app/src/shared/constants.dart';
import 'package:devtools_app/src/shared/editor/api_classes.dart';
import 'package:devtools_app/src/standalone_ui/vs_code/debug_sessions.dart';
import 'package:devtools_app_shared/ui.dart';
import 'package:devtools_app_shared/utils.dart';
Expand All @@ -14,22 +13,17 @@ import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/mockito.dart';

import '../../test_infra/scenes/standalone_ui/editor_service/simulated_editor.dart';
import '../../test_infra/utils/sidebar_utils.dart';

void main() {
const windowSize = Size(2000.0, 2000.0);

late MockEditorClient mockEditorClient;
late final Map<String, EditorDevice> deviceMap;

setUpAll(() {
// Set test mode so that the debug list of extensions will be used.
setTestMode();
setGlobal(ServiceConnectionManager, FakeServiceConnectionManager());

final devices = stubbedDevices.map((d) => MapEntry(d.id, d));
deviceMap = {for (final d in devices) d.key: d.value};
});

setUp(() {
Expand All @@ -52,7 +46,6 @@ void main() {
sessions: Map.fromEntries(
_debugSessions.map((s) => MapEntry(s.id, s)),
),
devices: deviceMap,
),
),
);
Expand Down
Loading