Merge pull request #163 from zombie/162-experiment-errors

show parse errors on experiment tab, fix #162

Author: mozfreddyb

client/js/experimentctrl.js

@@ -24,14 +24,16 @@ scanjsModule.controller('ExperimentCtrl', ['$scope', 'ScanSvc', function Experim
 
   $scope.runScan = function () {
     $scope.results = [];
+    $scope.error = null;
     ScanJS.loadRules(ScanSvc.rules);
     var code = $scope.codeMirror.getValue();
     try {
       var ast = acorn.parse(code, { locations: true });
+      $scope.results = ScanJS.scan(ast);
     } catch(e) {
+      $scope.error = e;
       console.error(e);
     }
-    $scope.results = ScanJS.scan(ast);
     $scope.lastScan = $scope.runScan;
   };
 
@@ -40,23 +42,21 @@ scanjsModule.controller('ExperimentCtrl', ['$scope', 'ScanSvc', function Experim
     ScanJS.loadRules([ruleData]);
 
     $scope.results = [];
+    $scope.error = null;
     var code = $scope.codeMirror.getValue();
     try {
       var ast = acorn.parse(code, { locations: true });
+      $scope.results = ScanJS.scan(ast);
+      //put ast on global variable for debugging purposes.
+      window.ast = ast;
     } catch(e) {
+      $scope.error = e;
       console.error(e);
     }
-    
-    //put ast on global variable for debugging purposes.
-    window.ast = ast;
-
-    //ScanJS.setResultCallback(found);
-    $scope.results = ScanJS.scan(ast);
     $scope.lastScan = $scope.runManualScan;
   };
 
   $scope.showResult = function (filename,line, col) {
-    document.querySelector("#code-mirror-wrapper").classList.toggle("hidden",false);
     $scope.codeMirror.setCursor(line - 1, col || 0);
     $scope.codeMirror.focus();
   };

client/partials/experiment.html

@@ -22,6 +22,16 @@
         <h4>
             Results
         </h4>
+        <div ng-if="error" id="parse-error">
+            <div class="alert alert-danger" role="alert">
+                <h4>
+                    <a href="" ng-click="showResult('', error.loc.line, error.loc.column)">line {{error.loc.line}}</a>
+                    ::
+                    {{error.name}}
+                </h4>
+                {{error.message}}
+            </div>
+        </div>
         <table class="table table-striped" >
             <thead>
             <tr>