update syntax highlighting, move styles out of progressbar

Author: spatializes

package.json

@@ -14,12 +14,10 @@
     "iggins": "^0.1.0",
     "irken": "^0.6.0",
     "lodash": "^3.9.1",
-    "progressbar.js": "^0.8.1",
     "react": "^0.13.1",
     "react-loader": "^1.2.0",
     "react-material": "git://github.com/iceddev/react-material#fake-release-13",
     "react-mfb-iceddev": "^0.1.0",
-    "react-progressbar": "^1.1.0",
     "react-select": "^0.4.0",
     "react-style": "^0.4.0",
     "skrim": "0.0.3",

plugins/editor/pbasic.js

@@ -11,8 +11,13 @@ module.exports = function(CodeMirror){
       return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
     }
 
-    function getWordRange(word, start, end){
+    function getWordRange(word, start, end, base){
       var words = [];
+
+      if (base) {
+        words.push(word)
+      };
+
       for (var i = start; i < end + 1; i++) {
         words.push(word + i);
       };
@@ -39,30 +44,30 @@ module.exports = function(CodeMirror){
     var etDirective = ['STAMP', 'PORT', 'PBASIC'];
     var etTargetModule = ['BS1','BS2','BS2E','BS2SX', 'BS2P', 'BS2PE','BS2PX'];
     var etIOFormatter = ['ASC', 'STR','REP', 'SKIP', 'WAITSTR','WAIT','NUM','SNUM']
-      .concat(getWordRange('DEC', 1, 5))
-      .concat(getWordRange('BIN', 1, 16))
-      .concat(getWordRange('ISBIN', 1, 16))
-      .concat(getWordRange('ISHEX', 1, 4))
-      .concat(getWordRange('IHEX', 1, 4))
-      .concat(getWordRange('IBIN', 1, 16))
-      .concat(getWordRange('HEX', 1, 4))
-      .concat(getWordRange('SHEX', 1, 4))
-      .concat(getWordRange('SBIN', 1, 16))
-      .concat(getWordRange('SDEC', 1, 5));
+      .concat(getWordRange('DEC', 1, 5, true))
+      .concat(getWordRange('BIN', 1, 16, true))
+      .concat(getWordRange('IBIN', 1, 16, true))
+      .concat(getWordRange('ISBIN', 1, 16, true))
+      .concat(getWordRange('ISHEX', 1, 4, true))
+      .concat(getWordRange('IHEX', 1, 4, true))
+      .concat(getWordRange('IBIN', 1, 16, true))
+      .concat(getWordRange('HEX', 1, 4, true))
+      .concat(getWordRange('SHEX', 1, 4, true))
+      .concat(getWordRange('SBIN', 1, 16, true))
+      .concat(getWordRange('SDEC', 1, 5, true));
 
     var etVariable = ['INA', 'INB', 'INC', 'IND', 'OUTA', 'OUTB', 'OUTC', 'OUTD',
       'DIRA', 'DIRB', 'DIRC', 'DIRD', 'INL', 'INH', 'OUTL', 'OUTH', 'DIRL', 'DIRH',
       'INS', 'OUTS', 'DIRS']
       .concat(getWordRange('B', 0, 25))
       .concat(getWordRange('DIR', 0, 15))
-      .concat(getWordRange('BIT', 0, 15))
       .concat(getWordRange('W', 0, 12))
       .concat(getWordRange('OUT', 0, 15))
-      .concat(getWordRange('NIB', 0, 3))
-      .concat(getWordRange('IN', 1, 16));
+      .concat(getWordRange('IN', 0, 16));
 
     var etConstant = ['CLS','HOME','BELL','BKSP','TAB','CR','UNITON','UNITOFF','UNITSOFF',
-      'LIGHTSON','DIM','BRIGHT','LSBFIRST','MSBFIRST','MSBPRE','LSBPRE','MSBPOST','LSBPOST'];
+      'LIGHTSON','DIM','BRIGHT','LSBFIRST','MSBFIRST','MSBPRE','LSBPRE','MSBPOST','LSBPOST',
+      'DEBUGIN','CRSRXY','CRSRLF','CRSRRT','CRSRUP','CRSRDN','LF','CLREOL','CLRDN','CRSRX','CRSRY'];
 
     var etCCDirective = ['#DEFINE', '#ERROR', '#IF', '#THEN', '#ELSE', '#ENDIF', '#SELECT',
       '#CASE', '#ENDSELECT'];

plugins/sidebar/overlays/download.js

@@ -35,7 +35,7 @@ class DownloadOverlay extends React.Component {
   }
 
   onAccept(evt){
-      this.download(this.state.selectedDevice);
+    this.download(this.state.selectedDevice);
   }
 
   onCancel(evt){
@@ -45,10 +45,11 @@ class DownloadOverlay extends React.Component {
   }
 
   download(device){
-    const { toast, workspace, logger, overlay } = this.props.irken;
 
     const { irken, handleError, handleSuccess } = this.props;
 
+    const { toast, workspace, logger, overlay } = irken;
+
     const name = workspace.filename.deref();
     const source = workspace.current.deref();
 
@@ -116,7 +117,7 @@ class DownloadOverlay extends React.Component {
     return (
       <Card styles={[styles.overlay, styles.overlayLarge]}>
         <h3 style={styles.overlayTitle}>Please choose your connected device.</h3>
-        <div style={styles.overlayTableContainer}>
+        <div>
           <Loader loaded={!this.state.searching}>
             <div style={styles.deviceTableWrapper}>
               <div style={styles.deviceTableScroll}>

plugins/sidebar/overlays/progress.js

@@ -2,30 +2,18 @@
 
 const React = require('react');
 
+var styles = require('../styles.js');
+
 class Progress extends React.Component {
 
   render(){
 
-    const setComplete = this.props.setComplete + '%';
-
-    const barStyle = {
-      width: setComplete,
-      height: '100%',
-      backgroundColor: '#3a81f0'
-    }
-    const barContainerStyle = {
-      width: '100%',
-      height: '8px',
-      backgroundColor: '#b0d0ef',
-      position: 'absolute',
-      bottom: 0,
-      left: 0
-    }
+    var setComplete = {width: this.props.setComplete + '%'};
 
     return (
-        <div style={barContainerStyle}>
-          <div style={barStyle}></div>
-        </div>
+      <div style={styles.progressContainerStyle}>
+        <div styles={[styles.progressBarStyle, setComplete]}></div>
+      </div>
     );
   }
 }

plugins/sidebar/styles.js

@@ -48,15 +48,24 @@ const styles = {
     display: 'flex',
     marginTop: 20
   },
-  overlayTableContainer: {
+  progressContainerStyle: {
+    width: '100%',
+    height: '8px',
+    backgroundColor: '#b0d0ef',
+    position: 'absolute',
+    bottom: 0,
+    left: 0
+  },
+  progressBarStyle: {
+    height: '100%',
+    backgroundColor: '#3a81f0'
   },
   deviceTable: {
     width: '100%',
     maxWidth: '100%',
     borderCollapse: 'collapse',
     borderSpacing: 0,
     display: 'table',
-
   },
   deviceTableWrapper: {
     position: 'relative'