fix automatic insertion of semicolon before new line followed by

comment
mozilla · Oct 13, 2011 · 676a674 · 676a674
1 parent ac9b83c
commit 676a674
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/org/mozilla/javascript/Parser.java b/src/org/mozilla/javascript/Parser.java
@@ -333,7 +333,6 @@ private int peekToken()
                 lineno++;
                 sawEOL = true;
             } else {
-                sawEOL = false;
                 if (compilerEnv.isRecordingComments()) {
                     recordComment(lineno);
                 }

diff --git a/testsrc/org/mozilla/javascript/tests/ParserTest.java b/testsrc/org/mozilla/javascript/tests/ParserTest.java
@@ -28,6 +28,16 @@ public void testAutoSemiColonBetweenNames() {
         assertEquals("z", third.getString());
     }
 
+    public void testParseAutoSemiColonBeforeNewlineAndComments() throws IOException {
+        AstRoot root = parseAsReader(
+        		"var s = 3\n"
+        		+ "/* */var t = 1;");
+        assertNotNull(root.getComments());
+        assertEquals(1, root.getComments().size());
+
+        assertEquals("var s = 3;\nvar t = 1;\n", root.toSource());
+    }
+
     public void testLinenoAssign() {
         AstRoot root = parse("\n\na = b");
         ExpressionStatement st = (ExpressionStatement) root.getFirstChild();