Use 'firstDefined' in 'enablePlugin' (microsoft#23825)

Andy · web-flow · commit 5aa0a79dacf1 · 2018-05-02T15:37:22.000-07:00
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -1092,14 +1092,14 @@ namespace ts.server {
                 this.projectService.logger.info(message);
             };
 
-            for (const searchPath of searchPaths) {
-                const resolvedModule = <PluginModuleFactory>Project.resolveModule(pluginConfigEntry.name, searchPath, this.projectService.host, log);
-                if (resolvedModule) {
-                    this.enableProxy(resolvedModule, pluginConfigEntry);
-                    return;
-                }
+            const resolvedModule = firstDefined(searchPaths, searchPath =>
+                <PluginModuleFactory | undefined>Project.resolveModule(pluginConfigEntry.name, searchPath, this.projectService.host, log));
+            if (resolvedModule) {
+                this.enableProxy(resolvedModule, pluginConfigEntry);
+            }
+            else {
+                this.projectService.logger.info(`Couldn't find ${pluginConfigEntry.name}`);
             }
-            this.projectService.logger.info(`Couldn't find ${pluginConfigEntry.name}`);
         }
 
         private enableProxy(pluginModuleFactory: PluginModuleFactory, configEntry: PluginImport) {
