Fix #365

test/comment.js

@@ -25,7 +25,7 @@
 'use strict';
 
 var fs = require('fs'),
-    esprima = require('./3rdparty/esprima-harmony.original'),
+    esprima = require('esprima'),
     escodegen = require('./loader'),
     chai = require('chai'),
     expect = chai.expect;
@@ -41,7 +41,8 @@ function test(code, expected) {
         range: true,
         loc: false,
         tokens: true,
-        raw: false
+        raw: false,
+        sourceType: 'module'
     };
 
     tree = esprima.parse(code, options);

test/comment/array-elements.expected.js

@@ -0,0 +1,12 @@
+var test = [
+    /**
+     * Test 2
+     */
+    a,
+    /*
+     * Test 1
+     */
+    2,
+    // Test 3
+    3 + 3
+];

test/comment/array-elements.js

@@ -0,0 +1,12 @@
+var test = [
+    /**
+     * Test 2
+     */
+    a,
+    /*
+     * Test 1
+     */
+    2,
+    // Test 3
+    3+3
+];

test/comment/comment-as-first-element-in-non-parenthesis-expression.expected.js

@@ -0,0 +1,14 @@
+function foo(x) {
+    return (
+        /* comment 1 */
+        x > 0 || // comment 2
+            x < 5
+    );
+}
+function foo(x) {
+    return (
+        /* comment 1 */
+        x > 0 || // comment 2
+            x < 5
+    );
+}

test/comment/comment-as-first-element-in-non-parenthesis-expression.expected.js.todo

@@ -0,0 +1,14 @@
+// this test should pass, but it is not passing due to a bug
+// https://github.com/estools/escodegen/issues/336
+// https://github.com/estools/escodegen/issues/435
+
+function foo(x) {
+    return /* comment 1 */ x > 0 || // comment 2
+        x < 5;
+}
+
+function foo(x) {
+    return /* comment 1 */ x > 0 ||
+        // comment 2
+        x < 5;
+}

test/comment/comment-as-first-element-in-non-parenthesis-expression.js

@@ -0,0 +1,10 @@
+function foo(x) {
+    return /* comment 1 */ x > 0 || // comment 2
+        x < 5;
+}
+
+function foo(x) {
+    return /* comment 1 */ x > 0 ||
+        // comment 2
+        x < 5;
+}

test/comment/comment-as-first-element-in-non-parenthesis-expression.js.todo

@@ -0,0 +1,14 @@
+// this test should pass, but it is not passing due to a bug
+// https://github.com/estools/escodegen/issues/336
+// https://github.com/estools/escodegen/issues/435
+
+function foo(x) {
+    return /* comment 1 */ x > 0 || // comment 2
+        x < 5;
+}
+
+function foo(x) {
+    return /* comment 1 */ x > 0 ||
+        // comment 2
+        x < 5;
+}

test/comment/comment-as-first-element-in-parenthesis-expression.expected.js

@@ -0,0 +1,76 @@
+function foo() {
+    return (
+        // comment
+        3 + 3
+    );
+}
+function foo() {
+    return (
+        // comment
+        3 + 3
+    );
+}
+function foo() {
+    return (
+        /* comment */
+        3 + 3
+    );
+}
+function foo() {
+    return (
+        /* comment
+        comment
+        comment
+        */
+        3 + 3
+    );
+}
+function foo() {
+    return (
+        /* comment
+        comment
+        comment
+        */
+        3 + 3
+    );
+}
+function foo() {
+    return (
+        // comment
+        /* comment */
+        // comment
+        3 + 3
+    );
+}
+function foo() {
+    return (
+        // one
+        3 + 3 - // two
+        (1 + 1)
+    );
+}
+function foo(a, b, c) {
+    return (
+        // comment
+        a >= b && a <= c || a === 42 || a === 666
+    );
+}
+function foo(a, b, c) {
+    return (
+        // comment
+        a >= b && a <= c || a === 42 || a === 666
+    );
+}
+function foo(a, b, c) {
+    throw (
+        // comment
+        a >= b && a <= c || a === 42 || a === 666
+    );
+}
+let arrowFn = () => (
+    // comment
+    {
+        a: 1,
+        b: 2
+    }
+);

test/comment/comment-as-first-element-in-parenthesis-expression.expected.js.todo

