Skip to content

Commit 8ea7f18

Browse files
committed
Remove middlewareaddon from being used anwyhere
1 parent 3dad6c9 commit 8ea7f18

File tree

3 files changed

+0
-52
lines changed

3 files changed

+0
-52
lines changed

src/client/activation/jedi/languageClientMiddleware.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ import { LanguageServerType } from '../types';
88
export class JediLanguageClientMiddleware extends LanguageClientMiddleware {
99
public constructor(serviceContainer: IServiceContainer, serverVersion?: string) {
1010
super(serviceContainer, LanguageServerType.Jedi, serverVersion);
11-
this.setupHidingMiddleware(serviceContainer);
1211
}
1312
}
Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
import { IJupyterExtensionDependencyManager } from '../common/application/types';
5-
import { IDisposableRegistry, IExtensions } from '../common/types';
64
import { IServiceContainer } from '../ioc/types';
75
import { sendTelemetryEvent } from '../telemetry';
8-
import { createHidingMiddleware } from './hidingMiddleware';
96

107
import { LanguageClientMiddlewareBase } from './languageClientMiddlewareBase';
118
import { LanguageServerType } from './types';
@@ -14,44 +11,4 @@ export class LanguageClientMiddleware extends LanguageClientMiddlewareBase {
1411
public constructor(serviceContainer: IServiceContainer, serverType: LanguageServerType, serverVersion?: string) {
1512
super(serviceContainer, serverType, sendTelemetryEvent, serverVersion);
1613
}
17-
18-
/**
19-
* Creates the HidingMiddleware if needed and sets up code to do so if needed after
20-
* Jupyter is installed.
21-
*
22-
* This method should be called from the constructor of derived classes. It is separated
23-
* from the constructor to allow derived classes to initialize before it is called.
24-
*/
25-
protected setupHidingMiddleware(serviceContainer: IServiceContainer) {
26-
const jupyterDependencyManager = serviceContainer.get<IJupyterExtensionDependencyManager>(
27-
IJupyterExtensionDependencyManager,
28-
);
29-
const disposables = serviceContainer.get<IDisposableRegistry>(IDisposableRegistry) || [];
30-
const extensions = serviceContainer.get<IExtensions>(IExtensions);
31-
32-
// Enable notebook support if jupyter support is installed
33-
if (this.shouldCreateHidingMiddleware(jupyterDependencyManager)) {
34-
this.notebookAddon = createHidingMiddleware();
35-
}
36-
37-
disposables.push(
38-
extensions?.onDidChange(async () => {
39-
await this.onExtensionChange(jupyterDependencyManager);
40-
}),
41-
);
42-
}
43-
44-
protected shouldCreateHidingMiddleware(jupyterDependencyManager: IJupyterExtensionDependencyManager): boolean {
45-
return jupyterDependencyManager && jupyterDependencyManager.isJupyterExtensionInstalled;
46-
}
47-
48-
protected async onExtensionChange(jupyterDependencyManager: IJupyterExtensionDependencyManager): Promise<void> {
49-
if (jupyterDependencyManager) {
50-
if (this.notebookAddon && !this.shouldCreateHidingMiddleware(jupyterDependencyManager)) {
51-
this.notebookAddon = undefined;
52-
} else if (!this.notebookAddon && this.shouldCreateHidingMiddleware(jupyterDependencyManager)) {
53-
this.notebookAddon = createHidingMiddleware();
54-
}
55-
}
56-
}
5714
}
Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
import { IJupyterExtensionDependencyManager } from '../../common/application/types';
54
import { IServiceContainer } from '../../ioc/types';
65
import { LanguageClientMiddleware } from '../languageClientMiddleware';
76

@@ -10,12 +9,5 @@ import { LanguageServerType } from '../types';
109
export class NodeLanguageClientMiddleware extends LanguageClientMiddleware {
1110
public constructor(serviceContainer: IServiceContainer, serverVersion?: string) {
1211
super(serviceContainer, LanguageServerType.Node, serverVersion);
13-
14-
this.setupHidingMiddleware(serviceContainer);
15-
}
16-
17-
// eslint-disable-next-line class-methods-use-this
18-
protected shouldCreateHidingMiddleware(_: IJupyterExtensionDependencyManager): boolean {
19-
return false;
2012
}
2113
}

0 commit comments

Comments
 (0)