Merge pull request #1313 from ABouzo/issue_1309-multiline

Fix for Multi-line pasting is broken #1309

Author: le0pard

src/shell/Parser.ts

@@ -21,6 +21,8 @@ export abstract class ASTNode {
     abstract get fullEnd(): number;
 }
 
+const isEndOfCommand = (token: Scanner.Token) => token instanceof Scanner.Semicolon || token instanceof Scanner.NewLine;
+
 abstract class LeafNode extends ASTNode {
     constructor(private token: Scanner.Token) {
         super();
@@ -86,11 +88,14 @@ abstract class BranchNode extends ASTNode {
     }
 }
 
+/**
+ * The whole command, the input string.
+ */
 export class CompleteCommand extends BranchNode {
     @memoizeAccessor
     get children(): ASTNode[] {
         const lastChild = _.last(this.tokens)!;
-        const endsWithSeparator = lastChild instanceof Scanner.Semicolon;
+        const endsWithSeparator = isEndOfCommand(lastChild);
 
         if (endsWithSeparator) {
             return [
@@ -117,7 +122,7 @@ export class CompleteCommand extends BranchNode {
 class List extends BranchNode {
     @memoizeAccessor
     get children(): ASTNode[] {
-        const separatorOpIndex = _.findLastIndex(this.tokens, token => token instanceof Scanner.Semicolon);
+        const separatorOpIndex = _.findLastIndex(this.tokens, isEndOfCommand);
 
         if (separatorOpIndex !== -1) {
             return [

src/shell/Scanner.ts

@@ -147,6 +147,16 @@ export class DoubleQuotedStringLiteral extends StringLiteral {
     }
 }
 
+export class NewLine extends Token {
+    get value() {
+        return this.raw;
+    }
+
+    get escapedValue() {
+        return this.value as EscapedShellWord;
+    }
+}
+
 export class Invalid extends Token {
     get value() {
         return this.raw.trim();
@@ -157,7 +167,13 @@ export class Invalid extends Token {
     }
 }
 
+// All these regex start ^ so that we can look only at the first token. Maybe that should
+// be part of the scanner so that the regex can be just for the token
 const patterns = [
+    {
+        regularExpression: /^(\n)/,
+        tokenConstructor: NewLine,
+    },
     {
         regularExpression: /^(\s*\|\s*)/,
         tokenConstructor: Pipe,

src/views/index.html

@@ -289,6 +289,10 @@
                 color: var(--green-color);
             }
 
+            .job-header div {
+                white-space: pre;
+            }
+
             .output {
                 white-space: pre-wrap;
                 position: relative;