Skip to content

Commit 9e042ae

Browse files
author
Akos Kitta
committed
fix: disabled undesired @theia/typehierarchy
Signed-off-by: Akos Kitta <[email protected]>
1 parent 3b8ed7f commit 9e042ae

File tree

4 files changed

+55
-0
lines changed

4 files changed

+55
-0
lines changed

arduino-ide-extension/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"@theia/scm": "1.31.1",
4141
"@theia/search-in-workspace": "1.31.1",
4242
"@theia/terminal": "1.31.1",
43+
"@theia/typehierarchy": "1.31.1",
4344
"@theia/workspace": "1.31.1",
4445
"@tippyjs/react": "^4.2.5",
4546
"@types/auth0-js": "^9.14.0",

arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

+13
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,10 @@ import { ThemeService } from './theia/core/theming';
329329
import { ThemeService as TheiaThemeService } from '@theia/core/lib/browser/theming';
330330
import { MonacoThemingService } from './theia/monaco/monaco-theming-service';
331331
import { MonacoThemingService as TheiaMonacoThemingService } from '@theia/monaco/lib/browser/monaco-theming-service';
332+
import { TypeHierarchyServiceProvider } from './theia/typehierarchy/type-hierarchy-service';
333+
import { TypeHierarchyServiceProvider as TheiaTypeHierarchyServiceProvider } from '@theia/typehierarchy/lib/browser/typehierarchy-service';
334+
import { TypeHierarchyContribution } from './theia/typehierarchy/type-hierarchy-contribution';
335+
import { TypeHierarchyContribution as TheiaTypeHierarchyContribution } from '@theia/typehierarchy/lib/browser/typehierarchy-contribution';
332336

333337
export default new ContainerModule((bind, unbind, isBound, rebind) => {
334338
// Commands and toolbar items
@@ -951,4 +955,13 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
951955
rebind(TheiaThemeService).toService(ThemeService);
952956
bind(MonacoThemingService).toSelf().inSingletonScope();
953957
rebind(TheiaMonacoThemingService).toService(MonacoThemingService);
958+
959+
// disable type-hierarchy support
960+
// https://github.com/eclipse-theia/theia/commit/16c88a584bac37f5cf3cc5eb92ffdaa541bda5be
961+
bind(TypeHierarchyServiceProvider).toSelf().inSingletonScope();
962+
rebind(TheiaTypeHierarchyServiceProvider).toService(
963+
TypeHierarchyServiceProvider
964+
);
965+
bind(TypeHierarchyContribution).toSelf().inSingletonScope();
966+
rebind(TheiaTypeHierarchyContribution).toService(TypeHierarchyContribution);
954967
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import { KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
2+
import { CommandRegistry } from '@theia/core/lib/common/command';
3+
import { MenuModelRegistry } from '@theia/core/lib/common/menu';
4+
import { injectable } from '@theia/core/shared/inversify';
5+
import {
6+
TypeHierarchyCommands,
7+
TypeHierarchyContribution as TheiaTypeHierarchyContribution,
8+
} from '@theia/typehierarchy/lib/browser/typehierarchy-contribution';
9+
10+
@injectable()
11+
export class TypeHierarchyContribution extends TheiaTypeHierarchyContribution {
12+
protected override init(): void {
13+
// NOOP
14+
}
15+
16+
override registerCommands(registry: CommandRegistry): void {
17+
super.registerCommands(registry);
18+
registry.unregisterCommand(TypeHierarchyCommands.OPEN_SUBTYPE.id);
19+
registry.unregisterCommand(TypeHierarchyCommands.OPEN_SUPERTYPE.id);
20+
}
21+
22+
override registerMenus(registry: MenuModelRegistry): void {
23+
super.registerMenus(registry);
24+
registry.unregisterMenuAction(TypeHierarchyCommands.OPEN_SUBTYPE.id);
25+
registry.unregisterMenuAction(TypeHierarchyCommands.OPEN_SUPERTYPE.id);
26+
}
27+
28+
override registerKeybindings(registry: KeybindingRegistry): void {
29+
super.registerKeybindings(registry);
30+
registry.unregisterKeybinding(TypeHierarchyCommands.OPEN_SUBTYPE.id);
31+
}
32+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { injectable } from '@theia/core/shared/inversify';
2+
import { TypeHierarchyServiceProvider as TheiaTypeHierarchyServiceProvider } from '@theia/typehierarchy/lib/browser/typehierarchy-service';
3+
4+
@injectable()
5+
export class TypeHierarchyServiceProvider extends TheiaTypeHierarchyServiceProvider {
6+
override init(): void {
7+
// NOOP
8+
}
9+
}

0 commit comments

Comments
 (0)