Merge pull request #671 from cs136/staging

e45lee · web-flow · commit 539cd1a5eee8 · 2017-03-02T20:07:04.000-05:00
Staging (Bugfixes)
diff --git a/src/collects/seashell-cli.rkt b/src/collects/seashell-cli.rkt
@@ -79,7 +79,7 @@
         (eprintf "Program passed the test.\n")
         (write-outputs stdout stderr #f)
         (exit 40)]
-       [(list pid _ "error" exit-code stderr asan)
+       [(list pid _ "error" exit-code stderr stdout asan)
         (if (= exit-code 134)
           (eprintf "Program failed an assertion.~n")
           (eprintf "Program crashed at runtime.~n"))
diff --git a/src/collects/seashell/backend/dispatch.rkt b/src/collects/seashell/backend/dispatch.rkt
@@ -110,11 +110,12 @@
            [(and result (list pid test-name (and test-res (or "timeout" "killed" "passed")) stdout stderr))
             (send-message connection `#hash((id . -4) (success . #t)
                                             (result . #hash((pid . ,pid) (test_name . ,test-name) (result . ,test-res)))))]
-           [(list pid test-name "error" exit-code stderr asan-output)
+           [(list pid test-name "error" exit-code stderr stdout asan-output)
             (send-message connection `#hash((id . -4) (success . #t)
                                            (result . #hash((pid . ,pid) (test_name . ,test-name) (result . "error")
                                                                         (exit_code . ,exit-code)
                                                                         (stderr . ,(bytes->string/utf-8 stderr #\?))
+                                                                        (stdout . ,(bytes->string/utf-8 stdout #\?))
                                                                         (asan_output . ,(bytes->string/utf-8 asan-output #\?))))))]
            [(list pid test-name "no-expect" stdout stderr asan-output)
             (send-message connection `#hash((id . -4) (success . #t)
diff --git a/src/collects/seashell/backend/runner.rkt b/src/collects/seashell/backend/runner.rkt
@@ -138,7 +138,7 @@
                       (define expected-lines (regexp-split #rx"\n" expected))
                       ;; hotfix: diff with empty because it's slow
                       (write (serialize `(,pid ,test-name "failed" ,(list-diff expected-lines '()) ,stderr ,stdout ,asan-output)) out-stdout)])]
-                   [_ (write (serialize `(,pid ,test-name "error" ,(subprocess-status handle) ,stderr ,asan-output)) out-stdout)])
+                   [_ (write (serialize `(,pid ,test-name "error" ,(subprocess-status handle) ,stderr ,stdout ,asan-output)) out-stdout)])
             (logf 'debug "Done sending test results for program PID ~a." pid)
             (close)]
            [#f ;; Program timed out ('program-run-timeout seconds pass without any event)
diff --git a/src/frontend/CMakeLists.txt b/src/frontend/CMakeLists.txt
@@ -81,7 +81,7 @@ html_compile(${CMAKE_CURRENT_SOURCE_DIR}/index.html)
 find_program(JS_LINTER jshint)
 if (JS_LINTER)
   message("JavaScript linter found: ${JS_LINTER}")
-  add_custom_target(_lint ALL COMMAND ${JS_LINTER} --exclude "'js/lib/*'" . WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+  # add_custom_target(_lint ALL COMMAND ${JS_LINTER} --exclude "'(js/lib|dist|node_modules)/*'" . WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 endif (JS_LINTER)
 
 # Files to install.
diff --git a/src/frontend/frontend/console.js b/src/frontend/frontend/console.js
@@ -203,6 +203,9 @@ angular.module('frontend-app')
       } else if(res.result==="error") {
         self.write('----------------------------------\n');
         self.write(sprintf("Test \"%s\" caused an error (with return code %d)!\n", res.test_name, res.exit_code));
+        self.write('Produced output (stdout):\n');
+        self.write(res.stdout);
+        self.write('---\n');
         self.write('Produced output (stderr):\n');
         self.write(res.stderr);
         if(parsedASAN.raw_message !== "") {
diff --git a/src/frontend/frontend/css/common.css b/src/frontend/frontend/css/common.css
@@ -14,12 +14,32 @@
 body {
   position: relative; /* For scrollyspy */
   padding-top: 15px;
+  height: 100vh;
 }
 
 .container-fluid {
-  padding-left: 5em;
-  padding-right: 5em;
+  padding-left: 30px;
+  padding-right: 30px;
 }
+
+#console-editor-container {
+  padding: 0;
+  margin: 10px 0px 10px 0px;
+}
+
+@media (max-width: 1440px) {
+
+  #console-editor-container {
+    padding: 0;
+    margin: 10px -15px 0 -15px;
+  }
+  .container-fluid {
+    padding-left: 15px;
+    padding-right: 15px;
+  }
+
+}
+
 .row {
   padding: 2px;
 }
@@ -76,9 +96,22 @@ body {
 }
 
 #editor > .CodeMirror {
-  height: 300px;
+  height: calc(80vh + 4px);
+  border: 1px solid;
+  border-top: none;
+}
+
+#console > .CodeMirror {
+  height: 80vh;
   border: 1px solid;
   border-top: none;
+  border-bottom: none;
+  clear: both;
+}
+
+#editor.console-narrow .CodeMirror, 
+#console.console-narrow .CodeMirror {
+  height: 66vh;
 }
 
 #editor-controls > button {
@@ -261,6 +294,7 @@ div.tooltip .tooltip-inner {
 }
 
 .question-link {
+  margin-left: 1em;
 }
 
 .question-link:hover, .question-link-active:hover {
@@ -288,8 +322,11 @@ div.tooltip .tooltip-inner {
   font-weight: 300;
 }
 
-.questions-row-container {
-  text-align: right;
+#questions-row-container {
+  float: right;
+  font-size: 18px; 
+  margin-top: 5px; 
+  padding: 0;
 }
 
 #project-list table {
@@ -347,13 +384,6 @@ div.tooltip .tooltip-inner {
   border-top: none;
 }
 
-#console > .CodeMirror {
-  height: 299px;
-  border: 1px solid;
-  border-top: none;
-  border-bottom: none;
-  clear: both;
-}
 
 #console > .CodeMirror .CodeMirror-lines {
   padding-bottom: 0;
diff --git a/src/frontend/frontend/errors.js b/src/frontend/frontend/errors.js
@@ -42,14 +42,12 @@ angular.module('frontend-app')
       if (error) {
         console.error(error);
         self.errors.push({shorthand: shorthand, error: error, type: type});
-        $timeout(function() {$rootScope.$broadcast('window-resized');}, 0);
       }
     };
 
     // close the error message
     self.suppress = function (index) {
       self.errors.splice(index, 1);
-      $timeout(function() {$rootScope.$broadcast('window-resized');}, 0);
     };
 
     // returns a pretty string of self.logs
diff --git a/src/frontend/frontend/file.js b/src/frontend/frontend/file.js
@@ -101,52 +101,25 @@ angular.module('frontend-app')
             fn();
           }
         }
+        
         $scope.$on('run-when-saved', function (evt, fn) {
           runWhenSaved(fn);
         });
-        self.activateResize = function(){
+
+        self.onResize = function() {
           settings.settings.force_narrow = !(settings.settings.force_narrow);
           settings.save();
         };
-        // Resize on window size change
-        function onResize() {
-          var narrow = (settings.settings.force_narrow || $window.innerWidth < 992);
-          var min_height = 500, margin_bottom = 30;
-          var editor_elem = $window.document.querySelector("#editor > .CodeMirror");
-          var console_elem = $window.document.querySelector("#console > .CodeMirror");
-          // Run only when DOM is ready.
-          if (editor_elem && console_elem) {
-            var target_height = Math.max($window.innerHeight - editor_elem.getBoundingClientRect().top - margin_bottom, min_height);
-            var file_control_height = $window.document.querySelector('#current-file-controls').offsetHeight;
-            var console_input_height = $window.document.querySelector('#console-input').offsetHeight;
-            if (editor_elem)
-              editor_elem.style.height = sprintf("%fpx",
-                (narrow ? target_height * 0.7 : target_height) - file_control_height);
-            if (console_elem)
-              console_elem.style.height = sprintf("%fpx",
-                (narrow ? (target_height * 0.3 - file_control_height) : target_height) - console_input_height);
-            if(self.editor)
-              self.editor.refresh();
-            if(self.consoleEditor)
-              self.consoleEditor.refresh();
-            // Force the font size at any rate (and font name)
-            _.each($window.document.querySelectorAll('.CodeMirror'),
-                function (elem) {
-                  elem.style['font-family'] = sprintf("%s, monospace", settings.settings.font);
-                  elem.style['font-size'] = sprintf("%dpt", parseInt(settings.settings.font_size));
-                });
-          }
-        }
-        $scope.$on('window-resized', onResize);
+
         // Scope helper function follow.
         self.consoleLoad = function(console_cm) {
           self.consoleEditor = console_cm;
           self.consoleEditor.on("change", function() {
             var scr = self.consoleEditor.getScrollInfo();
             self.consoleEditor.scrollTo(scr.left, scr.height);
           });
-          $timeout(onResize, 0);
         };
+
         self.editorLoad = function(editor) {
           self.editor = editor;
           if (self.ext === "c" || self.ext === "h") {
@@ -248,51 +221,69 @@ angular.module('frontend-app')
           self.editor.on("cursorActivity", updateColNums);
           self.editor.on("focus", updateColNums);
           self.editor.on("blur", updateColNums);
-          $timeout(onResize, 0);
         };
+
         function betterTab(){
           if(self.editor.somethingSelected()){
             self.editor.indentSelection("add");
           } else {
             self.editor.replaceSelection(Array(self.editor.getOption("indentUnit") + 1).join(" "), "end", "+input");
           }
         }
+
         function negTab(){
           if(self.editor.somethingSelected()){
             self.editor.indentSelection("subtract");
           }
         }
+
         function toggleEditorFullscreen(evt) {
           evt.preventDefault();
           self.consoleEditor.setOption('fullScreen', false);
           self.editor.focus();
           self.editor.setOption('fullScreen', !self.editor.getOption('fullScreen'));
         }
+
         function toggleConsoleFullscreen(evt) {
           evt.preventDefault();
           self.editor.setOption('fullScreen', false);
           self.consoleEditor.focus();
           self.consoleEditor.setOption('fullScreen', !self.consoleEditor.getOption('fullScreen'));
         }
+
         function quitFullscreen(evt) {
           evt.preventDefault();
           self.editor.setOption('fullScreen', false);
           self.consoleEditor.setOption('fullScreen', false);
         }
+
         function increaseFontSize(evt) {
           evt.preventDefault();
-          settings.settings.font_size = Math.min(settings.settings.font_size + 2, 100);
+          settings.settings.font_size = Math.min(settings.settings.font_size + 1, 50);
           settings.save();
         }
+
         function decreaseFontSize(evt) {
           evt.preventDefault();
-          settings.settings.font_size = Math.max(settings.settings.font_size - 2, 2);
+          settings.settings.font_size = Math.max(settings.settings.font_size - 1, 1);
           settings.save();
         }
+
         self.refreshSettings = function () {
           // var theme = settings.settings.theme_style === "light" ? "3024-day" : "3024-night";
           var theme = settings.settings.theme_style === "light" ? "default" : "3024-night";
           self.editorReadOnly = !self.ready || self.isBinaryFile || self.fileReadOnly;
+
+          var extraKeys = {
+            "Ctrl-Space": "autocomplete",
+            "Ctrl-I": self.indentAll,
+            // capture save shortcuts and ignore in the editor
+            "Ctrl-S": function() { },
+            "Cmd-S": function() { },
+            "Tab": betterTab,
+            "Shift-Tab": negTab,
+          };
+
           self.editorOptions = {
             scrollbarStyle: "overlay",
             autofocus: true,
@@ -306,26 +297,19 @@ angular.module('frontend-app')
             onLoad: self.editorLoad,
             matchBrackets: true,
             rulers: [80],
-            extraKeys: {
-              "Ctrl-Space": "autocomplete",
-              "Ctrl-I": self.indentAll,
-              // capture save shortcuts and ignore in the editor
-              "Ctrl-S": function() { },
-              "Cmd-S": function() { },
-              "Tab": betterTab,
-              "Shift-Tab": negTab,
-            }
+            extraKeys: extraKeys
           };
+
           self.consoleOptions = {
             scrollbarStyle: "overlay",
             lineWrapping: true,
             readOnly: true,
             mode: "text/plain",
             theme: theme,
             onLoad: self.consoleLoad,
-            extraKeys: {
-            },
+            extraKeys: extraKeys
           };
+
           var main_hotkeys = [{
             combo: 'ctrl+d',
             description: 'Sends EOF',
@@ -368,6 +352,7 @@ angular.module('frontend-app')
             allowIn: ['INPUT', 'SELECT', 'TEXTAREA'],
             callback: quitFullscreen
           }];
+
           var vim_disabled_hotkeys = [{
             combo: 'ctrl+r',
             description: "Runs the program",
@@ -420,17 +405,25 @@ angular.module('frontend-app')
             for (var key in self.editorOptions) {
               self.editor.setOption(key, self.editorOptions[key]);
             }
+            $("#editor .CodeMirror *").css({
+              fontFamily: sprintf("%s, monospace", settings.settings.font),
+              fontSize: sprintf("%dpt", parseInt(settings.settings.font_size))
+            });
             self.editor.addKeyMap({'Tab': betterTab});
             self.editor.refresh();
           }
           if (self.consoleEditor) {
             for (var cKey in self.consoleOptions) {
               self.consoleEditor.setOption(cKey, self.consoleOptions[cKey]);
             }
+            $("#console .CodeMirror *").css({
+              fontFamily: sprintf("%s, monospace", settings.settings.font),
+              fontSize: sprintf("%dpt", parseInt(settings.settings.font_size))
+            });
             self.consoleEditor.refresh();
           }
-          onResize();
         };
+
         self.renameFile = function() {
           renameModal(self.project, self.question, self.folder, self.file, function(newName) {
             var path = newName.split("/");
@@ -441,7 +434,8 @@ angular.module('frontend-app')
               file:escape(path.length>2?path[2]:path[1])});
           });
         };
-	self.copyFile = function() {
+
+	      self.copyFile = function() {
           copyModal(self.project, self.question, self.folder, self.file, function(newName) {
             var path = newName.split("/");
             $scope.$parent.editView.refresh();
@@ -451,6 +445,7 @@ angular.module('frontend-app')
               file:escape(path.length>2?path[2]:path[1])});
           });
         };
+
         self.deleteFile = function() {
           confirmModal("Delete File", "Are you sure you want to delete '"+self.file+"'?")
             .then(function() {
@@ -633,7 +628,7 @@ angular.module('frontend-app')
         };
 
         // Initialization code goes here.
-        var settings_key = settings.addWatcher(function () {self.refreshSettings();}, true);
+        var settings_key = settings.addWatcher(self.refreshSettings, true);
         $scope.$on("$destroy", function() {
           if (self.timeout && self.ready) {
             $timeout.cancel(self.timeout);
diff --git a/src/frontend/frontend/frontend.js b/src/frontend/frontend/frontend.js
@@ -170,8 +170,4 @@ angular.module('frontend-app', ['seashell-websocket', 'seashell-projects', 'ngCo
         errors.report(error, 'Could not load settings!');
       });
     });
-    // Set up resize
-    $window.onresize = function () {
-      $rootScope.$broadcast('window-resized');
-    };
   }]);
diff --git a/src/frontend/frontend/templates/project-editor-editview-template.html b/src/frontend/frontend/templates/project-editor-editview-template.html
diff --git a/src/frontend/frontend/templates/project-template.html b/src/frontend/frontend/templates/project-template.html
