Enable the file opener (#3350)

flutter · Sep 10, 2021 · 4aa870b · 4aa870b
1 parent abb51c4
commit 4aa870b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/packages/devtools_app/lib/src/debugger/codeview.dart b/packages/devtools_app/lib/src/debugger/codeview.dart
@@ -30,10 +30,9 @@ import 'debugger_controller.dart';
 import 'debugger_model.dart';
 import 'file_search.dart';
 import 'hover.dart';
+import 'key_sets.dart';
 import 'variables.dart';
 
-const openFileDialogEnabled = false;
-
 final debuggerCodeViewSearchKey =
     GlobalKey(debugLabel: 'DebuggerCodeViewSearchKey');
 
@@ -172,7 +171,7 @@ class _CodeViewState extends State<CodeView>
     if (scriptRef == null) {
       return Center(
         child: Text(
-          'No script selected',
+          'Open a file: $openFileKeySetDescription',
           style: theme.textTheme.subtitle1,
         ),
       );
@@ -1059,7 +1058,7 @@ class ScriptPopupMenuOption {
 final defaultScriptPopupMenuOptions = [
   copyScriptNameOption,
   goToLineOption,
-  if (openFileDialogEnabled) openFileOption,
+  openFileOption,
 ];
 
 final copyScriptNameOption = ScriptPopupMenuOption(
@@ -1077,23 +1076,21 @@ void showGoToLineDialog(BuildContext context, DebuggerController controller) {
   );
 }
 
-const goToLineOption = ScriptPopupMenuOption(
-  label: 'Go to line number (⌘ G)',
+final goToLineOption = ScriptPopupMenuOption(
+  label: 'Go to line number ($goToLineNumberKeySetDescription)',
   icon: Icons.list,
   onSelected: showGoToLineDialog,
 );
 
 void showOpenFileDialog(BuildContext context, DebuggerController controller) {
-  if (openFileDialogEnabled) {
-    showDialog(
-      context: context,
-      builder: (context) => OpenFileDialog(controller),
-    );
-  }
+  showDialog(
+    context: context,
+    builder: (context) => OpenFileDialog(controller),
+  );
 }
 
-const openFileOption = ScriptPopupMenuOption(
-  label: 'Open file (⌘ P)',
+final openFileOption = ScriptPopupMenuOption(
+  label: 'Open file ($openFileKeySetDescription)',
   icon: Icons.folder_open,
   onSelected: showOpenFileDialog,
 );

diff --git a/packages/devtools_app/lib/src/debugger/key_sets.dart b/packages/devtools_app/lib/src/debugger/key_sets.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 import '../config_specific/host_platform/host_platform.dart';
+import '../utils.dart';
 
 final LogicalKeySet goToLineNumberKeySet = LogicalKeySet(
   HostPlatform.instance.isMacOS
@@ -10,6 +11,9 @@ final LogicalKeySet goToLineNumberKeySet = LogicalKeySet(
   LogicalKeyboardKey.keyG,
 );
 
+final String goToLineNumberKeySetDescription =
+    goToLineNumberKeySet.describeKeys(isMacOS: HostPlatform.instance.isMacOS);
+
 final LogicalKeySet searchInFileKeySet = LogicalKeySet(
   HostPlatform.instance.isMacOS
       ? LogicalKeyboardKey.meta
@@ -27,3 +31,6 @@ final LogicalKeySet openFileKeySet = LogicalKeySet(
       : LogicalKeyboardKey.control,
   LogicalKeyboardKey.keyP,
 );
+
+final String openFileKeySetDescription =
+    openFileKeySet.describeKeys(isMacOS: HostPlatform.instance.isMacOS);