feat(editor): persist keybinding preference between sessions

dart-lang · Jan 17, 2025 · 12b5b7c · 12b5b7c
1 parent 4b1ab01
commit 12b5b7c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 0 deletions.
diff --git a/pkgs/dartpad_ui/lib/editor/editor.dart b/pkgs/dartpad_ui/lib/editor/editor.dart
@@ -442,8 +442,10 @@ class _EditorWidgetState extends State<EditorWidget> implements EditorService {
 
     if (enabled) {
       cm.setKeymap('vim');
+      LocalStorage.instance.saveUserKeybinding('vim');
     } else {
       cm.setKeymap('default');
+      LocalStorage.instance.saveUserKeybinding('default');
     }
   }
 }

diff --git a/pkgs/dartpad_ui/lib/local_storage.dart b/pkgs/dartpad_ui/lib/local_storage.dart
@@ -10,4 +10,7 @@ abstract class LocalStorage {
 
   void saveUserCode(String code);
   String? getUserCode();
+
+  void saveUserKeybinding(String keybinding);
+  String? getUserKeybinding();
 }
diff --git a/pkgs/dartpad_ui/lib/local_storage/stub.dart b/pkgs/dartpad_ui/lib/local_storage/stub.dart
@@ -7,10 +7,17 @@ import '../utils.dart';
 
 class LocalStorageImpl extends LocalStorage {
   String? _code;
+  String? _keyBinding;
 
   @override
   void saveUserCode(String code) => _code = code;
 
+  @override
+  void saveUserKeybinding(String keybinding) => _keyBinding = keybinding;
+
   @override
   String? getUserCode() => _code?.nullIfEmpty;
+
+  @override
+  String? getUserKeybinding() => _keyBinding?.nullIfEmpty;
 }
diff --git a/pkgs/dartpad_ui/lib/local_storage/web.dart b/pkgs/dartpad_ui/lib/local_storage/web.dart
@@ -8,6 +8,7 @@ import '../local_storage.dart';
 import '../utils.dart';
 
 const _userInputKey = 'user_';
+const _userKeybindingKey = 'user_keybinding_';
 
 class LocalStorageImpl extends LocalStorage {
   @override
@@ -17,4 +18,12 @@ class LocalStorageImpl extends LocalStorage {
   @override
   String? getUserCode() =>
       web.window.localStorage.getItem(_userInputKey)?.nullIfEmpty;
+
+  @override
+  void saveUserKeybinding(String keybinding) =>
+      web.window.localStorage.setItem(_userKeybindingKey, keybinding);
+
+  @override
+  String? getUserKeybinding() =>
+      web.window.localStorage.getItem(_userKeybindingKey)?.nullIfEmpty;
 }
diff --git a/pkgs/dartpad_ui/lib/main.dart b/pkgs/dartpad_ui/lib/main.dart
@@ -279,6 +279,7 @@ class _DartPadMainPageState extends State<DartPadMainPage>
       sampleId: widget.builtinSampleId,
       flutterSampleId: widget.flutterSampleId,
       channel: widget.initialChannel,
+      keybinding: LocalStorage.instance.getUserKeybinding(),
       getFallback: () =>
           LocalStorage.instance.getUserCode() ?? Samples.defaultSnippet(),
     )

diff --git a/pkgs/dartpad_ui/lib/model.dart b/pkgs/dartpad_ui/lib/model.dart
@@ -207,6 +207,7 @@ class AppServices {
     String? sampleId,
     String? flutterSampleId,
     String? channel,
+    String? keybinding,
     required String Function() getFallback,
   }) async {
     // Delay a bit for codemirror to initialize.
@@ -294,6 +295,10 @@ class AppServices {
       return;
     }
 
+    if (keybinding != null && keybinding == 'vim') {
+      appModel.vimKeymapsEnabled.value = true;
+    }
+
     // Neither gistId nor flutterSampleId were passed in.
     appModel.sourceCodeController.text = getFallback();
     appModel.appReady.value = true;