Move logDirectoryProvide into server

extensions/typescript-language-features/src/extension.browser.ts

@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { noopLogDirectoryProvider } from './tsServer/logDirectoryProvider';
+import { Api, getExtensionApi } from './api';
+import { registerCommands } from './commands/index';
+import { LanguageConfigurationManager } from './features/languageConfiguration';
+import { createLazyClientHost, lazilyActivateClient } from './lazyClientHost';
+import { CommandManager } from './utils/commandManager';
+import { PluginManager } from './utils/plugins';
+import { noopRequestCanceller } from './tsServer/cancellation';
+
+export function activate(
+	context: vscode.ExtensionContext
+): Api {
+	const pluginManager = new PluginManager();
+	context.subscriptions.push(pluginManager);
+
+	const commandManager = new CommandManager();
+	context.subscriptions.push(commandManager);
+
+	const onCompletionAccepted = new vscode.EventEmitter<vscode.CompletionItem>();
+	context.subscriptions.push(onCompletionAccepted);
+
+	const lazyClientHost = createLazyClientHost(context, pluginManager, commandManager, noopLogDirectoryProvider, {
+		create: () => noopRequestCanceller
+
+	}, item => {
+		onCompletionAccepted.fire(item);
+	});
+
+	registerCommands(commandManager, lazyClientHost, pluginManager);
+	// context.subscriptions.push(task.register(lazyClientHost.map(x => x.serviceClient)));
+	context.subscriptions.push(new LanguageConfigurationManager());
+
+	import('./features/tsconfig').then(module => {
+		context.subscriptions.push(module.register());
+	});
+
+	context.subscriptions.push(lazilyActivateClient(lazyClientHost, pluginManager));
+
+	return getExtensionApi(onCompletionAccepted.event, pluginManager);
+}
+

extensions/typescript-language-features/src/extension.ts

@@ -5,6 +5,7 @@
 
 import * as rimraf from 'rimraf';
 import * as vscode from 'vscode';
+import { NodeLogDirectoryProvider } from './tsServer/logDirectoryProvider.electron';
 import { Api, getExtensionApi } from './api';
 import { registerCommands } from './commands/index';
 import { LanguageConfigurationManager } from './features/languageConfiguration';
@@ -13,7 +14,6 @@ import { createLazyClientHost, lazilyActivateClient } from './lazyClientHost';
 import { NodeRequestCanceller } from './tsServer/cancellation.electron';
 import { CommandManager } from './utils/commandManager';
 import * as electron from './utils/electron';
-import { NodeLogDirectoryProvider } from './utils/logDirectoryProvider.electron';
 import { PluginManager } from './utils/plugins';
 
 export function activate(

extensions/typescript-language-features/src/lazyClientHost.ts

@@ -12,7 +12,7 @@ import * as fileSchemes from './utils/fileSchemes';
 import { standardLanguageDescriptions } from './utils/languageDescription';
 import * as ProjectStatus from './utils/largeProjectStatus';
 import { lazy, Lazy } from './utils/lazy';
-import { ILogDirectoryProvider } from './utils/logDirectoryProvider';
+import { ILogDirectoryProvider } from './tsServer/logDirectoryProvider';
 import ManagedFileContextManager from './utils/managedFileContext';
 import { PluginManager } from './utils/plugins';
 

extensions/typescript-language-features/src/tsServer/logDirectoryProvider.electron.ts

@@ -7,7 +7,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import { ILogDirectoryProvider } from './logDirectoryProvider';
-import { memoize } from './memoize';
+import { memoize } from '../utils/memoize';
 
 export class NodeLogDirectoryProvider implements ILogDirectoryProvider {
 	public constructor(

extensions/typescript-language-features/src/tsServer/spawner.ts

@@ -10,7 +10,7 @@ import { ClientCapabilities, ClientCapability } from '../typescriptService';
 import API from '../utils/api';
 import { SeparateSyntaxServerConfiguration, TsServerLogLevel, TypeScriptServiceConfiguration } from '../utils/configuration';
 import * as electron from '../utils/electron';
-import { ILogDirectoryProvider } from '../utils/logDirectoryProvider';
+import { ILogDirectoryProvider } from './logDirectoryProvider';
 import Logger from '../utils/logger';
 import { TypeScriptPluginPathsProvider } from '../utils/pluginPathsProvider';
 import { PluginManager } from '../utils/plugins';

extensions/typescript-language-features/src/typeScriptServiceClientHost.ts

@@ -21,7 +21,7 @@ import { CommandManager } from './utils/commandManager';
 import { Disposable } from './utils/dispose';
 import * as errorCodes from './utils/errorCodes';
 import { DiagnosticLanguage, LanguageDescription } from './utils/languageDescription';
-import { ILogDirectoryProvider } from './utils/logDirectoryProvider';
+import { ILogDirectoryProvider } from './tsServer/logDirectoryProvider';
 import { PluginManager } from './utils/plugins';
 import * as typeConverters from './utils/typeConverters';
 import TypingsStatus, { AtaProgressReporter } from './utils/typingsStatus';

extensions/typescript-language-features/src/typescriptServiceClient.ts

@@ -21,7 +21,7 @@ import { TsServerLogLevel, TypeScriptServiceConfiguration } from './utils/config
 import { Disposable } from './utils/dispose';
 import * as fileSchemes from './utils/fileSchemes';
 import { onCaseInsenitiveFileSystem } from './utils/fileSystem';
-import { ILogDirectoryProvider } from './utils/logDirectoryProvider';
+import { ILogDirectoryProvider } from './tsServer/logDirectoryProvider';
 import Logger from './utils/logger';
 import { TypeScriptPluginPathsProvider } from './utils/pluginPathsProvider';
 import { PluginManager } from './utils/plugins';