Fix input and output printing for REPL

Signed-off-by: ampan98 <[email protected]>
team-stack-underflow · Jun 29, 2020 · caf3795 · caf3795
1 parent a25b832
commit caf3795
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/assets/select_background.png b/assets/select_background.png
diff --git a/lib/main.dart b/lib/main.dart
@@ -311,8 +311,8 @@ class ReplBody extends StatefulWidget {
 class _ReplBodyState extends State<ReplBody> {
   final TextEditingController _controller = TextEditingController();
   FocusNode replNode = FocusNode();
-  var prevSubmitList = [];
   var outputList = [];
+  var containerId = 'none';
 
   @override
   void initState() {
@@ -347,7 +347,17 @@ class _ReplBodyState extends State<ReplBody> {
                 stream: widget.channel.stream,
                 builder: (context, snapshot) {
                   if (snapshot.hasData) {
-                    outputList.add(snapshot.data);
+                    Map<String, dynamic> outputData = jsonDecode(snapshot.data);
+                    if (outputData["containerId"] != null) {
+                      containerId = outputData["containerId"];
+                    }
+                    if (outputData["output"] != null) {
+                      if (outputData["output"].substring(0,4) == '>>> ') {
+                        outputList.add(outputData["output"].substring(4));
+                      } else {
+                        outputList.add(outputData["output"]);
+                      }
+                    }
                   }
                   debugPrint('$outputList');
                   if (!snapshot.hasData) {
@@ -438,16 +448,15 @@ class _ReplBodyState extends State<ReplBody> {
   void _sendSubmit() {
     if (_controller.text.isNotEmpty) {
       //widget.channel.sink.add(_controller.text);
+      outputList.add('>>> ' + _controller.text);
       widget.channel.sink.add(
         json.encode(
           {"action": "input",
             "input": _controller.text,
           }
         )
       );
-      prevSubmitList.add(_controller.text);
       _controller.clear();
-      debugPrint('$prevSubmitList');
     }
   }
 
@@ -465,8 +474,8 @@ class _ReplBodyState extends State<ReplBody> {
 class CompilerPage extends StatelessWidget {
   CompilerPage({Key key, this.name}) : super(key: key);
   final String name;
-  final String channelName = 'wss://echo.websocket.org'; // For testing websocket
-  //final String channelName = 'wss://s4tdw93cwd.execute-api.us-east-1.amazonaws.com/default/';
+  //final String channelName = 'wss://echo.websocket.org'; // For testing websocket
+  final String channelName = 'wss://s4tdw93cwd.execute-api.us-east-1.amazonaws.com/default/';
 
   @override
   Widget build(BuildContext context) {
@@ -525,8 +534,8 @@ class _CompilerBodyState extends State<CompilerBody> {
   FocusNode replNode = FocusNode();
   bool _firstRun = true;
   bool _visible = false;
-  var prevSubmitList = [];
   var outputList = [];
+  var containerId = 'none';
 
   @override
   void initState() {
@@ -635,7 +644,14 @@ class _CompilerBodyState extends State<CompilerBody> {
                       stream: widget.channel.stream,
                       builder: (context, snapshot) {
                         if (snapshot.hasData) {
-                          outputList.add(snapshot.data);
+                          Map<String, dynamic> outputData = jsonDecode(snapshot.data);
+                          if (outputData["containerId"] != null) {
+                            containerId = outputData["containerId"];
+                          }
+                          if (outputData["output"] != null) {
+                            outputList.add(outputData["output"]);
+                          }
+                          //outputList.add(snapshot.data);
                         }
                         debugPrint('$outputList');
                         if (!snapshot.hasData) {
@@ -743,8 +759,11 @@ class _CompilerBodyState extends State<CompilerBody> {
       else {
         widget.channel.sink.add(
             json.encode(
-                {"action": "input",
-                  "input": _topController.text,
+                {
+                  "action": "launch",
+                  "lang": widget.name.toLowerCase(),
+                  "mode": "compile",
+                  "prog": _topController.text,
                 }
             )
         );
@@ -756,16 +775,15 @@ class _CompilerBodyState extends State<CompilerBody> {
   void _sendSubmit() {
     if (_bottomController.text.isNotEmpty) {
       //widget.channel.sink.add(_controller.text);
+      outputList.add(_bottomController.text);
       widget.channel.sink.add(
           json.encode(
               {"action": "input",
                 "input": _bottomController.text,
               }
           )
       );
-      prevSubmitList.add(_bottomController.text);
       _bottomController.clear();
-      debugPrint('$prevSubmitList');
     }
   }