Add shebang comments to the new parser. Fixes #410

google · May 13, 2014 · 74b71e5 · 74b71e5
1 parent 8a895fd
commit 74b71e5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/com/google/javascript/jscomp/parsing/parser/Scanner.java b/src/com/google/javascript/jscomp/parsing/parser/Scanner.java
@@ -317,6 +317,12 @@ private boolean skipComment() {
           return true;
         }
         break;
+      case '#':
+        if (index == 0 && peekChar(1) == '!') {
+          skipSingleLineComment(Comment.Type.SHEBANG);
+          return true;
+        }
+        break;
       }
     }
     return false;
@@ -329,13 +335,17 @@ private void reportHtmlCommentWarning() {
   }
 
   private void skipSingleLineComment() {
+    skipSingleLineComment(Comment.Type.LINE);
+  }
+
+  private void skipSingleLineComment(Comment.Type type) {
     int startOffset = index;
     while (!isAtEnd() && !isLineTerminator(peekChar())) {
       nextChar();
     }
     SourceRange range = getLineNumberTable().getSourceRange(startOffset, index);
     String value = this.source.contents.substring(startOffset, index);
-    recordComment(Comment.Type.LINE, range, value);
+    recordComment(type, range, value);
   }
 
   private void recordComment(

diff --git a/src/com/google/javascript/jscomp/parsing/parser/trees/Comment.java b/src/com/google/javascript/jscomp/parsing/parser/trees/Comment.java
@@ -21,9 +21,18 @@
 /** placeholder class */
 public class Comment {
   public static enum Type {
+    // /* comment */
     BLOCK,
+
+    // // comment
     LINE,
-    JSDOC
+
+    // /** comment */
+    JSDOC,
+
+    // #!/usr/bin/node
+    // Only valid at the start of a file.
+    SHEBANG
   }
 
   public final String value;

diff --git a/test/com/google/javascript/jscomp/parsing/NewParserTest.java b/test/com/google/javascript/jscomp/parsing/NewParserTest.java
@@ -1803,6 +1803,12 @@ public void testForOf2() {
         "for-of statement may not have initializer");
   }
 
+  public void testShebang() {
+    parse("#!/usr/bin/node\n var x = 1;");
+    parseError("var x = 1; \n #!/usr/bin/node",
+        "primary expression expected");
+  }
+
   private Node script(Node stmt) {
     Node n = new Node(Token.SCRIPT, stmt);
     n.setIsSyntheticBlock(true);