fix: Review fixes: rename enableProxy, extend PluginSettings, formatting

Author: tomv564

src/plugins.ts

@@ -168,7 +168,13 @@ export class PluginLoader {
 	private resolveJavaScriptModule(moduleName: string, initialDir: string, host: ts.ModuleResolutionHost): string {
 		// TODO: this should set jsOnly=true to the internal resolver, but this parameter is not exposed on a public api.
 		const result =
-			ts.nodeModuleNameResolver(moduleName, /* containingFile */ initialDir.replace('\\', '/') + '/package.json', { moduleResolution: ts.ModuleResolutionKind.NodeJs, allowJs: true }, this.resolutionHost, undefined);
+			ts.nodeModuleNameResolver(
+				moduleName,
+				initialDir.replace('\\', '/') + '/package.json', /* containingFile */
+				{ moduleResolution: ts.ModuleResolutionKind.NodeJs, allowJs: true },
+				this.resolutionHost,
+				undefined
+			);
 		if (!result.resolvedModule) {
 			// this.logger.error(result.failedLookupLocations);
 			throw new Error(`Could not resolve JS module ${moduleName} starting at ${initialDir}.`);

src/project-manager.ts

@@ -923,7 +923,7 @@ export class ProjectConfiguration {
 		);
 		this.service = ts.createLanguageService(this.host, this.documentRegistry);
 		const pluginLoader = new PluginLoader(this.rootFilePath, this.fs, this.pluginSettings, this.logger);
-		pluginLoader.loadPlugins(options, this.enableProxy.bind(this) /* (factory, config) => this.enableProxy(factory, config)) */);
+		pluginLoader.loadPlugins(options, (factory, config) => this.wrapService(factory, config));
 		this.initialized = true;
 	}
 
@@ -932,7 +932,7 @@ export class ProjectConfiguration {
 	 * @param pluginModuleFactory function to create the module
 	 * @param configEntry extra settings from tsconfig to pass to the plugin module
 	 */
-	private enableProxy(pluginModuleFactory: PluginModuleFactory, configEntry: ts.PluginImport) {
+	private wrapService(pluginModuleFactory: PluginModuleFactory, configEntry: ts.PluginImport) {
 		try {
 			if (typeof pluginModuleFactory !== 'function') {
 				this.logger.info(`Skipped loading plugin ${configEntry.name} because it didn't expose a proper factory function`);

src/typescript-service.ts

@@ -87,9 +87,9 @@ export type TypeScriptServiceFactory = (client: LanguageClient, options?: TypeSc
 /**
  * Settings synced through `didChangeConfiguration`
  */
-export type Settings = {
+export interface Settings extends PluginSettings {
 	format: ts.FormatCodeSettings
-} & PluginSettings;
+}
 
 /**
  * Handles incoming requests and return responses. There is a one-to-one-to-one