diff --git a/examples/playwright/src/theia-explorer-view.ts b/examples/playwright/src/theia-explorer-view.ts index 732432dd031c8..6417fa46520fd 100644 --- a/examples/playwright/src/theia-explorer-view.ts +++ b/examples/playwright/src/theia-explorer-view.ts @@ -64,7 +64,7 @@ export const DOT_FILES_FILTER: TheiaExplorerFileStatNodePredicate = async node = export class TheiaExplorerView extends TheiaView { - constructor(override app: TheiaApp) { + constructor(app: TheiaApp) { super(TheiaExplorerViewData, app); } diff --git a/examples/playwright/src/theia-notification-overlay.ts b/examples/playwright/src/theia-notification-overlay.ts index 24882da6d2c63..d0f9d4e6fd08f 100644 --- a/examples/playwright/src/theia-notification-overlay.ts +++ b/examples/playwright/src/theia-notification-overlay.ts @@ -23,7 +23,7 @@ export class TheiaNotificationOverlay extends TheiaPageObject { protected readonly HEADER_NOTIFICATIONS = 'NOTIFICATIONS'; protected readonly HEADER_NO_NOTIFICATIONS = 'NO NEW NOTIFICATIONS'; - constructor(override app: TheiaApp, protected notificationIndicator: TheiaNotificationIndicator) { + constructor(app: TheiaApp, protected notificationIndicator: TheiaNotificationIndicator) { super(app); } diff --git a/packages/core/src/browser/dialogs.ts b/packages/core/src/browser/dialogs.ts index 7b30a3866fe00..d15256185c9af 100644 --- a/packages/core/src/browser/dialogs.ts +++ b/packages/core/src/browser/dialogs.ts @@ -362,8 +362,7 @@ export class ConfirmDialog extends AbstractDialog { protected confirmed = true; constructor( - @inject(ConfirmDialogProps) - protected override readonly props: ConfirmDialogProps + @inject(ConfirmDialogProps) protected override readonly props: ConfirmDialogProps ) { super(props); @@ -419,8 +418,7 @@ export class SingleTextInputDialog extends AbstractDialog { protected readonly inputField: HTMLInputElement; constructor( - @inject(SingleTextInputDialogProps) - protected override props: SingleTextInputDialogProps + @inject(SingleTextInputDialogProps) protected override props: SingleTextInputDialogProps ) { super(props); diff --git a/packages/core/src/browser/dialogs/react-dialog.tsx b/packages/core/src/browser/dialogs/react-dialog.tsx index ca47c8ffd4f83..92f9a6eb68613 100644 --- a/packages/core/src/browser/dialogs/react-dialog.tsx +++ b/packages/core/src/browser/dialogs/react-dialog.tsx @@ -26,7 +26,7 @@ export abstract class ReactDialog extends AbstractDialog { protected readonly onRender = new DisposableCollection(); constructor( - @inject(DialogProps) protected override readonly props: DialogProps + @inject(DialogProps) props: DialogProps ) { super(props); this.toDispose.push(Disposable.create(() => { diff --git a/packages/core/src/browser/tree/tree-compression/compressed-tree-widget.tsx b/packages/core/src/browser/tree/tree-compression/compressed-tree-widget.tsx index 3b0ea7d9e5744..c2dd2df298b1f 100644 --- a/packages/core/src/browser/tree/tree-compression/compressed-tree-widget.tsx +++ b/packages/core/src/browser/tree/tree-compression/compressed-tree-widget.tsx @@ -42,9 +42,9 @@ export class CompressedTreeWidget extends TreeViewWelcomeWidget { @inject(TreeCompressionService) protected readonly compressionService: TreeCompressionService; constructor( - @inject(TreeProps) override readonly props: TreeProps, + @inject(TreeProps) props: TreeProps, @inject(CompressedTreeModel) override readonly model: CompressedTreeModel, - @inject(ContextMenuRenderer) protected override readonly contextMenuRenderer: ContextMenuRenderer, + @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer, ) { super(props, model, contextMenuRenderer); } diff --git a/packages/debug/src/browser/editor/debug-hover-widget.ts b/packages/debug/src/browser/editor/debug-hover-widget.ts index 954f798bd86d9..12f8f979503a0 100644 --- a/packages/debug/src/browser/editor/debug-hover-widget.ts +++ b/packages/debug/src/browser/editor/debug-hover-widget.ts @@ -56,9 +56,6 @@ export function createDebugHoverWidgetContainer(parent: interfaces.Container, ed @injectable() export class DebugHoverWidget extends SourceTreeWidget implements monaco.editor.IContentWidget { - // TODO: Is this still needed? - // protected override toDispose = new DisposableCollection(); - @inject(DebugEditor) protected readonly editor: DebugEditor; diff --git a/packages/editor-preview/src/browser/editor-preview-widget.ts b/packages/editor-preview/src/browser/editor-preview-widget.ts index 20b8ed89b62cb..818da5131967b 100644 --- a/packages/editor-preview/src/browser/editor-preview-widget.ts +++ b/packages/editor-preview/src/browser/editor-preview-widget.ts @@ -35,8 +35,8 @@ export class EditorPreviewWidget extends EditorWidget { } constructor( - override readonly editor: TextEditor, - protected override readonly selectionService: SelectionService + editor: TextEditor, + selectionService: SelectionService ) { super(editor, selectionService); this.toDispose.push(this.onDidChangePreviewStateEmitter); diff --git a/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumbs-container.ts b/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumbs-container.ts index 9fd7747c39070..1e93d6ec00d50 100644 --- a/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumbs-container.ts +++ b/packages/filesystem/src/browser/breadcrumbs/filepath-breadcrumbs-container.ts @@ -40,7 +40,7 @@ export class BreadcrumbsFileTreeWidget extends FileTreeWidget { protected readonly openerService: OpenerService; constructor( - @inject(TreeProps) override readonly props: TreeProps, + @inject(TreeProps) props: TreeProps, @inject(FileTreeModel) override readonly model: FileTreeModel, @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer ) { diff --git a/packages/filesystem/src/browser/file-dialog/file-dialog-widget.ts b/packages/filesystem/src/browser/file-dialog/file-dialog-widget.ts index 269f6738d184b..aaa2c88980312 100644 --- a/packages/filesystem/src/browser/file-dialog/file-dialog-widget.ts +++ b/packages/filesystem/src/browser/file-dialog/file-dialog-widget.ts @@ -28,7 +28,7 @@ export class FileDialogWidget extends FileTreeWidget { private _disableFileSelection: boolean = false; constructor( - @inject(TreeProps) override readonly props: TreeProps, + @inject(TreeProps) props: TreeProps, @inject(FileDialogModel) override readonly model: FileDialogModel, @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer ) { diff --git a/packages/filesystem/src/browser/file-tree/file-tree-widget.tsx b/packages/filesystem/src/browser/file-tree/file-tree-widget.tsx index f745930dce099..ac559e64a072c 100644 --- a/packages/filesystem/src/browser/file-tree/file-tree-widget.tsx +++ b/packages/filesystem/src/browser/file-tree/file-tree-widget.tsx @@ -44,7 +44,7 @@ export class FileTreeWidget extends CompressedTreeWidget { protected readonly iconThemeService: IconThemeService; constructor( - @inject(TreeProps) override readonly props: TreeProps, + @inject(TreeProps) props: TreeProps, @inject(FileTreeModel) override readonly model: FileTreeModel, @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer ) { diff --git a/packages/keymaps/src/browser/keybindings-widget.tsx b/packages/keymaps/src/browser/keybindings-widget.tsx index b487a273f7ca2..47e9847cdce59 100644 --- a/packages/keymaps/src/browser/keybindings-widget.tsx +++ b/packages/keymaps/src/browser/keybindings-widget.tsx @@ -694,7 +694,7 @@ class EditKeybindingDialog extends SingleTextInputDialog { protected resetButton: HTMLButtonElement | undefined; constructor( - @inject(SingleTextInputDialogProps) protected override readonly props: SingleTextInputDialogProps, + @inject(SingleTextInputDialogProps) props: SingleTextInputDialogProps, @inject(KeymapsService) protected readonly keymapsService: KeymapsService, item: KeybindingItem ) { diff --git a/packages/markers/src/browser/problem/problem-selection.ts b/packages/markers/src/browser/problem/problem-selection.ts index 8be021461b7c0..c8d0182f4e8e1 100644 --- a/packages/markers/src/browser/problem/problem-selection.ts +++ b/packages/markers/src/browser/problem/problem-selection.ts @@ -30,8 +30,8 @@ export namespace ProblemSelection { export class CommandHandler extends SelectionCommandHandler { constructor( - protected override readonly selectionService: SelectionService, - protected override readonly options: SelectionCommandHandler.Options + selectionService: SelectionService, + options: SelectionCommandHandler.Options ) { super( selectionService, diff --git a/packages/markers/src/browser/problem/problem-tree-model.ts b/packages/markers/src/browser/problem/problem-tree-model.ts index bcc6f1f6218b5..0ae83baaaf5e1 100644 --- a/packages/markers/src/browser/problem/problem-tree-model.ts +++ b/packages/markers/src/browser/problem/problem-tree-model.ts @@ -29,9 +29,10 @@ import { ProblemUtils } from './problem-utils'; export class ProblemTree extends MarkerTree { constructor( - @inject(ProblemManager) protected readonly problemManager: ProblemManager, - @inject(MarkerOptions) protected override readonly markerOptions: MarkerOptions) { - super(problemManager, markerOptions); + @inject(ProblemManager) markerManager: ProblemManager, + @inject(MarkerOptions) markerOptions: MarkerOptions + ) { + super(markerManager, markerOptions); } protected override getMarkerNodes(parent: MarkerInfoNode, markers: Marker[]): MarkerNode[] { diff --git a/packages/markers/src/browser/problem/problem-widget.tsx b/packages/markers/src/browser/problem/problem-widget.tsx index 4c78175d2c52a..32cb1768bf555 100644 --- a/packages/markers/src/browser/problem/problem-widget.tsx +++ b/packages/markers/src/browser/problem/problem-widget.tsx @@ -42,11 +42,13 @@ export class ProblemWidget extends TreeWidget { @inject(ApplicationShell) protected readonly shell: ApplicationShell; + @inject(ProblemManager) + protected readonly problemManager: ProblemManager; + constructor( - @inject(ProblemManager) protected readonly problemManager: ProblemManager, - @inject(TreeProps) readonly treeProps: TreeProps, + @inject(TreeProps) treeProps: TreeProps, @inject(ProblemTreeModel) override readonly model: ProblemTreeModel, - @inject(ContextMenuRenderer) override readonly contextMenuRenderer: ContextMenuRenderer + @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer ) { super(treeProps, model, contextMenuRenderer); diff --git a/packages/monaco/src/browser/monaco-diff-editor.ts b/packages/monaco/src/browser/monaco-diff-editor.ts index 13bb41a2fe73a..5385c29ec9b14 100644 --- a/packages/monaco/src/browser/monaco-diff-editor.ts +++ b/packages/monaco/src/browser/monaco-diff-editor.ts @@ -37,8 +37,8 @@ export class MonacoDiffEditor extends MonacoEditor { protected _diffNavigator: DiffNavigator; constructor( - override readonly uri: URI, - override readonly node: HTMLElement, + uri: URI, + node: HTMLElement, readonly originalModel: MonacoEditorModel, readonly modifiedModel: MonacoEditorModel, services: MonacoEditorServices, diff --git a/packages/navigator/src/browser/navigator-widget.tsx b/packages/navigator/src/browser/navigator-widget.tsx index b60c2083823a7..4ddd8ceba4e55 100644 --- a/packages/navigator/src/browser/navigator-widget.tsx +++ b/packages/navigator/src/browser/navigator-widget.tsx @@ -17,9 +17,9 @@ import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; import { Message } from '@theia/core/shared/@phosphor/messaging'; import URI from '@theia/core/lib/common/uri'; -import { CommandService, notEmpty, SelectionService } from '@theia/core/lib/common'; +import { CommandService, notEmpty } from '@theia/core/lib/common'; import { - CorePreferences, Key, TreeModel, SelectableTreeNode, TREE_NODE_SEGMENT_CLASS, TREE_NODE_TAIL_CLASS, + Key, TreeModel, SelectableTreeNode, TREE_NODE_SEGMENT_CLASS, TREE_NODE_TAIL_CLASS, TreeDecoration, NodeProps, OpenerService, ContextMenuRenderer, ExpandableTreeNode, TreeProps, TreeNode } from '@theia/core/lib/browser'; import { FileTreeWidget, FileNode, DirNode, FileStatNode } from '@theia/filesystem/lib/browser'; @@ -40,21 +40,16 @@ export const CLASS = 'theia-Files'; @injectable() export class FileNavigatorWidget extends FileTreeWidget { - @inject(CorePreferences) protected override corePreferences: CorePreferences; - - @inject(NavigatorContextKeyService) - protected readonly contextKeyService: NavigatorContextKeyService; - + @inject(ApplicationShell) protected readonly shell: ApplicationShell; + @inject(CommandService) protected readonly commandService: CommandService; + @inject(NavigatorContextKeyService) protected readonly contextKeyService: NavigatorContextKeyService; @inject(OpenerService) protected readonly openerService: OpenerService; + @inject(WorkspaceService) protected readonly workspaceService: WorkspaceService; constructor( - @inject(TreeProps) override readonly props: TreeProps, + @inject(TreeProps) props: TreeProps, @inject(FileNavigatorModel) override readonly model: FileNavigatorModel, @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer, - @inject(CommandService) protected readonly commandService: CommandService, - @inject(SelectionService) protected override readonly selectionService: SelectionService, - @inject(WorkspaceService) protected readonly workspaceService: WorkspaceService, - @inject(ApplicationShell) protected readonly shell: ApplicationShell ) { super(props, model, contextMenuRenderer); this.id = FILE_NAVIGATOR_ID; diff --git a/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-widget.tsx b/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-widget.tsx index 397879cb6876d..94fb0c6e2f5d8 100644 --- a/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-widget.tsx +++ b/packages/navigator/src/browser/open-editors-widget/navigator-open-editors-widget.tsx @@ -79,9 +79,9 @@ export class OpenEditorsWidget extends FileTreeWidget { } constructor( - @inject(TreeProps) override readonly props: TreeProps, + @inject(TreeProps) props: TreeProps, @inject(OpenEditorsModel) override readonly model: OpenEditorsModel, - @inject(ContextMenuRenderer) protected override readonly contextMenuRenderer: ContextMenuRenderer + @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer ) { super(props, model, contextMenuRenderer); } diff --git a/packages/outline-view/src/browser/outline-view-tree-model.ts b/packages/outline-view/src/browser/outline-view-tree-model.ts index 67e9b5c5b1126..3232a49474139 100644 --- a/packages/outline-view/src/browser/outline-view-tree-model.ts +++ b/packages/outline-view/src/browser/outline-view-tree-model.ts @@ -14,15 +14,12 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 ********************************************************************************/ -import { injectable, inject } from '@theia/core/shared/inversify'; -import { CompositeTreeNode, TreeModelImpl, TreeExpansionService, ExpandableTreeNode, TreeNode } from '@theia/core/lib/browser'; +import { injectable } from '@theia/core/shared/inversify'; +import { CompositeTreeNode, TreeModelImpl, ExpandableTreeNode, TreeNode } from '@theia/core/lib/browser'; @injectable() export class OutlineViewTreeModel extends TreeModelImpl { - @inject(TreeExpansionService) - protected override readonly expansionService: TreeExpansionService; - /** * Handle the expansion of the tree node. * - The method is a no-op in order to preserve focus on the editor diff --git a/packages/outline-view/src/browser/outline-view-widget.tsx b/packages/outline-view/src/browser/outline-view-widget.tsx index 899fcb6743c5d..f8d1c866c36b4 100644 --- a/packages/outline-view/src/browser/outline-view-widget.tsx +++ b/packages/outline-view/src/browser/outline-view-widget.tsx @@ -79,9 +79,9 @@ export class OutlineViewWidget extends TreeWidget { readonly onDidChangeOpenStateEmitter = new Emitter(); constructor( - @inject(TreeProps) protected readonly treeProps: TreeProps, - @inject(OutlineViewTreeModel) model: OutlineViewTreeModel, - @inject(ContextMenuRenderer) protected override readonly contextMenuRenderer: ContextMenuRenderer + @inject(TreeProps) treeProps: TreeProps, + @inject(OutlineViewTreeModel) override readonly model: OutlineViewTreeModel, + @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer ) { super(treeProps, model, contextMenuRenderer); diff --git a/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx b/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx index 5e232d47e2711..4b352db361903 100644 --- a/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx +++ b/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx @@ -250,9 +250,6 @@ export class TreeViewWidget extends TreeViewWelcomeWidget { @inject(TooltipService) protected readonly tooltipService: TooltipService; - protected override readonly onDidChangeVisibilityEmitter = new Emitter(); - override readonly onDidChangeVisibility = this.onDidChangeVisibilityEmitter.event; - @postConstruct() protected override init(): void { super.init(); diff --git a/packages/preferences/src/browser/folder-preference-provider.ts b/packages/preferences/src/browser/folder-preference-provider.ts index 9552341f9da51..1c53a0828d52d 100644 --- a/packages/preferences/src/browser/folder-preference-provider.ts +++ b/packages/preferences/src/browser/folder-preference-provider.ts @@ -18,7 +18,6 @@ import { inject, injectable } from '@theia/core/shared/inversify'; import URI from '@theia/core/lib/common/uri'; import { PreferenceScope } from '@theia/core/lib/browser'; import { FileStat } from '@theia/filesystem/lib/common/files'; -import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service'; import { SectionPreferenceProvider } from './section-preference-provider'; export const FolderPreferenceProviderFactory = Symbol('FolderPreferenceProviderFactory'); @@ -35,7 +34,6 @@ export interface FolderPreferenceProviderOptions { @injectable() export class FolderPreferenceProvider extends SectionPreferenceProvider { - @inject(WorkspaceService) protected override readonly workspaceService: WorkspaceService; @inject(FolderPreferenceProviderFolder) protected readonly folder: FileStat; private _folderUri: URI; diff --git a/packages/preferences/src/browser/views/preference-tree-widget.tsx b/packages/preferences/src/browser/views/preference-tree-widget.tsx index bfc408cddadb0..b88564166d07e 100644 --- a/packages/preferences/src/browser/views/preference-tree-widget.tsx +++ b/packages/preferences/src/browser/views/preference-tree-widget.tsx @@ -16,7 +16,6 @@ import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; import { - ContextMenuRenderer, ExpandableTreeNode, TreeNode, TreeProps, @@ -35,7 +34,6 @@ export class PreferencesTreeWidget extends TreeWidget { @inject(PreferenceTreeModel) override readonly model: PreferenceTreeModel; @inject(TreeProps) protected readonly treeProps: TreeProps; - @inject(ContextMenuRenderer) protected override readonly contextMenuRenderer: ContextMenuRenderer; @postConstruct() override init(): void { diff --git a/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-widget.tsx b/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-widget.tsx index b634c10813233..8e21a5198b372 100644 --- a/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-widget.tsx +++ b/packages/property-view/src/browser/resource-property-view/resource-property-view-tree-widget.tsx @@ -16,7 +16,6 @@ import { ContextMenuRenderer, - LabelProvider, NodeProps, TreeModel, TreeNode, @@ -45,12 +44,10 @@ export class ResourcePropertyViewTreeWidget extends TreeWidget implements Proper protected propertiesTree: Map; protected currentSelection: Object | undefined; - @inject(LabelProvider) protected override readonly labelProvider: LabelProvider; - constructor( - @inject(TreeProps) override readonly props: TreeProps, + @inject(TreeProps) props: TreeProps, @inject(TreeModel) model: TreeModel, - @inject(ContextMenuRenderer) protected override readonly contextMenuRenderer: ContextMenuRenderer + @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer ) { super(props, model, contextMenuRenderer); diff --git a/packages/scm-extra/src/browser/history/scm-history-widget.tsx b/packages/scm-extra/src/browser/history/scm-history-widget.tsx index 4277459d2abc8..fd2b3c74fd635 100644 --- a/packages/scm-extra/src/browser/history/scm-history-widget.tsx +++ b/packages/scm-extra/src/browser/history/scm-history-widget.tsx @@ -21,7 +21,6 @@ import { CancellationTokenSource } from '@theia/core/lib/common/cancellation'; import { Message } from '@theia/core/shared/@phosphor/messaging'; import { AutoSizer, List, ListRowRenderer, ListRowProps, InfiniteLoader, IndexRange, ScrollParams, CellMeasurerCache, CellMeasurer } from '@theia/core/shared/react-virtualized'; import URI from '@theia/core/lib/common/uri'; -import { ScmService } from '@theia/scm/lib/browser/scm-service'; import { ScmHistoryProvider } from '.'; import { SCM_HISTORY_ID, SCM_HISTORY_MAX_COUNT, SCM_HISTORY_LABEL } from './scm-history-contribution'; import { ScmHistoryCommit, ScmFileChange, ScmFileChangeNode } from '../scm-file-change-node'; @@ -88,7 +87,6 @@ export class ScmHistoryWidget extends ScmNavigableListWidget protected historySupport: ScmHistorySupport | undefined; constructor( - @inject(ScmService) protected override readonly scmService: ScmService, @inject(OpenerService) protected readonly openerService: OpenerService, @inject(ApplicationShell) protected readonly shell: ApplicationShell, @inject(FileService) protected readonly fileService: FileService, diff --git a/packages/scm-extra/src/browser/scm-navigable-list-widget.tsx b/packages/scm-extra/src/browser/scm-navigable-list-widget.tsx index 356833c305f0e..474cf8efa891e 100644 --- a/packages/scm-extra/src/browser/scm-navigable-list-widget.tsx +++ b/packages/scm-extra/src/browser/scm-navigable-list-widget.tsx @@ -34,8 +34,7 @@ export abstract class ScmNavigableListWidget e @inject(ScmService) protected readonly scmService: ScmService; @inject(LabelProvider) protected readonly labelProvider: LabelProvider; - @inject(ScmFileChangeLabelProvider) - protected readonly scmLabelProvider: ScmFileChangeLabelProvider; + @inject(ScmFileChangeLabelProvider) protected readonly scmLabelProvider: ScmFileChangeLabelProvider; constructor() { super(); diff --git a/packages/scm/src/browser/scm-tree-widget.tsx b/packages/scm/src/browser/scm-tree-widget.tsx index dd01af6467027..dc6804f81a887 100644 --- a/packages/scm/src/browser/scm-tree-widget.tsx +++ b/packages/scm/src/browser/scm-tree-widget.tsx @@ -57,17 +57,17 @@ export class ScmTreeWidget extends TreeWidget { @inject(DecorationsService) protected readonly decorationsService: DecorationsService; @inject(ColorRegistry) protected readonly colors: ColorRegistry; - override model: ScmTreeModel; + // TODO: Make TreeWidget generic to better type those fields. + override readonly model: ScmTreeModel; constructor( - @inject(TreeProps) override readonly props: TreeProps, - @inject(TreeModel) readonly treeModel: TreeModel, - @inject(ContextMenuRenderer) protected override readonly contextMenuRenderer: ContextMenuRenderer, + @inject(TreeProps) props: TreeProps, + @inject(TreeModel) treeModel: ScmTreeModel, + @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer, ) { super(props, treeModel, contextMenuRenderer); this.id = ScmTreeWidget.ID; this.addClass('groups-outer-container'); - this.model = treeModel as ScmTreeModel; } set viewMode(id: 'tree' | 'list') { diff --git a/packages/search-in-workspace/src/browser/search-in-workspace-result-tree-widget.tsx b/packages/search-in-workspace/src/browser/search-in-workspace-result-tree-widget.tsx index d9679b633e516..4ab11e574845d 100644 --- a/packages/search-in-workspace/src/browser/search-in-workspace-result-tree-widget.tsx +++ b/packages/search-in-workspace/src/browser/search-in-workspace-result-tree-widget.tsx @@ -153,9 +153,9 @@ export class SearchInWorkspaceResultTreeWidget extends TreeWidget { @inject(FileService) protected readonly fileService: FileService; constructor( - @inject(TreeProps) override readonly props: TreeProps, - @inject(TreeModel) override readonly model: TreeModel, - @inject(ContextMenuRenderer) protected override readonly contextMenuRenderer: ContextMenuRenderer + @inject(TreeProps) props: TreeProps, + @inject(TreeModel) model: TreeModel, + @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer ) { super(props, model, contextMenuRenderer); diff --git a/packages/task/src/browser/quick-open-task.ts b/packages/task/src/browser/quick-open-task.ts index 5db68376d7411..dea51803cb7fa 100644 --- a/packages/task/src/browser/quick-open-task.ts +++ b/packages/task/src/browser/quick-open-task.ts @@ -383,15 +383,15 @@ export class QuickOpenTask implements QuickAccessProvider { export class TaskRunQuickOpenItem implements QuickPickItem { constructor( - public readonly token: number, - public readonly task: TaskConfiguration, + readonly token: number, + readonly task: TaskConfiguration, protected taskService: TaskService, protected isMulti: boolean, protected readonly taskDefinitionRegistry: TaskDefinitionRegistry, protected readonly taskNameResolver: TaskNameResolver, protected readonly taskSourceResolver: TaskSourceResolver, protected taskConfigurationManager: TaskConfigurationManager, - public readonly buttons?: Array + readonly buttons?: Array ) { } get label(): string { @@ -423,15 +423,15 @@ export class TaskRunQuickOpenItem implements QuickPickItem { export class ConfigureBuildOrTestTaskQuickOpenItem extends TaskRunQuickOpenItem { constructor( - public override readonly token: number, - public override readonly task: TaskConfiguration, - protected override readonly taskService: TaskService, - protected override readonly isMulti: boolean, - protected override readonly taskNameResolver: TaskNameResolver, + token: number, + task: TaskConfiguration, + taskService: TaskService, + isMulti: boolean, + taskNameResolver: TaskNameResolver, protected readonly isBuildTask: boolean, - protected override readonly taskConfigurationManager: TaskConfigurationManager, - protected override readonly taskDefinitionRegistry: TaskDefinitionRegistry, - protected override readonly taskSourceResolver: TaskSourceResolver + taskConfigurationManager: TaskConfigurationManager, + taskDefinitionRegistry: TaskDefinitionRegistry, + taskSourceResolver: TaskSourceResolver ) { super(token, task, taskService, isMulti, taskDefinitionRegistry, taskNameResolver, taskSourceResolver, taskConfigurationManager); } diff --git a/packages/task/src/node/custom/custom-task.ts b/packages/task/src/node/custom/custom-task.ts index 638fecb1589ed..af63edaffbfe6 100644 --- a/packages/task/src/node/custom/custom-task.ts +++ b/packages/task/src/node/custom/custom-task.ts @@ -34,8 +34,8 @@ export type TaskFactory = (options: TaskCustomOptions) => CustomTask; export class CustomTask extends Task { constructor( - @inject(TaskManager) protected override readonly taskManager: TaskManager, - @inject(ILogger) @named('task') protected override readonly logger: ILogger, + @inject(TaskManager) taskManager: TaskManager, + @inject(ILogger) @named('task') logger: ILogger, @inject(TaskCustomOptions) protected override readonly options: TaskCustomOptions ) { super(taskManager, logger, options); diff --git a/packages/task/src/node/process/process-task.ts b/packages/task/src/node/process/process-task.ts index 2cc40d3c3de1a..793752b55507c 100644 --- a/packages/task/src/node/process/process-task.ts +++ b/packages/task/src/node/process/process-task.ts @@ -61,8 +61,8 @@ export class ProcessTask extends Task { protected command: string | undefined; constructor( - @inject(TaskManager) protected override readonly taskManager: TaskManager, - @inject(ILogger) @named('task') protected override readonly logger: ILogger, + @inject(TaskManager) taskManager: TaskManager, + @inject(ILogger) @named('task') logger: ILogger, @inject(TaskProcessOptions) protected override readonly options: TaskProcessOptions ) { super(taskManager, logger, options); diff --git a/packages/task/src/node/task-line-matchers.ts b/packages/task/src/node/task-line-matchers.ts index 3f82d790e5359..eb56fe37029ba 100644 --- a/packages/task/src/node/task-line-matchers.ts +++ b/packages/task/src/node/task-line-matchers.ts @@ -19,9 +19,7 @@ import { ProblemMatcher, ProblemMatch, WatchingPattern } from '../common/problem export class StartStopLineMatcher extends AbstractLineMatcher { - constructor( - protected override matcher: ProblemMatcher - ) { + constructor(matcher: ProblemMatcher) { super(matcher); } @@ -69,9 +67,7 @@ export class WatchModeLineMatcher extends StartStopLineMatcher { private endsPattern: WatchingPattern; activeOnStart: boolean = false; - constructor( - protected override matcher: ProblemMatcher - ) { + constructor(matcher: ProblemMatcher) { super(matcher); this.beginsPattern = matcher.watching!.beginsPattern; this.endsPattern = matcher.watching!.endsPattern; diff --git a/packages/terminal/src/browser/terminal-widget-impl.ts b/packages/terminal/src/browser/terminal-widget-impl.ts index 789f07a9f2edf..ad8488aa7ce95 100644 --- a/packages/terminal/src/browser/terminal-widget-impl.ts +++ b/packages/terminal/src/browser/terminal-widget-impl.ts @@ -70,7 +70,7 @@ export class TerminalWidgetImpl extends TerminalWidget implements StatefulWidget @inject(ShellTerminalServerProxy) protected readonly shellTerminalServer: ShellTerminalServerProxy; @inject(TerminalWatcher) protected readonly terminalWatcher: TerminalWatcher; @inject(ILogger) @named('terminal') protected readonly logger: ILogger; - @inject('terminal-dom-id') public override readonly id: string; + @inject('terminal-dom-id') override readonly id: string; @inject(TerminalPreferences) protected readonly preferences: TerminalPreferences; @inject(ContributionProvider) @named(TerminalContribution) protected readonly terminalContributionProvider: ContributionProvider; @inject(TerminalService) protected readonly terminalService: TerminalService; diff --git a/packages/terminal/src/node/terminal-server.ts b/packages/terminal/src/node/terminal-server.ts index 85575760052c4..25e4a27602e6e 100644 --- a/packages/terminal/src/node/terminal-server.ts +++ b/packages/terminal/src/node/terminal-server.ts @@ -26,10 +26,11 @@ import { TerminalProcessFactory, ProcessManager } from '@theia/process/lib/node' @injectable() export class TerminalServer extends BaseTerminalServer implements ITerminalServer { + @inject(TerminalProcessFactory) protected readonly terminalFactory: TerminalProcessFactory; + constructor( - @inject(TerminalProcessFactory) protected readonly terminalFactory: TerminalProcessFactory, - @inject(ProcessManager) protected override readonly processManager: ProcessManager, - @inject(ILogger) @named('terminal') protected override readonly logger: ILogger + @inject(ProcessManager) processManager: ProcessManager, + @inject(ILogger) @named('terminal') logger: ILogger, ) { super(processManager, logger); } diff --git a/packages/timeline/src/browser/timeline-tree-widget.tsx b/packages/timeline/src/browser/timeline-tree-widget.tsx index ecc921afa3aa3..5f6ff3c61d70f 100644 --- a/packages/timeline/src/browser/timeline-tree-widget.tsx +++ b/packages/timeline/src/browser/timeline-tree-widget.tsx @@ -34,13 +34,13 @@ export class TimelineTreeWidget extends TreeWidget { @inject(MenuModelRegistry) protected readonly menus: MenuModelRegistry; @inject(TimelineContextKeyService) protected readonly contextKeys: TimelineContextKeyService; + @inject(TimelineService) protected readonly timelineService: TimelineService; + @inject(CommandRegistry) protected readonly commandRegistry: CommandRegistry; constructor( - @inject(TreeProps) override readonly props: TreeProps, - @inject(TimelineService) protected readonly timelineService: TimelineService, + @inject(TreeProps) props: TreeProps, @inject(TimelineTreeModel) override readonly model: TimelineTreeModel, - @inject(ContextMenuRenderer) protected override readonly contextMenuRenderer: ContextMenuRenderer, - @inject(CommandRegistry) protected readonly commandRegistry: CommandRegistry + @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer, ) { super(props, model, contextMenuRenderer); this.id = TimelineTreeWidget.ID; diff --git a/packages/typehierarchy/src/browser/tree/typehierarchy-tree-widget.tsx b/packages/typehierarchy/src/browser/tree/typehierarchy-tree-widget.tsx index 6f97f7b69e482..a797b47319607 100644 --- a/packages/typehierarchy/src/browser/tree/typehierarchy-tree-widget.tsx +++ b/packages/typehierarchy/src/browser/tree/typehierarchy-tree-widget.tsx @@ -34,11 +34,12 @@ export class TypeHierarchyTreeWidget extends TreeWidget { // eslint-disable-next-line @typescript-eslint/no-explicit-any protected readonly icons = new Map(Array.from(Object.keys(SymbolKind)).map(key => [(SymbolKind as any)[key], key.toLocaleLowerCase()] as [number, string])); + @inject(EditorManager) readonly editorManager: EditorManager; + constructor( - @inject(TreeProps) override readonly props: TreeProps, + @inject(TreeProps) props: TreeProps, @inject(TypeHierarchyTreeModel) override readonly model: TypeHierarchyTreeModel, - @inject(ContextMenuRenderer) override readonly contextMenuRenderer: ContextMenuRenderer, - @inject(EditorManager) readonly editorManager: EditorManager + @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer ) { super(props, model, contextMenuRenderer); this.id = TypeHierarchyTreeWidget.WIDGET_ID; diff --git a/packages/workspace/src/browser/untitled-workspace-exit-dialog.ts b/packages/workspace/src/browser/untitled-workspace-exit-dialog.ts index 18829cb601dba..bc43092796405 100644 --- a/packages/workspace/src/browser/untitled-workspace-exit-dialog.ts +++ b/packages/workspace/src/browser/untitled-workspace-exit-dialog.ts @@ -27,7 +27,7 @@ export class UntitledWorkspaceExitDialog extends AbstractDialog + selectionService: SelectionService, + handler: UriCommandHandler ) { super(selectionService, handler); }