Revert "Replace ScriptPicker with ProgramExplorer on DebuggerScreen (flutter#3227)" and associated follow-on PRs

Author: kenzieschmoll

packages/devtools_app/lib/src/common_widgets.dart

@@ -676,7 +676,6 @@ class AreaPaneHeader extends StatelessWidget implements PreferredSizeWidget {
     this.needsLeftBorder = false,
     this.leftActions = const [],
     this.rightActions = const [],
-    this.leftPadding = defaultSpacing,
     this.rightPadding = densePadding,
     this.tall = false,
   }) : super(key: key);
@@ -688,7 +687,6 @@ class AreaPaneHeader extends StatelessWidget implements PreferredSizeWidget {
   final bool needsLeftBorder;
   final List<Widget> leftActions;
   final List<Widget> rightActions;
-  final double leftPadding;
   final double rightPadding;
   final bool tall;
 
@@ -707,7 +705,7 @@ class AreaPaneHeader extends StatelessWidget implements PreferredSizeWidget {
           ),
           color: theme.titleSolidBackgroundColor,
         ),
-        padding: EdgeInsets.only(left: leftPadding, right: rightPadding),
+        padding: EdgeInsets.only(left: defaultSpacing, right: rightPadding),
         alignment: Alignment.centerLeft,
         child: Row(
           children: [

packages/devtools_app/lib/src/debugger/codeview.dart

@@ -42,7 +42,6 @@ class CodeView extends StatefulWidget {
   const CodeView({
     Key key,
     this.controller,
-    this.initialPosition,
     this.scriptRef,
     this.parsedScript,
     this.onSelected,
@@ -58,7 +57,6 @@ class CodeView extends StatefulWidget {
   static double get assumedCharacterWidth => scaleByFontFactor(16.0);
 
   final DebuggerController controller;
-  final ScriptLocation initialPosition;
   final ScriptRef scriptRef;
   final ParsedScript parsedScript;
 
@@ -91,15 +89,6 @@ class _CodeViewState extends State<CodeView>
     textController = verticalController.addAndGet();
     horizontalController = ScrollController();
 
-    if (widget.initialPosition != null) {
-      final location = widget.initialPosition.location;
-      // Lines are 1-indexed. Scrolling to line 1 required a scroll position of
-      // 0.
-      final lineIndex = location.line - 1;
-      final scrollPosition = lineIndex * CodeView.rowHeight;
-      verticalController.jumpTo(scrollPosition);
-    }
-
     addAutoDisposeListener(
       widget.controller.scriptLocation,
       _handleScriptLocationChanged,
@@ -135,29 +124,18 @@ class _CodeViewState extends State<CodeView>
   }
 
   void _updateScrollPosition({bool animate = true}) {
-    if (widget.controller.scriptLocation.value?.scriptRef?.uri !=
-        scriptRef?.uri) {
+    if (widget.controller.scriptLocation.value?.scriptRef != scriptRef) {
       return;
     }
 
-    if (!verticalController.hasAttachedControllers) {
-      // TODO(devoncarew): I'm uncertain why this occurs.
-      log('LinkedScrollControllerGroup has no attached controllers');
+    final location = widget.controller.scriptLocation.value?.location;
+    if (location?.line == null) {
       return;
     }
 
-    final location = widget.controller.scriptLocation.value?.location;
-    if (location?.line == null) {
-      // Default to scrolling to the top of the script.
-      if (animate) {
-        verticalController.animateTo(
-          0,
-          duration: longDuration,
-          curve: defaultCurve,
-        );
-      } else {
-        verticalController.jumpTo(0);
-      }
+    if (!verticalController.hasAttachedControllers) {
+      // TODO(devoncarew): I'm uncertain why this occurs.
+      log('LinkedScrollControllerGroup has no attached controllers');
       return;
     }
 
@@ -167,11 +145,10 @@ class _CodeViewState extends State<CodeView>
     // TODO(devoncarew): Adjust this so we don't scroll if we're already in the
     // middle third of the screen.
     if (parsedScript.lineCount * CodeView.rowHeight > extent) {
+      // Scroll to the middle of the screen.
       final lineIndex = location.line - 1;
-      final scrollPosition = lineIndex * CodeView.rowHeight -
-          (widget.controller.shouldCenterScrollLocation
-              ? ((extent - CodeView.rowHeight) / 2)
-              : 0);
+      final scrollPosition =
+          lineIndex * CodeView.rowHeight - (extent - CodeView.rowHeight) / 2;
       if (animate) {
         verticalController.animateTo(
           scrollPosition,
@@ -663,7 +640,7 @@ class _LinesState extends State<Lines> with AutoDisposeMixin {
 
         if (isOutOfViewTop || isOutOfViewBottom) {
           // Scroll this search token to the middle of the view.
-          final targetOffset = math.max<double>(
+          final targetOffset = math.max(
             activeSearch.position.line * CodeView.rowHeight - widget.height / 2,
             0.0,
           );

packages/devtools_app/lib/src/debugger/controls.dart

@@ -12,6 +12,7 @@ import '../common_widgets.dart';
 import '../theme.dart';
 import '../ui/label.dart';
 import 'debugger_controller.dart';
+import 'scripts.dart';
 
 class DebuggingControls extends StatefulWidget {
   const DebuggingControls({Key key}) : super(key: key);
@@ -117,14 +118,13 @@ class _DebuggingControlsState extends State<DebuggingControls>
 
   Widget _librariesButton() {
     return ValueListenableBuilder(
-      valueListenable: controller.fileExplorerVisible,
+      valueListenable: controller.librariesVisible,
       builder: (context, visible, _) {
-        const libraryIcon = Icons.insert_chart;
         return RoundedOutlinedBorder(
           child: Container(
             color: visible ? Theme.of(context).highlightColor : null,
             child: DebuggerButton(
-              title: 'File Explorer',
+              title: 'Libraries',
               icon: libraryIcon,
               onPressed: controller.toggleLibrariesVisible,
             ),

packages/devtools_app/lib/src/debugger/debugger_controller.dart

@@ -20,7 +20,6 @@ import '../ui/search.dart';
 import '../utils.dart';
 import '../vm_service_wrapper.dart';
 import 'debugger_model.dart';
-import 'program_explorer_controller.dart';
 import 'syntax_highlighter.dart';
 
 // TODO(devoncarew): Add some delayed resume value notifiers (to be used to
@@ -41,7 +40,6 @@ class DebuggerController extends DisposableController
       _showScriptLocation(ScriptLocation(scriptsHistory.current.value));
     };
     scriptsHistory.current.addListener(_scriptHistoryListener);
-    programExplorerController.initialize(currentScriptRef.value);
 
     if (_service != null) {
       initialize();
@@ -122,8 +120,6 @@ class DebuggerController extends DisposableController
   Map<LibraryRef, Future<Set<String>>>
       libraryMemberAndImportsAutocompleteCache = {};
 
-  final programExplorerController = ProgramExplorerController();
-
   final ScriptCache _scriptCache = ScriptCache();
 
   final ScriptsHistory scriptsHistory = ScriptsHistory();
@@ -165,11 +161,8 @@ class DebuggerController extends DisposableController
   final _showFileOpener = ValueNotifier<bool>(false);
 
   /// Jump to the given ScriptRef and optional SourcePosition.
-  void showScriptLocation(
-    ScriptLocation scriptLocation, {
-    bool centerLocation = true,
-  }) {
-    _showScriptLocation(scriptLocation, centerLocation: centerLocation);
+  void showScriptLocation(ScriptLocation scriptLocation) {
+    _showScriptLocation(scriptLocation);
 
     // Update the scripts history (and make sure we don't react to the
     // subsequent event).
@@ -180,11 +173,7 @@ class DebuggerController extends DisposableController
 
   /// Show the given script location (without updating the script navigation
   /// history).
-  void _showScriptLocation(
-    ScriptLocation scriptLocation, {
-    bool centerLocation = true,
-  }) {
-    _shouldCenterScrollLocation = centerLocation;
+  void _showScriptLocation(ScriptLocation scriptLocation) {
     _currentScriptRef.value = scriptLocation?.scriptRef;
 
     _parseCurrentScript();
@@ -193,8 +182,6 @@ class DebuggerController extends DisposableController
     // set to null to ensure that happens.
     _scriptLocation.value = null;
     _scriptLocation.value = scriptLocation;
-
-    programExplorerController.selectScriptNode(scriptLocation.scriptRef);
   }
 
   Future<Script> getScriptForRef(ScriptRef ref) async {
@@ -295,9 +282,6 @@ class DebuggerController extends DisposableController
   /// Return the sorted list of ScriptRefs active in the current isolate.
   ValueListenable<List<ScriptRef>> get sortedScripts => _sortedScripts;
 
-  bool get shouldCenterScrollLocation => _shouldCenterScrollLocation;
-  bool _shouldCenterScrollLocation = true;
-
   final _breakpoints = ValueNotifier<List<Breakpoint>>([]);
 
   ValueListenable<List<Breakpoint>> get breakpoints => _breakpoints;
@@ -320,7 +304,7 @@ class DebuggerController extends DisposableController
 
   final _librariesVisible = ValueNotifier(false);
 
-  ValueListenable<bool> get fileExplorerVisible => _librariesVisible;
+  ValueListenable<bool> get librariesVisible => _librariesVisible;
 
   /// Make the 'Libraries' view on the right-hand side of the screen visible or
   /// hidden.
@@ -624,6 +608,7 @@ class DebuggerController extends DisposableController
 
   void _handleIsolateEvent(Event event) {
     if (event.isolate.id != isolateRef?.id) return;
+
     switch (event.kind) {
       case EventKind.kIsolateReload:
         _updateAfterIsolateReload(event);
@@ -878,12 +863,25 @@ class DebuggerController extends DisposableController
     _populateScriptAndShowLocation(mainScriptRef);
   }
 
+  SourcePosition calculatePosition(Script script, int tokenPos) {
+    final List<List<int>> table = script.tokenPosTable;
+    if (table == null) {
+      return null;
+    }
+
+    return SourcePosition(
+      line: script.getLineNumberFromTokenPos(tokenPos),
+      column: script.getColumnNumberFromTokenPos(tokenPos),
+      tokenPos: tokenPos,
+    );
+  }
+
   Future<BreakpointAndSourcePosition> _createBreakpointWithLocation(
       Breakpoint breakpoint) async {
     if (breakpoint.resolved) {
       final bp = BreakpointAndSourcePosition.create(breakpoint);
       return getScript(bp.scriptRef).then((Script script) {
-        final pos = SourcePosition.calculatePosition(script, bp.tokenPos);
+        final pos = calculatePosition(script, bp.tokenPos);
         return BreakpointAndSourcePosition.create(breakpoint, pos);
       });
     } else {
@@ -900,8 +898,7 @@ class DebuggerController extends DisposableController
     }
 
     final script = await getScript(location.script);
-    final position =
-        SourcePosition.calculatePosition(script, location.tokenPos);
+    final position = calculatePosition(script, location.tokenPos);
     return StackFrameAndSourcePosition(frame, position: position);
   }
 
@@ -1006,7 +1003,7 @@ class DebuggerController extends DisposableController
     for (SourceReportRange range in report.ranges) {
       if (range.possibleBreakpoints != null) {
         for (int tokenPos in range.possibleBreakpoints) {
-          positions.add(SourcePosition.calculatePosition(script, tokenPos));
+          positions.add(calculatePosition(script, tokenPos));
         }
       }
     }

packages/devtools_app/lib/src/debugger/debugger_model.dart

@@ -94,27 +94,10 @@ class ScriptLocation {
   String toString() => '${scriptRef.uri} $location';
 }
 
+/// A line, column, and an optional tokenPos.
 class SourcePosition {
-  const SourcePosition({
-    @required this.line,
-    @required this.column,
-    this.file,
-    this.tokenPos,
-  });
-
-  factory SourcePosition.calculatePosition(Script script, int tokenPos) {
-    if (script.tokenPosTable == null) {
-      return null;
-    }
-
-    return SourcePosition(
-      line: script.getLineNumberFromTokenPos(tokenPos),
-      column: script.getColumnNumberFromTokenPos(tokenPos),
-      tokenPos: tokenPos,
-    );
-  }
+  SourcePosition({@required this.line, @required this.column, this.tokenPos});
 
-  final String file;
   final int line;
   final int column;
   final int tokenPos;
@@ -530,9 +513,7 @@ List<Variable> _createVariablesForAssociations(
       isolateRef: isolateRef,
     );
     variables.add(
-      Variable.text('[Entry $i]')
-        ..addChild(key)
-        ..addChild(value),
+      Variable.text('[Entry $i]')..addChild(key)..addChild(value),
     );
   }
   return variables;

packages/devtools_app/lib/src/debugger/debugger_screen.dart

@@ -26,7 +26,7 @@ import 'controls.dart';
 import 'debugger_controller.dart';
 import 'debugger_model.dart';
 import 'key_sets.dart';
-import 'program_explorer.dart';
+import 'scripts.dart';
 import 'variables.dart';
 
 class DebuggerScreen extends Screen {
@@ -102,10 +102,7 @@ class DebuggerScreenBodyState extends State<DebuggerScreenBody>
 
   void _onLocationSelected(ScriptLocation location) {
     if (location != null) {
-      controller.showScriptLocation(
-        location,
-        centerLocation: location.location == null,
-      );
+      controller.showScriptLocation(location);
     }
   }
 
@@ -140,7 +137,7 @@ class DebuggerScreenBodyState extends State<DebuggerScreenBody>
     );
 
     final codeArea = ValueListenableBuilder(
-      valueListenable: controller.fileExplorerVisible,
+      valueListenable: controller.librariesVisible,
       builder: (context, visible, _) {
         if (visible) {
           // TODO(devoncarew): Animate this opening and closing.
@@ -149,10 +146,17 @@ class DebuggerScreenBodyState extends State<DebuggerScreenBody>
             initialFractions: const [0.70, 0.30],
             children: [
               codeView,
-              ProgramExplorer(
-                debugController: controller,
-                onSelected: _onLocationSelected,
-              )
+              ValueListenableBuilder(
+                valueListenable: controller.sortedScripts,
+                builder: (context, scripts, _) {
+                  return ScriptPicker(
+                    key: DebuggerScreenBody.scriptViewKey,
+                    controller: controller,
+                    scripts: scripts,
+                    onSelected: _onLocationSelected,
+                  );
+                },
+              ),
             ],
           );
         } else {
@@ -389,7 +393,7 @@ class _DebuggerStatusState extends State<DebuggerStatus> with AutoDisposeMixin {
     final fileName = ' at ' + frame.location.script.uri.split('/').last;
     final script = await widget.controller.getScript(frame.location.script);
     final pos =
-        SourcePosition.calculatePosition(script, frame.location.tokenPos);
+        widget.controller.calculatePosition(script, frame.location.tokenPos);
 
     return 'paused$reason$fileName $pos';
   }