Skip to content

Commit 538ff07

Browse files
mjbvzmjbvz
committed
Move logDirectoryProvide into server
1 parent 90fbd0e commit 538ff07

8 files changed

Lines changed: 53 additions & 6 deletions

File tree

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
import * as vscode from 'vscode';
7+
import { noopLogDirectoryProvider } from './tsServer/logDirectoryProvider';
8+
import { Api, getExtensionApi } from './api';
9+
import { registerCommands } from './commands/index';
10+
import { LanguageConfigurationManager } from './features/languageConfiguration';
11+
import { createLazyClientHost, lazilyActivateClient } from './lazyClientHost';
12+
import { CommandManager } from './utils/commandManager';
13+
import { PluginManager } from './utils/plugins';
14+
import { noopRequestCanceller } from './tsServer/cancellation';
15+
16+
export function activate(
17+
context: vscode.ExtensionContext
18+
): Api {
19+
const pluginManager = new PluginManager();
20+
context.subscriptions.push(pluginManager);
21+
22+
const commandManager = new CommandManager();
23+
context.subscriptions.push(commandManager);
24+
25+
const onCompletionAccepted = new vscode.EventEmitter<vscode.CompletionItem>();
26+
context.subscriptions.push(onCompletionAccepted);
27+
28+
const lazyClientHost = createLazyClientHost(context, pluginManager, commandManager, noopLogDirectoryProvider, {
29+
create: () => noopRequestCanceller
30+
31+
}, item => {
32+
onCompletionAccepted.fire(item);
33+
});
34+
35+
registerCommands(commandManager, lazyClientHost, pluginManager);
36+
// context.subscriptions.push(task.register(lazyClientHost.map(x => x.serviceClient)));
37+
context.subscriptions.push(new LanguageConfigurationManager());
38+
39+
import('./features/tsconfig').then(module => {
40+
context.subscriptions.push(module.register());
41+
});
42+
43+
context.subscriptions.push(lazilyActivateClient(lazyClientHost, pluginManager));
44+
45+
return getExtensionApi(onCompletionAccepted.event, pluginManager);
46+
}
47+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import * as rimraf from 'rimraf';
77
import * as vscode from 'vscode';
8+
import { NodeLogDirectoryProvider } from './tsServer/logDirectoryProvider.electron';
89
import { Api, getExtensionApi } from './api';
910
import { registerCommands } from './commands/index';
1011
import { LanguageConfigurationManager } from './features/languageConfiguration';
@@ -13,7 +14,6 @@ import { createLazyClientHost, lazilyActivateClient } from './lazyClientHost';
1314
import { NodeRequestCanceller } from './tsServer/cancellation.electron';
1415
import { CommandManager } from './utils/commandManager';
1516
import * as electron from './utils/electron';
16-
import { NodeLogDirectoryProvider } from './utils/logDirectoryProvider.electron';
1717
import { PluginManager } from './utils/plugins';
1818

1919
export function activate(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import * as fileSchemes from './utils/fileSchemes';
1212
import { standardLanguageDescriptions } from './utils/languageDescription';
1313
import * as ProjectStatus from './utils/largeProjectStatus';
1414
import { lazy, Lazy } from './utils/lazy';
15-
import { ILogDirectoryProvider } from './utils/logDirectoryProvider';
15+
import { ILogDirectoryProvider } from './tsServer/logDirectoryProvider';
1616
import ManagedFileContextManager from './utils/managedFileContext';
1717
import { PluginManager } from './utils/plugins';
1818

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import * as fs from 'fs';
77
import * as path from 'path';
88
import * as vscode from 'vscode';
99
import { ILogDirectoryProvider } from './logDirectoryProvider';
10-
import { memoize } from './memoize';
10+
import { memoize } from '../utils/memoize';
1111

1212
export class NodeLogDirectoryProvider implements ILogDirectoryProvider {
1313
public constructor(

extensions/typescript-language-features/src/utils/logDirectoryProvider.ts renamed to extensions/typescript-language-features/src/tsServer/logDirectoryProvider.ts

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { ClientCapabilities, ClientCapability } from '../typescriptService';
1010
import API from '../utils/api';
1111
import { SeparateSyntaxServerConfiguration, TsServerLogLevel, TypeScriptServiceConfiguration } from '../utils/configuration';
1212
import * as electron from '../utils/electron';
13-
import { ILogDirectoryProvider } from '../utils/logDirectoryProvider';
13+
import { ILogDirectoryProvider } from './logDirectoryProvider';
1414
import Logger from '../utils/logger';
1515
import { TypeScriptPluginPathsProvider } from '../utils/pluginPathsProvider';
1616
import { PluginManager } from '../utils/plugins';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { CommandManager } from './utils/commandManager';
2121
import { Disposable } from './utils/dispose';
2222
import * as errorCodes from './utils/errorCodes';
2323
import { DiagnosticLanguage, LanguageDescription } from './utils/languageDescription';
24-
import { ILogDirectoryProvider } from './utils/logDirectoryProvider';
24+
import { ILogDirectoryProvider } from './tsServer/logDirectoryProvider';
2525
import { PluginManager } from './utils/plugins';
2626
import * as typeConverters from './utils/typeConverters';
2727
import TypingsStatus, { AtaProgressReporter } from './utils/typingsStatus';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { TsServerLogLevel, TypeScriptServiceConfiguration } from './utils/config
2121
import { Disposable } from './utils/dispose';
2222
import * as fileSchemes from './utils/fileSchemes';
2323
import { onCaseInsenitiveFileSystem } from './utils/fileSystem';
24-
import { ILogDirectoryProvider } from './utils/logDirectoryProvider';
24+
import { ILogDirectoryProvider } from './tsServer/logDirectoryProvider';
2525
import Logger from './utils/logger';
2626
import { TypeScriptPluginPathsProvider } from './utils/pluginPathsProvider';
2727
import { PluginManager } from './utils/plugins';

0 commit comments

Comments
 (0)