refactor: remove redundant error in catch

alan-agius4 · clydin · commit 3108ce30ab42 · 2018-07-02T08:20:59.000-04:00
diff --git a/packages/angular/cli/commands/version.ts b/packages/angular/cli/commands/version.ts
@@ -90,7 +90,7 @@ export default class VersionCommand extends Command {
       try {
         const gitRefName = '' + child_process.execSync('git symbolic-ref HEAD', {cwd: __dirname});
         gitBranch = path.basename(gitRefName.replace('\n', ''));
-      } catch (e) {
+      } catch {
       }
 
       ngCliVersion = `local (v${pkg.version}, branch: ${gitBranch})`;
@@ -172,7 +172,7 @@ export default class VersionCommand extends Command {
 
         return modulePkg.version + ' (cli-only)';
       }
-    } catch (e) {
+    } catch {
     }
 
     return '<error>';
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -203,7 +203,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
       : 'rxjs/_esm5/path-mapping';
     const rxPaths = requireProjectModule(projectRoot, rxjsPathMappingImport);
     alias = rxPaths(nodeModules);
-  } catch (e) { }
+  } catch { }
 
   const uglifyOptions = {
     ecma: wco.supportES2015 ? 6 : 5,
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
@@ -50,7 +50,7 @@ export function getServerConfig(wco: WebpackConfigOptions) {
             // It's a system thing (.ie util, fs...)
             callback();
           }
-        } catch (e) {
+        } catch {
           // Node couldn't find it, so it must be user-aliased
           callback();
         }
diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -106,11 +106,11 @@ export class ProtractorBuilder implements Builder<ProtractorBuilderOptions> {
       // When using npm, webdriver is within protractor/node_modules.
       webdriverUpdate = requireProjectModule(getSystemPath(projectRoot),
         `protractor/node_modules/${webdriverDeepImport}`);
-    } catch (e) {
+    } catch {
       try {
         // When using yarn, webdriver is found as a root module.
         webdriverUpdate = requireProjectModule(getSystemPath(projectRoot), webdriverDeepImport);
-      } catch (e) {
+      } catch {
         throw new Error(tags.stripIndents`
           Cannot automatically find webdriver-manager to update.
           Update webdriver-manager manually and run 'ng e2e --no-webdriver-update' instead.
diff --git a/packages/angular_devkit/build_angular/src/tslint/index.ts b/packages/angular_devkit/build_angular/src/tslint/index.ts
@@ -224,7 +224,7 @@ function getFileContents(
   // NOTE: The tslint CLI checks for and excludes MPEG transport streams; this does not.
   try {
     return stripBom(readFileSync(file, 'utf-8'));
-  } catch (e) {
+  } catch {
     throw new Error(`Could not read file '${file}'.`);
   }
 }
diff --git a/packages/angular_devkit/core/node/resolve.ts b/packages/angular_devkit/core/node/resolve.ts
@@ -236,7 +236,7 @@ export function resolve(x: string, options: ResolveOptions): string {
             return n;
           }
         }
-      } catch (e) {}
+      } catch {}
     }
 
     return loadAsFileSync(path.join(x, '/index'));
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/alias_spec.ts b/packages/angular_devkit/core/src/virtual-fs/host/alias_spec.ts
@@ -28,7 +28,7 @@ describe('AliasHost', () => {
         .subscribe(undefined, err => {
           expect(err.message).toMatch(/does not exist/);
         });
-    } catch (e) {
+    } catch {
       // Ignore it. RxJS <6 still throw errors when they happen synchronously.
     }
   });
@@ -49,7 +49,7 @@ describe('AliasHost', () => {
     try {
       aHost.read(normalize('/some/folder/file'))
         .subscribe(undefined, err => expect(err.message).toMatch(/does not exist/));
-    } catch (e) {}
+    } catch {}
 
     // Create the file with new content and verify that this has the new content.
     aHost.write(normalize('/other/folder/file'), content2).subscribe();
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/pattern_spec.ts b/packages/angular_devkit/core/src/virtual-fs/host/pattern_spec.ts
@@ -32,7 +32,7 @@ describe('PatternMatchingHost', () => {
         .subscribe(undefined, err => {
           expect(err.message).toMatch(/does not exist/);
         });
-    } catch (e) {
+    } catch {
       // Ignore it. RxJS <6 still throw errors when they happen synchronously.
     }
 
diff --git a/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts b/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts
@@ -62,7 +62,7 @@ function _getFileContent(
     // Strip BOM from file data.
     // https://stackoverflow.com/questions/24356713
     return fs.readFileSync(file, 'utf-8').replace(/^\uFEFF/, '');
-  } catch (e) {
+  } catch {
     throw new Error(`Could not read file '${file}'.`);
   }
 }
diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
@@ -283,7 +283,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
 
         return stats;
       }
-    } catch (e) {
+    } catch {
       return undefined;
     }
   }
@@ -318,11 +318,11 @@ export class WebpackCompilerHost implements ts.CompilerHost {
       delegated = this._syncHost.list(p).filter((x: string) => {
         try {
           return this._syncHost.isFile(_join(p, x));
-        } catch (e) {
+        } catch {
           return false;
         }
       });
-    } catch (e) {
+    } catch {
       delegated = [];
     }
 
@@ -340,11 +340,11 @@ export class WebpackCompilerHost implements ts.CompilerHost {
       delegated = this._syncHost.list(p).filter((x: string) => {
         try {
           return this._syncHost.isDirectory(_join(p, x));
-        } catch (e) {
+        } catch {
           return false;
         }
       });
-    } catch (e) {
+    } catch {
       delegated = [];
     }
 
diff --git a/packages/schematics/angular/migrations/update-6/index.ts b/packages/schematics/angular/migrations/update-6/index.ts
@@ -90,7 +90,7 @@ function migrateKarmaConfiguration(config: CliConfig): Rule {
           `dir: require('path').join(__dirname, 'coverage'), reports`);
         host.overwrite(karmaPath, content);
       }
-    } catch (e) { }
+    } catch { }
 
     return host;
   };
diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts
@@ -100,7 +100,7 @@ export default function(opts: SnapshotsOptions, logger: logging.Logger) {
     // Clear snapshot directory before publishing to remove deleted build files.
     try {
       _exec('git', ['rm', '-rf', './'], {cwd: destPath}, publishLogger);
-    } catch (e) {
+    } catch {
       // Ignore errors on delete. :shrug:
     }
     _copy(pkg.dist, destPath);
diff --git a/tests/@angular_devkit/build_optimizer/webpack/aio-app/src/app/shared/location.service.ts b/tests/@angular_devkit/build_optimizer/webpack/aio-app/src/app/shared/location.service.ts
@@ -72,8 +72,9 @@ export class LocationService {
               search[decodeURIComponent(pair[0])] = pair[1] && decodeURIComponent(pair[1]);
             }
           });
-      } catch (e) { /* don't care */ }
+        } catch (e) { /* don't care */ }
     }
+
     return search;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ export default class VersionCommand extends Command {`
`90`	`90`	`try {`
`91`	`91`	`const gitRefName = '' + child_process.execSync('git symbolic-ref HEAD', {cwd: __dirname});`
`92`	`92`	`gitBranch = path.basename(gitRefName.replace('\n', ''));`
`93`		`- } catch (e) {`
	`93`	`+ } catch {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	ngCliVersion = `local (v${pkg.version}, branch: ${gitBranch})`;
`@@ -172,7 +172,7 @@ export default class VersionCommand extends Command {`
`172`	`172`
`173`	`173`	`return modulePkg.version + ' (cli-only)';`
`174`	`174`	`}`
`175`		`- } catch (e) {`
	`175`	`+ } catch {`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`return '<error>';`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ export function getServerConfig(wco: WebpackConfigOptions) {`
`50`	`50`	`// It's a system thing (.ie util, fs...)`
`51`	`51`	`callback();`
`52`	`52`	`}`
`53`		`- } catch (e) {`
	`53`	`+ } catch {`
`54`	`54`	`// Node couldn't find it, so it must be user-aliased`
`55`	`55`	`callback();`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ function getFileContents(`
`224`	`224`	`// NOTE: The tslint CLI checks for and excludes MPEG transport streams; this does not.`
`225`	`225`	`try {`
`226`	`226`	`return stripBom(readFileSync(file, 'utf-8'));`
`227`		`- } catch (e) {`
	`227`	`+ } catch {`
`228`	`228`	throw new Error(`Could not read file '${file}'.`);
`229`	`229`	`}`
`230`	`230`	`}`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ export function resolve(x: string, options: ResolveOptions): string {`
`236`	`236`	`return n;`
`237`	`237`	`}`
`238`	`238`	`}`
`239`		`- } catch (e) {}`
	`239`	`+ } catch {}`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`return loadAsFileSync(path.join(x, '/index'));`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ describe('PatternMatchingHost', () => {`
`32`	`32`	`.subscribe(undefined, err => {`
`33`	`33`	`expect(err.message).toMatch(/does not exist/);`
`34`	`34`	`});`
`35`		`- } catch (e) {`
	`35`	`+ } catch {`
`36`	`36`	`// Ignore it. RxJS <6 still throw errors when they happen synchronously.`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ function _getFileContent(`
`62`	`62`	`// Strip BOM from file data.`
`63`	`63`	`// https://stackoverflow.com/questions/24356713`
`64`	`64`	`return fs.readFileSync(file, 'utf-8').replace(/^\uFEFF/, '');`
`65`		`- } catch (e) {`
	`65`	`+ } catch {`
`66`	`66`	throw new Error(`Could not read file '${file}'.`);
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {`
`283`	`283`
`284`	`284`	`return stats;`
`285`	`285`	`}`
`286`		`- } catch (e) {`
	`286`	`+ } catch {`
`287`	`287`	`return undefined;`
`288`	`288`	`}`
`289`	`289`	`}`
`@@ -318,11 +318,11 @@ export class WebpackCompilerHost implements ts.CompilerHost {`
`318`	`318`	`delegated = this._syncHost.list(p).filter((x: string) => {`
`319`	`319`	`try {`
`320`	`320`	`return this._syncHost.isFile(_join(p, x));`
`321`		`- } catch (e) {`
	`321`	`+ } catch {`
`322`	`322`	`return false;`
`323`	`323`	`}`
`324`	`324`	`});`
`325`		`- } catch (e) {`
	`325`	`+ } catch {`
`326`	`326`	`delegated = [];`
`327`	`327`	`}`
`328`	`328`
`@@ -340,11 +340,11 @@ export class WebpackCompilerHost implements ts.CompilerHost {`
`340`	`340`	`delegated = this._syncHost.list(p).filter((x: string) => {`
`341`	`341`	`try {`
`342`	`342`	`return this._syncHost.isDirectory(_join(p, x));`
`343`		`- } catch (e) {`
	`343`	`+ } catch {`
`344`	`344`	`return false;`
`345`	`345`	`}`
`346`	`346`	`});`
`347`		`- } catch (e) {`
	`347`	`+ } catch {`
`348`	`348`	`delegated = [];`
`349`	`349`	`}`
`350`	`350`