PR Feedback

rbuckton · rbuckton · commit e756182e21a6 · 2018-06-13T10:46:38.000-07:00
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
         "@types/minimatch": "latest",
         "@types/minimist": "latest",
         "@types/mkdirp": "latest",
-        "@types/mocha": "^5.2.2",
+        "@types/mocha": "latest",
         "@types/node": "8.5.5",
         "@types/q": "latest",
         "@types/run-sequence": "latest",
diff --git a/src/harness/vfs.ts b/src/harness/vfs.ts
@@ -1352,20 +1352,12 @@ namespace vfs {
 
     /** Removes a directory in a `FileSet` */
     export class Rmdir {
-        private _rmdirBrand?: never; // brand necessary for proper type guards
+        public _rmdirBrand?: never; // brand necessary for proper type guards
     }
 
     /** Unlinks a file in a `FileSet` */
     export class Unlink {
-        private _unlinkBrand?: never; // brand necessary for proper type guards
-    }
-
-    // prevents compiler errors due to unused brand properties
-    if (!0) {
-        // tslint:disable-next-line:no-string-literal
-        ignoreUnused(Rmdir.prototype["_rmdirBrand"]);
-        // tslint:disable-next-line:no-string-literal
-        ignoreUnused(Unlink.prototype["_unlinkBrand"]);
+        public _unlinkBrand?: never; // brand necessary for proper type guards
     }
 
     /** Extended options for a symbolic link in a `FileSet` */
@@ -1549,7 +1541,5 @@ namespace vfs {
         }
         return text;
     }
-
-    function ignoreUnused(_: void) { /*empty*/ }
 }
 // tslint:enable:no-null-keyword
diff --git a/src/testRunner/unittests/tsbuild.ts b/src/testRunner/unittests/tsbuild.ts
@@ -398,7 +398,7 @@ namespace ts {
         const resolver = vfs.createResolver(Harness.IO);
         const fs = new vfs.FileSystem(/*ignoreCase*/ true, {
             files: {
-                ["/lib"]: new vfs.Mount(vpath.resolve(Harness.IO.getWorkspaceRoot(), "built/local"), patchResolver(resolver)),
+                ["/lib"]: new vfs.Mount(vpath.resolve(Harness.IO.getWorkspaceRoot(), "built/local"), resolver),
                 ["/src"]: new vfs.Mount(vpath.resolve(Harness.IO.getWorkspaceRoot(), root), resolver)
             },
             cwd: "/",
@@ -407,15 +407,5 @@ namespace ts {
         });
         fs.makeReadonly();
         return fs;
-        function patchResolver(resolver: vfs.FileSystemResolver): vfs.FileSystemResolver {
-            const allowedFiles = ["lib.d.ts", "lib.dom.d.ts", "lib.es5.d.ts", "lib.scripthost.d.ts", "lib.webworker.importscripts.d.ts"];
-            return {
-                ...resolver,
-                readdirSync(path: string) {
-                    const files = resolver.readdirSync(path);
-                    return files.filter(file => allowedFiles.indexOf(file) !== -1);
-                }
-            };
-        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1352,20 +1352,12 @@ namespace vfs {`
`1352`	`1352`
`1353`	`1353`	/** Removes a directory in a `FileSet` */
`1354`	`1354`	`export class Rmdir {`
`1355`		`- private _rmdirBrand?: never; // brand necessary for proper type guards`
	`1355`	`+ public _rmdirBrand?: never; // brand necessary for proper type guards`
`1356`	`1356`	`}`
`1357`	`1357`
`1358`	`1358`	/** Unlinks a file in a `FileSet` */
`1359`	`1359`	`export class Unlink {`
`1360`		`- private _unlinkBrand?: never; // brand necessary for proper type guards`
`1361`		`- }`
`1362`		`-`
`1363`		`- // prevents compiler errors due to unused brand properties`
`1364`		`- if (!0) {`
`1365`		`- // tslint:disable-next-line:no-string-literal`
`1366`		`- ignoreUnused(Rmdir.prototype["_rmdirBrand"]);`
`1367`		`- // tslint:disable-next-line:no-string-literal`
`1368`		`- ignoreUnused(Unlink.prototype["_unlinkBrand"]);`
	`1360`	`+ public _unlinkBrand?: never; // brand necessary for proper type guards`
`1369`	`1361`	`}`
`1370`	`1362`
`1371`	`1363`	/** Extended options for a symbolic link in a `FileSet` */
`@@ -1549,7 +1541,5 @@ namespace vfs {`
`1549`	`1541`	`}`
`1550`	`1542`	`return text;`
`1551`	`1543`	`}`
`1552`		`-`
`1553`		`- function ignoreUnused(_: void) { /empty/ }`
`1554`	`1544`	`}`
`1555`	`1545`	`// tslint:enable:no-null-keyword`