Merge remote-tracking branch 'origin/master'

assets/css/style.css

@@ -64,3 +64,14 @@ table {
     height: 100vh;
     max-height: 100vh;
 }
+
+.terminal {
+    position: fixed;
+    bottom: 0;
+    z-index: 300000;
+    height: 200px;
+}
+
+.terminal-hide {
+    display: none !important;
+}

assets/css/xterm.css

@@ -0,0 +1,171 @@
+/**
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
+ * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
+ * https://github.com/chjj/term.js
+ * @license MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Originally forked from (with the author's permission):
+ *   Fabrice Bellard's javascript vt100 for jslinux:
+ *   http://bellard.org/jslinux/
+ *   Copyright (c) 2011 Fabrice Bellard
+ *   The original design remains. The terminal itself
+ *   has been extended to include xterm CSI codes, among
+ *   other features.
+ */
+
+/**
+ *  Default styles for xterm.js
+ */
+
+.xterm {
+    font-feature-settings: "liga" 0;
+    position: relative;
+    user-select: none;
+    -ms-user-select: none;
+    -webkit-user-select: none;
+}
+
+.xterm.focus,
+.xterm:focus {
+    outline: none;
+}
+
+.xterm .xterm-helpers {
+    position: absolute;
+    top: 0;
+    /**
+     * The z-index of the helpers must be higher than the canvases in order for
+     * IMEs to appear on top.
+     */
+    z-index: 5;
+}
+
+.xterm .xterm-helper-textarea {
+    padding: 0;
+    border: 0;
+    margin: 0;
+    /* Move textarea out of the screen to the far left, so that the cursor is not visible */
+    position: absolute;
+    opacity: 0;
+    left: -9999em;
+    top: 0;
+    width: 0;
+    height: 0;
+    z-index: -5;
+    /** Prevent wrapping so the IME appears against the textarea at the correct position */
+    white-space: nowrap;
+    overflow: hidden;
+    resize: none;
+}
+
+.xterm .composition-view {
+    /* TODO: Composition position got messed up somewhere */
+    background: #000;
+    color: #FFF;
+    display: none;
+    position: absolute;
+    white-space: nowrap;
+    z-index: 1;
+}
+
+.xterm .composition-view.active {
+    display: block;
+}
+
+.xterm .xterm-viewport {
+    /* On OS X this is required in order for the scroll bar to appear fully opaque */
+    background-color: #000;
+    overflow-y: scroll;
+    cursor: default;
+    position: absolute;
+    right: 0;
+    left: 0;
+    top: 0;
+    bottom: 0;
+}
+
+.xterm .xterm-screen {
+    position: relative;
+}
+
+.xterm .xterm-screen canvas {
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+
+.xterm .xterm-scroll-area {
+    visibility: hidden;
+}
+
+.xterm-char-measure-element {
+    display: inline-block;
+    visibility: hidden;
+    position: absolute;
+    top: 0;
+    left: -9999em;
+    line-height: normal;
+}
+
+.xterm {
+    cursor: text;
+}
+
+.xterm.enable-mouse-events {
+    /* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */
+    cursor: default;
+}
+
+.xterm.xterm-cursor-pointer {
+    cursor: pointer;
+}
+
+.xterm.column-select.focus {
+    /* Column selection mode */
+    cursor: crosshair;
+}
+
+.xterm .xterm-accessibility,
+.xterm .xterm-message {
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 10;
+    color: transparent;
+}
+
+.xterm .live-region {
+    position: absolute;
+    left: -9999px;
+    width: 1px;
+    height: 1px;
+    overflow: hidden;
+}
+
+.xterm-dim {
+    opacity: 0.5;
+}
+
+.xterm-underline {
+    text-decoration: underline;
+}

assets/editor/dev/vs/editor/editor.main.js

@@ -3262,16 +3262,16 @@ define(__m[4/*vs/base/common/event*/], __M([0/*require*/,1/*exports*/,12/*vs/bas
      * to fire it from the insides.
      * Sample:
         class Document {
-    
+
             private readonly _onDidChange = new Emitter<(value:string)=>any>();
-    
+
             public onDidChange = this._onDidChange.event;
-    
+
             // getter-style
             // get onDidChange(): Event<(value:string)=>any> {
             // 	return this._onDidChange.event;
             // }
-    
+
             private _doIt() {
                 //...
                 this._onDidChange.fire(value);
@@ -18108,7 +18108,7 @@ define(__m[277/*vs/base/browser/ui/scrollbar/verticalScrollbar*/], __M([0/*requi
             super({
                 lazyRender: options.lazyRender,
                 host: host,
-                scrollbarState: new scrollbarState_1.ScrollbarState((options.verticalHasArrows ? options.arrowSize : 0), (options.vertical === 2 /* Hidden */ ? 0 : options.verticalScrollbarSize), 
+                scrollbarState: new scrollbarState_1.ScrollbarState((options.verticalHasArrows ? options.arrowSize : 0), (options.vertical === 2 /* Hidden */ ? 0 : options.verticalScrollbarSize),
                 // give priority to vertical scroll bar over horizontal and let it scroll all the way to the bottom
                 0, scrollDimensions.height, scrollDimensions.scrollHeight, scrollPosition.scrollTop),
                 visibility: options.vertical,
@@ -79437,7 +79437,7 @@ define(__m[551/*vs/platform/quickinput/browser/helpQuickAccess*/], __M([0/*requi
                 }
             }));
             // Also open a picker when we detect the user typed the exact
-            // name of a provider (e.g. `?term` for terminals)
+            // name of a provider (e.g. `?bfastTerminal` for terminals)
             disposables.add(picker.onDidChangeValue(value => {
                 const providerDescriptor = this.registry.getQuickAccessProvider(value.substr(HelpQuickAccessProvider.PREFIX.length));
                 if (providerDescriptor && providerDescriptor.prefix && providerDescriptor.prefix !== HelpQuickAccessProvider.PREFIX) {
@@ -112603,7 +112603,7 @@ define(__m[141/*vs/platform/list/browser/listService*/], __M([0/*require*/,1/*ex
         return {
             getAutomaticKeyboardNavigation,
             disposable,
-            options: Object.assign(Object.assign({ 
+            options: Object.assign(Object.assign({
                 // ...options, // TODO@Joao why is this not splatted here?
                 keyboardSupport: false }, workbenchListOptions), { indent: configurationService.getValue(treeIndentKey), renderIndentGuides: configurationService.getValue(treeRenderIndentGuidesKey), smoothScrolling: configurationService.getValue(listSmoothScrolling), automaticKeyboardNavigation: getAutomaticKeyboardNavigation(), simpleKeyboardNavigation: keyboardNavigation === 'simple', filterOnType: keyboardNavigation === 'filter', horizontalScrolling, keyboardNavigationEventFilter: createKeyboardNavigationEventFilter(container, keybindingService), additionalScrollHeight, hideTwistiesOfChildlessElements: options.hideTwistiesOfChildlessElements, expandOnlyOnDoubleClick: configurationService.getValue(exports.openModeSettingKey) === 'doubleClick' })
         };
@@ -118711,7 +118711,7 @@ define(__m[261/*vs/editor/contrib/find/findController*/], __M([0/*require*/,1/*e
                     && !findInputFocused;
                 /*
                  * if the existing search string in find widget is empty and we don't seed search string from selection, it means the Find Input is still empty, so we should focus the Find Input instead of Replace Input.
-        
+
                  * findInputFocused true -> seedSearchStringFromSelection false, FocusReplaceInput
                  * findInputFocused false, seedSearchStringFromSelection true FocusReplaceInput
                  * findInputFocused false seedSearchStringFromSelection false FocusFindInput

assets/editor/dev/vs/language/css/cssMode.js

@@ -2538,7 +2538,7 @@ var __extends = (this && this.__extends) || (function () {
     exports.Marker = Marker;
     /*
     export class DefaultVisitor implements IVisitor {
-    
+
         public visitNode(node:Node):boolean {
             switch (node.type) {
                 case NodeType.Stylesheet:
@@ -2594,103 +2594,103 @@ var __extends = (this && this.__extends) || (function () {
             }
             return this.visitUnknownNode(node);
         }
-    
+
         public visitFontFace(node:FontFace):boolean {
             return true;
         }
-    
+
         public visitKeyframe(node:Keyframe):boolean {
             return true;
         }
-    
+
         public visitKeyframeSelector(node:KeyframeSelector):boolean {
             return true;
         }
-    
+
         public visitStylesheet(node:Stylesheet):boolean {
             return true;
         }
-    
+
         public visitProperty(Node:Property):boolean {
             return true;
         }
-    
+
         public visitRuleSet(node:RuleSet):boolean {
             return true;
         }
-    
+
         public visitSelector(node:Selector):boolean {
             return true;
         }
-    
+
         public visitSimpleSelector(node:SimpleSelector):boolean {
             return true;
         }
-    
+
         public visitDeclaration(node:Declaration):boolean {
             return true;
         }
-    
+
         public visitFunction(node:Function):boolean {
             return true;
         }
-    
+
         public visitFunctionDeclaration(node:FunctionDeclaration):boolean {
             return true;
         }
-    
+
         public visitInvocation(node:Invocation):boolean {
             return true;
         }
-    
+
         public visitTerm(node:Term):boolean {
             return true;
         }
-    
+
         public visitImport(node:Import):boolean {
             return true;
         }
-    
+
         public visitNamespace(node:Namespace):boolean {
             return true;
         }
-    
+
         public visitExpression(node:Expression):boolean {
             return true;
         }
-    
+
         public visitNumericValue(node:NumericValue):boolean {
             return true;
         }
-    
+
         public visitPage(node:Page):boolean {
             return true;
         }
-    
+
         public visitPageBoxMarginBox(node:PageBoxMarginBox):boolean {
             return true;
         }
-    
+
         public visitNodelist(node:Nodelist):boolean {
             return true;
         }
-    
+
         public visitVariableDeclaration(node:VariableDeclaration):boolean {
             return true;
         }
-    
+
         public visitVariable(node:Variable):boolean {
             return true;
         }
-    
+
         public visitMixinDeclaration(node:MixinDeclaration):boolean {
             return true;
         }
-    
+
         public visitMixinReference(node:MixinReference):boolean {
             return true;
         }
-    
+
         public visitUnknownNode(node:Node):boolean {
             return true;
         }
@@ -12543,7 +12543,7 @@ var __extends = (this && this.__extends) || (function () {
             while (node.addChild(this._parseVariable() || this._parseIdent())) {
                 // Consume all variables and idents ahead.
             }
-            // More than just identifier 
+            // More than just identifier
             return node.getChildren().length > 1 ? node : null;
         };
         SCSSParser.prototype._parseSupportsCondition = function () {