Merge branch 'master' into prependWithBundleInfo

src/testRunner/tsconfig.json

@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig-base",
+    "extends": "../tsconfig-noncomposite-base",
     "compilerOptions": {
         "outFile": "../../built/local/run.js",
         "composite": false,
@@ -43,6 +43,7 @@
         "unittests/asserts.ts",
         "unittests/base64.ts",
         "unittests/builder.ts",
+        "unittests/comments.ts",
         "unittests/compilerCore.ts",
         "unittests/convertToBase64.ts",
         "unittests/customTransforms.ts",

src/testRunner/unittests/comments.ts

@@ -0,0 +1,32 @@
+namespace ts {
+    describe("comment parsing", () => {
+        const withShebang = `#! node
+/** comment */
+// another one
+;`;
+        const noShebang = `/** comment */
+// another one
+;`;
+        const withTrailing = `;/* comment */
+// another one
+`;
+        it("skips shebang", () => {
+            const result = getLeadingCommentRanges(withShebang, 0);
+            assert.isDefined(result);
+            assert.strictEqual(result!.length, 2);
+        });
+
+        it("treats all comments at start of file as leading comments", () => {
+            const result = getLeadingCommentRanges(noShebang, 0);
+            assert.isDefined(result);
+            assert.strictEqual(result!.length, 2);
+        });
+
+        it("returns leading comments if position is not 0", () => {
+            const result = getLeadingCommentRanges(withTrailing, 1);
+            assert.isDefined(result);
+            assert.strictEqual(result!.length, 1);
+            assert.strictEqual(result![0].kind, SyntaxKind.SingleLineCommentTrivia);
+        });
+    });
+}