8000 Remove middlewareaddon from being used anywhere · microsoft/vscode-python@b969f60 · GitHub
[go: up one dir, main page]
8000 Skip to content

Commit b969f60

Browse files
DonJayamanneDonJayamanne
committed
Remove middlewareaddon from being used anywhere
1 parent d331559 commit b969f60

File tree

3 files changed

+1
-61
lines changed

3 files changed

+1
-61
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
}

‎src/client/activation/languageClientMiddleware.ts

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,14 @@
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';
129

1310
export class LanguageClientMiddleware extends LanguageClientMiddlewareBase {
14-
public constructor(
15-
serviceContainer: IServiceContainer,
16-
private readonly serverType: LanguageServerType,
17-
serverVersion?: string,
18-
) {
11+
public constructor(serviceContainer: IServiceContainer, serverType: LanguageServerType, serverVersion?: string) {
1912
super(serviceContainer, serverType, sendTelemetryEvent, serverVersion);
2013
}
21-
22-
/**
23-
* Creates the HidingMiddleware if needed and sets up code to do so if needed after
24-
* Jupyter is installed.
25-
*
26-
* This method should be called from the constructor of derived classes. It is separated
27-
* from the constructor to allow derived classes to initialize before it is called.
28-
*/
29-
protected setupHidingMiddleware(serviceContainer: IServiceContainer) {
30-
const jupyterDependencyManager = serviceContainer.get<IJupyterExtensionDependencyManager>(
31-
IJupyterExtensionDependencyManager,
32-
);
33-
const disposables = serviceContainer.get<IDisposableRegistry>(IDisposableRegistry) || [];
34-
const extensions = serviceContainer.get<IExtensions>(IExtensions);
35-
36-
// Enable notebook support if jupyter support is installed
37-
if (this.shouldCreateHidingMiddleware(jupyterDependencyManager)) {
38-
this.notebookAddon = createHidingMiddleware();
39-
}
40-
41-
disposables.push(
42-
extensions?.onDidChange(async () => {
43-
await this.onExtensionChange(jupyterDependencyManager);
44-
}),
45-
);
46-
}
47-
48-
protected shouldCreateHidingMiddleware(jupyterDependencyManager: IJupyterExtensionDependencyManager): boolean {
49-
return (
50-
jupyterDependencyManager &&
51-
jupyterDependencyManager.isJupyterExtensionInstalled &&
52-
(this.serverType == LanguageServerType.Microsoft || this.serverType == LanguageServerType.Node)
53-
);
54-
}
55-
56-
protected async onExtensionChange(jupyterDependencyManager: IJupyterExtensionDependencyManager): Promise<void> {
57-
if (jupyterDependencyManager) {
58-
if (this.notebookAddon && !this.shouldCreateHidingMiddleware(jupyterDependencyManager)) {
59-
this.notebookAddon = undefined;
60-
} else if (!this.notebookAddon && this.shouldCreateHidingMiddleware(jupyterDependencyManager)) {
61-
this.notebookAddon = createHidingMiddleware();
62-
}
63-
}
64-
}
6514
}

‎src/client/activation/node/languageClientMiddleware.ts

Lines changed: 0 additions & 8 deletions
< A659 col width="40"/>
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)
0