Remove more try-finally blocks

Author: mrcrane

src/server/project.ts

@@ -852,46 +852,43 @@ namespace ts.server {
          */
         updateGraph(): boolean {
             perfLogger.logStartUpdateGraph();
-            try {
-                this.resolutionCache.startRecordingFilesWithChangedResolutions();
-
-                const hasNewProgram = this.updateGraphWorker();
-                const hasAddedorRemovedFiles = this.hasAddedorRemovedFiles;
-                this.hasAddedorRemovedFiles = false;
-
-                const changedFiles: ReadonlyArray<Path> = this.resolutionCache.finishRecordingFilesWithChangedResolutions() || emptyArray;
-
-                for (const file of changedFiles) {
-                    // delete cached information for changed files
-                    this.cachedUnresolvedImportsPerFile.delete(file);
+            this.resolutionCache.startRecordingFilesWithChangedResolutions();
+
+            const hasNewProgram = this.updateGraphWorker();
+            const hasAddedorRemovedFiles = this.hasAddedorRemovedFiles;
+            this.hasAddedorRemovedFiles = false;
+
+            const changedFiles: ReadonlyArray<Path> = this.resolutionCache.finishRecordingFilesWithChangedResolutions() || emptyArray;
+
+            for (const file of changedFiles) {
+                // delete cached information for changed files
+                this.cachedUnresolvedImportsPerFile.delete(file);
+            }
+
+            // update builder only if language service is enabled
+            // otherwise tell it to drop its internal state
+            if (this.languageServiceEnabled) {
+                // 1. no changes in structure, no changes in unresolved imports - do nothing
+                // 2. no changes in structure, unresolved imports were changed - collect unresolved imports for all files
+                // (can reuse cached imports for files that were not changed)
+                // 3. new files were added/removed, but compilation settings stays the same - collect unresolved imports for all new/modified files
+                // (can reuse cached imports for files that were not changed)
+                // 4. compilation settings were changed in the way that might affect module resolution - drop all caches and collect all data from the scratch
+                if (hasNewProgram || changedFiles.length) {
+                    this.lastCachedUnresolvedImportsList = getUnresolvedImports(this.program!, this.cachedUnresolvedImportsPerFile);
                 }
 
-                // update builder only if language service is enabled
-                // otherwise tell it to drop its internal state
-                if (this.languageServiceEnabled) {
-                    // 1. no changes in structure, no changes in unresolved imports - do nothing
-                    // 2. no changes in structure, unresolved imports were changed - collect unresolved imports for all files
-                    // (can reuse cached imports for files that were not changed)
-                    // 3. new files were added/removed, but compilation settings stays the same - collect unresolved imports for all new/modified files
-                    // (can reuse cached imports for files that were not changed)
-                    // 4. compilation settings were changed in the way that might affect module resolution - drop all caches and collect all data from the scratch
-                    if (hasNewProgram || changedFiles.length) {
-                        this.lastCachedUnresolvedImportsList = getUnresolvedImports(this.program!, this.cachedUnresolvedImportsPerFile);
-                    }
-
-                    this.projectService.typingsCache.enqueueInstallTypingsForProject(this, this.lastCachedUnresolvedImportsList, hasAddedorRemovedFiles);
-                }
-                else {
-                    this.lastCachedUnresolvedImportsList = undefined;
-                }
+                this.projectService.typingsCache.enqueueInstallTypingsForProject(this, this.lastCachedUnresolvedImportsList, hasAddedorRemovedFiles);
+            }
+            else {
+                this.lastCachedUnresolvedImportsList = undefined;
+            }
 
-                if (hasNewProgram) {
-                    this.projectProgramVersion++;
-                }
-                return !hasNewProgram;
-            } finally {
-                perfLogger.logStopUpdateGraph();
+            if (hasNewProgram) {
+                this.projectProgramVersion++;
             }
+            perfLogger.logStopUpdateGraph();
+            return !hasNewProgram;
         }
 
         /*@internal*/

src/server/utilities.ts

@@ -150,16 +150,13 @@ namespace ts.server {
         }
 
         private static run(self: ThrottledOperations, operationId: string, cb: () => void) {
-            try {
-                perfLogger.logStartScheduledOperation(operationId);
-                self.pendingTimeouts.delete(operationId);
-                if (self.logger) {
-                    self.logger.info(`Running: ${operationId}`);
-                }
-                cb();
-            } finally {
-                perfLogger.logStopScheduledOperation();
+            perfLogger.logStartScheduledOperation(operationId);
+            self.pendingTimeouts.delete(operationId);
+            if (self.logger) {
+                self.logger.info(`Running: ${operationId}`);
             }
+            cb();
+            perfLogger.logStopScheduledOperation();
         }
     }
 
@@ -179,19 +176,16 @@ namespace ts.server {
         private static run(self: GcTimer) {
             self.timerId = undefined;
 
-            try {
-                perfLogger.logStartScheduledOperation("GC collect");
-                const log = self.logger.hasLevel(LogLevel.requestTime);
-                const before = log && self.host.getMemoryUsage!(); // TODO: GH#18217
-
-                self.host.gc!(); // TODO: GH#18217
-                if (log) {
-                    const after = self.host.getMemoryUsage!(); // TODO: GH#18217
-                    self.logger.perftrc(`GC::before ${before}, after ${after}`);
-                }
-            } finally {
-                perfLogger.logStopScheduledOperation();
+            perfLogger.logStartScheduledOperation("GC collect");
+            const log = self.logger.hasLevel(LogLevel.requestTime);
+            const before = log && self.host.getMemoryUsage!(); // TODO: GH#18217
+
+            self.host.gc!(); // TODO: GH#18217
+            if (log) {
+                const after = self.host.getMemoryUsage!(); // TODO: GH#18217
+                self.logger.perftrc(`GC::before ${before}, after ${after}`);
             }
+            perfLogger.logStopScheduledOperation();
         }
     }