fix(parser): only strip comments if not in string literals

angular · Apr 14, 2016 · ca30d95 · ca30d95
1 parent 7912dc7
commit ca30d95
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 11 deletions.
diff --git a/modules/angular2/src/compiler/expression_parser/lexer.ts b/modules/angular2/src/compiler/expression_parser/lexer.ts
@@ -145,7 +145,7 @@ export const $BACKSLASH = 92;
 export const $RBRACKET = 93;
 const $CARET = 94;
 const $_ = 95;
-
+export const $BT = 96;
 const $a = 97, $e = 101, $f = 102, $n = 110, $r = 114, $t = 116, $u = 117, $v = 118, $z = 122;
 
 export const $LBRACE = 123;
@@ -415,6 +415,10 @@ function isExponentSign(code: number): boolean {
   return code == $MINUS || code == $PLUS;
 }
 
+export function isQuote(code: number): boolean {
+  return code === $SQ || code === $DQ || code === $BT;
+}
+
 function unescape(code: number): number {
   switch (code) {
     case $n:

diff --git a/modules/angular2/src/compiler/expression_parser/parser.ts b/modules/angular2/src/compiler/expression_parser/parser.ts
@@ -6,6 +6,7 @@ import {
   Lexer,
   EOF,
   isIdentifier,
+  isQuote,
   Token,
   $PERIOD,
   $COLON,
@@ -16,7 +17,8 @@ import {
   $LBRACE,
   $RBRACE,
   $LPAREN,
-  $RPAREN
+  $RPAREN,
+  $SLASH
 } from './lexer';
 import {
   AST,
@@ -49,7 +51,6 @@ import {
 var _implicitReceiver = new ImplicitReceiver();
 // TODO(tbosch): Cannot make this const/final right now because of the transpiler...
 var INTERPOLATION_REGEXP = /\{\{([\s\S]*?)\}\}/g;
-var COMMENT_REGEX = /[^:]\/\//g;
 
 class ParseException extends BaseException {
   constructor(message: string, input: string, errLocation: string, ctxLocation?: any) {
@@ -160,7 +161,26 @@ export class Parser {
   }
 
   private _stripComments(input: string): string {
-    return StringWrapper.split(input, COMMENT_REGEX)[0].trim();
+    let i = this._commentStart(input);
+    return isPresent(i) ? input.substring(0, i).trim() : input;
+  }
+
+  private _commentStart(input: string): number {
+    let quoteStack = [];
+    for (var i = 0; i < input.length - 1; i++) {
+      let char = StringWrapper.charCodeAt(input, i);
+      let nextChar = StringWrapper.charCodeAt(input, i + 1);
+      let top = ListWrapper.last(quoteStack);
+
+      if (char === $SLASH && nextChar == $SLASH && quoteStack.length === 0) return i;
+
+      if (top === char) {
+        quoteStack.pop();
+      } else if (isQuote(char)) {
+        quoteStack.push(char);
+      }
+    }
+    return null;
   }
 
   private _checkNoInterpolation(input: string, location: any): void {

diff --git a/modules/angular2/test/compiler/expression_parser/parser_spec.ts b/modules/angular2/test/compiler/expression_parser/parser_spec.ts
@@ -105,7 +105,7 @@ export function main() {
 
       it('should ignore comments in expressions', () => { checkAction('a //comment', 'a'); });
 
-      it('should retain // in URLs',
+      it('should retain // in string literals',
          () => { checkAction(`"http://www.google.com"`, `"http://www.google.com"`); });
 
       it('should parse an empty string', () => { checkAction(''); });
@@ -277,8 +277,10 @@ export function main() {
 
       it('should ignore comments in bindings', () => { checkBinding('a //comment', 'a'); });
 
-      it('should retain // in URLs',
+      it('should retain // in string literals',
          () => { checkBinding(`"http://www.google.com"`, `"http://www.google.com"`); });
+
+      it('should retain // in : microsyntax', () => { checkBinding('one:a//b', 'one:a//b'); });
     });
 
     describe('parseTemplateBindings', () => {
@@ -435,12 +437,23 @@ export function main() {
         checkInterpolation(`{{ 'foo' +\n 'bar' +\r 'baz' }}`, `{{ "foo" + "bar" + "baz" }}`);
       });
 
-      it('should ignore comments in interpolation expressions',
-         () => { checkInterpolation('{{a //comment}}', '{{ a }}'); });
+      describe("comments", () => {
+        it('should ignore comments in interpolation expressions',
+           () => { checkInterpolation('{{a //comment}}', '{{ a }}'); });
+
+        it('should retain // in single quote strings', () => {
+          checkInterpolation(`{{ 'http://www.google.com' }}`, `{{ "http://www.google.com" }}`);
+        });
+
+        it('should retain // in double quote strings', () => {
+          checkInterpolation(`{{ "http://www.google.com" }}`, `{{ "http://www.google.com" }}`);
+        });
+
+        it('should ignore comments after string literals',
+           () => { checkInterpolation(`{{ "a//b" //comment }}`, `{{ "a//b" }}`); });
+
+      })
 
-      it('should retain // in URLs', () => {
-        checkInterpolation(`{{ "http://www.google.com" }}`, `{{ "http://www.google.com" }}`);
-      });
     });
 
     describe("parseSimpleBinding", () => {