Use callback to get fallback snippet

dart-lang · Dec 13, 2024 · df2f722 · df2f722
1 parent 9413e86
commit df2f722
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/pkgs/dartpad_ui/lib/main.dart b/pkgs/dartpad_ui/lib/main.dart
@@ -284,8 +284,8 @@ class _DartPadMainPageState extends State<DartPadMainPage>
       sampleId: widget.builtinSampleId,
       flutterSampleId: widget.flutterSampleId,
       channel: widget.initialChannel,
-      fallbackSnippet:
-          LocalStorage.instance.getUserCode() ?? Samples.defaultSnippet(),
+      getFallback: () => LocalStorage.instance.getUserCode()
+        ?? Samples.defaultSnippet(),
     );
     // Start listening for inject code messages.
     handleEmbedMessage(appServices, runOnInject: widget.runOnLoad);

diff --git a/pkgs/dartpad_ui/lib/model.dart b/pkgs/dartpad_ui/lib/model.dart
@@ -205,7 +205,7 @@ class AppServices {
     String? sampleId,
     String? flutterSampleId,
     String? channel,
-    required String fallbackSnippet,
+    required String Function() getFallback,
   }) async {
     // Delay a bit for codemirror to initialize.
     await Future<void>.delayed(const Duration(milliseconds: 1));
@@ -239,7 +239,7 @@ class AppServices {
 
         appModel.appendLineToConsole('Error loading sample: $e');
 
-        appModel.sourceCodeController.text = fallbackSnippet;
+        appModel.sourceCodeController.text = getFallback();
         appModel.appReady.value = true;
       } finally {
         loader.dispose();
@@ -263,7 +263,7 @@ class AppServices {
         final source = gist.mainDartSource;
         if (source == null) {
           appModel.editorStatus.showToast('main.dart not found');
-          appModel.sourceCodeController.text = fallbackSnippet;
+          appModel.sourceCodeController.text = getFallback();
         } else {
           appModel.sourceCodeController.text = source;
 
@@ -283,7 +283,7 @@ class AppServices {
 
         appModel.appendLineToConsole('Error loading gist: $e');
 
-        appModel.sourceCodeController.text = fallbackSnippet;
+        appModel.sourceCodeController.text = getFallback();
         appModel.appReady.value = true;
       } finally {
         gistLoader.dispose();
@@ -293,7 +293,7 @@ class AppServices {
     }
 
     // Neither gistId nor flutterSampleId were passed in.
-    appModel.sourceCodeController.text = fallbackSnippet;
+    appModel.sourceCodeController.text = getFallback();
     appModel.appReady.value = true;
   }
 

diff --git a/pkgs/dartpad_ui/test/autosave_test.dart b/pkgs/dartpad_ui/test/autosave_test.dart
@@ -10,7 +10,9 @@ import 'package:dartpad_ui/utils.dart';
 import 'package:test/test.dart';
 
 String getFallback() =>
-    LocalStorage.instance.getUserCode() ?? Samples.defaultSnippet();
+  LocalStorage.instance.getUserCode() ?? Samples.defaultSnippet();
+
+Never throwingFallback() => throw StateError('DartPad tried to load the fallback');
 
 void main() {
   const channel = Channel.stable;
@@ -32,7 +34,7 @@ void main() {
       expect(LocalStorage.instance.getUserCode(), isNull);
 
       await services.performInitialLoad(
-        fallbackSnippet: getFallback(),
+        getFallback: getFallback,
       );
       expect(model.sourceCodeController.text, equals(Samples.defaultSnippet()));
     });
@@ -45,7 +47,7 @@ void main() {
       expect(LocalStorage.instance.getUserCode(), equals(sample));
 
       await services.performInitialLoad(
-        fallbackSnippet: getFallback(),
+        getFallback: getFallback,
       );
       expect(model.sourceCodeController.text, equals(sample));
     });
@@ -63,7 +65,7 @@ void main() {
         // From gists_tests.dart
         const gistId = 'd3bd83918d21b6d5f778bdc69c3d36d6';
         await services.performInitialLoad(
-          fallbackSnippet: getFallback(),
+          getFallback: throwingFallback,
           gistId: gistId,
         );
         expect(model.sourceCodeController.text, isNot(equals(sample)));
@@ -77,7 +79,7 @@ void main() {
         // From samples_test.dart
         const sampleId = 'dart';
         await services.performInitialLoad(
-          fallbackSnippet: getFallback(),
+          getFallback: throwingFallback,
           sampleId: sampleId,
         );
         expect(model.sourceCodeController.text, isNot(equals(sample)));