@@ -0,0 +1,9 @@
+// this test should pass, but it is not passing due to a bug
+// https://github.com/estools/escodegen/issues/433
+
+function foo() {
+    return /* comment */ (
+        // comment
+        3 + 3
+    );
+}

test/comment/comment-as-first-element-in-parenthesis-expression.js

@@ -0,0 +1,91 @@
+function foo() {
+    return (
+        // comment
+        3+3
+    );
+}
+
+function foo() {
+    return ( // comment
+        3+3
+    );
+}
+
+function foo() {
+    return ( /* comment */
+        3+3
+    );
+}
+
+function foo() {
+    return ( /* comment
+        comment
+        comment
+        */
+        3+3
+    );
+}
+
+function foo() {
+    return (
+        /* comment
+        comment
+        comment
+        */
+        3+3
+    );
+}
+
+function foo() {
+    return (
+        // comment
+        /* comment */
+        // comment
+        3+3
+    );
+}
+
+function foo() {
+    return (
+        (
+            // one
+            3+3
+        ) -
+        (
+            // two
+            1+1
+        )
+    );
+}
+
+function foo(a, b, c) {
+    return (
+        // comment
+        (a >= b && a <= c)
+        || a === 42 || a === 666
+    );
+}
+
+function foo(a, b, c) {
+    return (
+        ( // comment
+            a >= b &&
+            a <= c)
+        || a === 42 || a === 666
+    );
+}
+
+function foo(a, b, c) {
+    throw (
+        // comment
+        (a >= b && a <= c)
+        || a === 42 || a === 666
+    );
+}
+
+let arrowFn = () => (
+    // comment
+    {
+      a: 1, b: 2
+    }
+);

test/comment/comment-as-first-element-in-parenthesis-expression.js.todo

@@ -0,0 +1,9 @@
+// this test should pass, but it is not passing due to a bug
+// https://github.com/estools/escodegen/issues/433
+
+function foo() {
+    return /* comment */ (
+        // comment
+        3+3
+    );
+}

test/comment/imports.expected.js

@@ -0,0 +1,11 @@
+// this import is important
+import 'foo';
+import { foo } from 'foo';
+import { foo as bar } from 'foo';
+// this import is important too
+import {
+    foo as bar,
+    // alias needed because of ...
+    test as testing,
+    logging
+} from 'foo';

test/comment/imports.js

@@ -0,0 +1,11 @@
+// this import is important
+import 'foo';
+import {foo} from 'foo';
+import {foo as bar} from 'foo';
+// this import is important too
+import {
+    foo as bar,
+    // alias needed because of ...
+    test as testing,
+    logging
+} from 'foo';

test/comment/method-description.expected.js

@@ -0,0 +1,15 @@
+class MyClass {
+    /**
+     * description
+     */
+    foo(a, b) {
+        a.bar(b);
+    }
+}
+class MyClass2 {
+    // description
+    foo(a, b, c, // NOTE: ...
+    d = false) {
+        return 42;
+    }
+}

test/comment/method-description.js

@@ -0,0 +1,17 @@
+class MyClass {
+    /**
+     * description
+     */
+    foo(a, b) {
+        a.bar(b);
+    }
+}
+
+class MyClass2 {
+    // description
+    foo(a, b, c,
+        // NOTE: ...
+        d = false) {
+            return 42;
+    }
+}

test/comment/try-block-line-comment.expected.js

@@ -4,11 +4,13 @@ finally {
 }
 try {
 } catch (e) {
-} finally {
+}    //
+finally {
 }
 {
     try {
     } catch (e) {
-    } finally {
+    }    //
+    finally {
     }
 }

test/comment/variable-declaration.expected.js

@@ -0,0 +1,27 @@
+let variable = // comment
+3 + 3;
+let variable = // comment
+3 + 3;
+let variable = /* comment */
+3 + 3;
+let variable = /* comment
+comment
+comment
+*/
+3 + 3;
+let variable = // comment
+/* comment */
+// comment
+3 + 3;
+let variable = /* comment */
+// comment
+3 + 3;
+let variable = // one
+3 + 3 - // two
+(1 + 1);
+let age = // comment
+    42,
+    // comment
+    height = 165;
+let variable = // comment
+a >= b && a <= c || a === 42 || a === 666;