Refactor skipBlank* methods to use peekBlank*

Author: stasm

fluent-syntax/src/stream.js

@@ -67,64 +67,44 @@ export const EOF = undefined;
 const SPECIAL_LINE_START_CHARS = ["}", ".", "[", "*"];
 
 export class FluentParserStream extends ParserStream {
-  skipBlankInline() {
-    let blank = "";
-    while (this.currentChar === " ") {
-      blank += " ";
-      this.next();
-    }
-    return blank;
-  }
-
   peekBlankInline() {
+    const start = this.index + this.peekOffset;
     while (this.currentPeek === " ") {
       this.peek();
     }
+    return this.string.slice(start, this.index + this.peekOffset);
   }
 
-  skipBlankBlock() {
+  skipBlankInline() {
+    const blank = this.peekBlankInline();
+    this.skipToPeek();
+    return blank;
+  }
+
+  peekBlankBlock() {
     let blank = "";
     while (true) {
+      const lineStart = this.peekOffset;
       this.peekBlankInline();
-
       if (this.currentPeek === EOL) {
-        this.skipToPeek();
-        this.next();
         blank += EOL;
+        this.peek();
         continue;
       }
-
       if (this.currentPeek === EOF) {
-        // Consume any inline blanks before the EOF.
-        this.skipToPeek();
+        // Treat the blank line at EOF as a blank block.
         return blank;
       }
-
       // Any other char; reset to column 1 on this line.
-      this.resetPeek();
+      this.resetPeek(lineStart);
       return blank;
     }
   }
 
-  peekBlankBlock() {
-    let blank = "";
-    while (true) {
-      const lineStart = this.peekOffset;
-      this.peekBlankInline();
-      if (this.currentPeek === EOL) {
-        this.peek();
-        blank += EOL;
-      } else {
-        this.resetPeek(lineStart);
-        return blank;
-      }
-    }
-  }
-
-  skipBlank() {
-    while (this.currentChar === " " || this.currentChar === EOL) {
-      this.next();
-    }
+  skipBlankBlock() {
+    const blank = this.peekBlankBlock();
+    this.skipToPeek();
+    return blank;
   }
 
   peekBlank() {
@@ -133,6 +113,11 @@ export class FluentParserStream extends ParserStream {
     }
   }
 
+  skipBlank() {
+    this.peekBlank();
+    this.skipToPeek();
+  }
+
   expectChar(ch) {
     if (this.currentChar === ch) {
       this.next();