Add another test and fix issues with /* in line comment

Author: soda0289

lib/convert-comments.js

@@ -30,7 +30,7 @@ const ts = require("typescript"),
  * @private
  */
 function convertTypeScriptCommentToEsprimaComment(block, text, start, end, startLoc, endLoc) {
-    var comment = {
+    const comment = {
         type: block ? "Block" : "Line",
         value: text
     };
@@ -58,19 +58,19 @@ function convertTypeScriptCommentToEsprimaComment(block, text, start, end, start
  * @private
  */
 function getCommentFromTriviaScanner(triviaScanner, ast, code) {
-    var kind = triviaScanner.getToken();
-    var isBlock = (kind === ts.SyntaxKind.MultiLineCommentTrivia);
-    var range = {
+    const kind = triviaScanner.getToken();
+    const isBlock = (kind === ts.SyntaxKind.MultiLineCommentTrivia);
+    const range = {
         pos: triviaScanner.getTokenPos(),
         end: triviaScanner.getTextPos(),
         kind: triviaScanner.getToken()
     };
 
-    var comment = code.substring(range.pos, range.end);
-    var text = comment.replace("//", "").replace("/*", "").replace("*/", "");
-    var loc = nodeUtils.getLocFor(range.pos, range.end, ast);
+    const comment = code.substring(range.pos, range.end);
+    const text = (isBlock) ? comment.replace(/^\/\*/, "").replace(/\*\/$/, "") : comment.replace(/^\/\//, "");
+    const loc = nodeUtils.getLocFor(range.pos, range.end, ast);
 
-    var esprimaComment = convertTypeScriptCommentToEsprimaComment(isBlock, text, range.pos, range.end, loc.start, loc.end);
+    const esprimaComment = convertTypeScriptCommentToEsprimaComment(isBlock, text, range.pos, range.end, loc.start, loc.end);
 
     return esprimaComment;
 }
@@ -93,33 +93,34 @@ module.exports = {
  * @private
  */
 function convertComments(ast, code) {
-    var comments = [];
+    const comments = [];
 
     /**
      * Create a TypeScript Scanner, with skipTrivia set to false so that
      * we can parse the comments
      */
-    var triviaScanner = ts.createScanner(ast.languageVersion, false, 0, code);
+    const triviaScanner = ts.createScanner(ast.languageVersion, false, 0, code);
 
-    var kind = triviaScanner.scan();
+    let kind = triviaScanner.scan();
     while (kind !== ts.SyntaxKind.EndOfFileToken) {
-        var start = triviaScanner.getTokenPos();
-        var end = triviaScanner.getTextPos();
+        const start = triviaScanner.getTokenPos();
+        const end = triviaScanner.getTextPos();
 
-        var container = null;
+        let container = null;
         switch (kind) {
             case ts.SyntaxKind.SingleLineCommentTrivia:
-            case ts.SyntaxKind.MultiLineCommentTrivia:
-                var comment = getCommentFromTriviaScanner(triviaScanner, ast, code);
+            case ts.SyntaxKind.MultiLineCommentTrivia: {
+                const comment = getCommentFromTriviaScanner(triviaScanner, ast, code);
 
                 comments.push(comment);
                 break;
+            }
             case ts.SyntaxKind.CloseBraceToken:
                 container = nodeUtils.getNodeContainer(ast, start, end);
 
                 if (
-                    container.kind === ts.SyntaxKind.TemplateMiddle
-                    || container.kind === ts.SyntaxKind.TemplateTail
+                    container.kind === ts.SyntaxKind.TemplateMiddle ||
+                    container.kind === ts.SyntaxKind.TemplateTail
                 ) {
                     kind = triviaScanner.reScanTemplateToken();
                     continue;

lib/node-utils.js

@@ -644,15 +644,15 @@ function convertTokens(ast) {
  * @private
  */
 function getNodeContainer(ast, start, end) {
-    var container = null;
+    let container = null;
 
     /**
      * @param  {TSNode} node the TSNode
      * @returns {undefined}
      */
     function walk(node) {
-        var nodeStart = node.pos;
-        var nodeEnd = node.end;
+        const nodeStart = node.pos;
+        const nodeEnd = node.end;
 
         if (start >= nodeStart && end <= nodeEnd) {
             if (isToken(node)) {

tests/fixtures/comments/line-comment-with-block-syntax.result.js

@@ -0,0 +1,40 @@
+module.exports = {
+    "type": "Program",
+    "range": [
+        12,
+        0
+    ],
+    "loc": {
+        "start": {
+            "line": 2,
+            "column": 0
+        },
+        "end": {
+            "line": 1,
+            "column": 0
+        }
+    },
+    "body": [],
+    "sourceType": "script",
+    "tokens": [],
+    "comments": [
+        {
+            "type": "Line",
+            "value": " /*test*/",
+            "range": [
+                0,
+                11
+            ],
+            "loc": {
+                "start": {
+                    "line": 1,
+                    "column": 0
+                },
+                "end": {
+                    "line": 1,
+                    "column": 11
+                }
+            }
+        }
+    ]
+};

tests/fixtures/comments/line-comment-with-block-syntax.src.js

@@ -0,0 +1 @@
+// /*test*/