Add AST.Placeable

Author: stasm

fluent-syntax/src/ast.js

@@ -67,6 +67,14 @@ export class TextElement extends SyntaxNode {
   }
 }
 
+export class Placeable extends SyntaxNode {
+  constructor(expression) {
+    super();
+    this.type = 'Placeable';
+    this.expression = expression;
+  }
+}
+
 export class Expression extends SyntaxNode {
   constructor() {
     super();

fluent-syntax/src/ftlstream.js

@@ -2,21 +2,24 @@
 
 import { ParserStream } from './stream';
 import { ParseError } from './errors';
+import { includes } from './util';
+
+const INLINE_WS = [' ', '\t'];
 
 export class FTLParserStream extends ParserStream {
-  peekLineWS() {
+  peekInlineWS() {
     let ch = this.currentPeek();
     while (ch) {
-      if (ch !== ' ' && ch !== '\t') {
+      if (!includes(INLINE_WS, ch)) {
         break;
       }
       ch = this.peek();
     }
   }
 
-  skipWSLines() {
+  skipBlankLines() {
     while (true) {
-      this.peekLineWS();
+      this.peekInlineWS();
 
       if (this.currentPeek() === '\n') {
         this.skipToPeek();
@@ -28,9 +31,9 @@ export class FTLParserStream extends ParserStream {
     }
   }
 
-  skipLineWS() {
+  skipInlineWS() {
     while (this.ch) {
-      if (this.ch !== ' ' && this.ch !== '\t') {
+      if (!includes(INLINE_WS, this.ch)) {
         break;
       }
       this.next();
@@ -84,22 +87,6 @@ export class FTLParserStream extends ParserStream {
     return ((cc >= 48 && cc <= 57) || cc === 45); // 0-9
   }
 
-  isPeekNextLineIndented() {
-    if (!this.currentPeekIs('\n')) {
-      return false;
-    }
-
-    this.peek();
-
-    if (this.currentPeekIs(' ')) {
-      this.resetPeek();
-      return true;
-    }
-
-    this.resetPeek();
-    return false;
-  }
-
   isPeekNextLineVariantStart() {
     if (!this.currentPeekIs('\n')) {
       return false;
@@ -109,7 +96,7 @@ export class FTLParserStream extends ParserStream {
 
     const ptr = this.getPeekIndex();
 
-    this.peekLineWS();
+    this.peekInlineWS();
 
     if (this.getPeekIndex() - ptr === 0) {
       this.resetPeek();
@@ -137,7 +124,7 @@ export class FTLParserStream extends ParserStream {
 
     const ptr = this.getPeekIndex();
 
-    this.peekLineWS();
+    this.peekInlineWS();
 
     if (this.getPeekIndex() - ptr === 0) {
       this.resetPeek();
@@ -162,7 +149,7 @@ export class FTLParserStream extends ParserStream {
 
     const ptr = this.getPeekIndex();
 
-    this.peekLineWS();
+    this.peekInlineWS();
 
     if (this.getPeekIndex() - ptr === 0) {
       this.resetPeek();
@@ -191,7 +178,7 @@ export class FTLParserStream extends ParserStream {
 
     const ptr = this.getPeekIndex();
 
-    this.peekLineWS();
+    this.peekInlineWS();
 
     if (this.getPeekIndex() - ptr === 0) {
       this.resetPeek();
@@ -208,7 +195,7 @@ export class FTLParserStream extends ParserStream {
   }
 
   skipToNextEntryStart() {
-    while (this.next()) {
+    while (this.ch) {
       if (this.currentIs('\n') && !this.peekCharIs('\n')) {
         this.next();
         if (this.ch === undefined || this.isIDStart() ||
@@ -217,6 +204,7 @@ export class FTLParserStream extends ParserStream {
           break;
         }
       }
+      this.next();
     }
   }
 

fluent-syntax/src/index.js

@@ -15,14 +15,22 @@ export function serialize(resource, opts) {
 }
 
 export function lineOffset(source, pos) {
-  // Substract 1 to get the offset.
+  // Subtract 1 to get the offset.
   return source.substring(0, pos).split('\n').length - 1;
 }
 
 export function columnOffset(source, pos) {
-  const lastLineBreak = source.lastIndexOf('\n', pos);
-  return lastLineBreak === -1
-    ? pos
-    // Substracting two offsets gives length; substract 1 to get the offset.
-    : pos - lastLineBreak - 1;
+  // Find the last line break starting backwards from the index just before
+  // pos.  This allows us to correctly handle ths case where the character at
+  // pos  is a line break as well.
+  const fromIndex = pos - 1;
+  const prevLineBreak = source.lastIndexOf('\n', fromIndex);
+
+  // pos is a position in the first line of source.
+  if (prevLineBreak === -1) {
+    return pos;
+  }
+
+  // Subtracting two offsets gives length; subtract 1 to get the offset.
+  return pos - prevLineBreak - 1;
 }