cleanup

Remove redundant overrides: Keep overrides that change the type of a
field and discard the others.

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);
     }
 

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);
     }
 

packages/core/src/browser/dialogs.ts

@@ -362,8 +362,7 @@ export class ConfirmDialog extends AbstractDialog<boolean> {
     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<string> {
     protected readonly inputField: HTMLInputElement;
 
     constructor(
-        @inject(SingleTextInputDialogProps)
-        protected override props: SingleTextInputDialogProps
+        @inject(SingleTextInputDialogProps) protected override props: SingleTextInputDialogProps
     ) {
         super(props);
 

packages/core/src/browser/dialogs/react-dialog.tsx

@@ -26,7 +26,7 @@ export abstract class ReactDialog<T> extends AbstractDialog<T> {
     protected readonly onRender = new DisposableCollection();
 
     constructor(
-        @inject(DialogProps) protected override readonly props: DialogProps
+        @inject(DialogProps) props: DialogProps
     ) {
         super(props);
         this.toDispose.push(Disposable.create(() => {

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);
     }

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;
 

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);

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
     ) {

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
     ) {

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
     ) {

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
     ) {

packages/markers/src/browser/problem/problem-selection.ts

@@ -30,8 +30,8 @@ export namespace ProblemSelection {
     export class CommandHandler extends SelectionCommandHandler<ProblemSelection> {
 
         constructor(
-            protected override readonly selectionService: SelectionService,
-            protected override readonly options: SelectionCommandHandler.Options<ProblemSelection>
+            selectionService: SelectionService,
+            options: SelectionCommandHandler.Options<ProblemSelection>
         ) {
             super(
                 selectionService,

packages/markers/src/browser/problem/problem-tree-model.ts

@@ -29,9 +29,10 @@ import { ProblemUtils } from './problem-utils';
 export class ProblemTree extends MarkerTree<Diagnostic> {
 
     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<Diagnostic>[]): MarkerNode[] {

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);
 

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,

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;

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);
     }

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

packages/outline-view/src/browser/outline-view-widget.tsx

@@ -79,9 +79,9 @@ export class OutlineViewWidget extends TreeWidget {
     readonly onDidChangeOpenStateEmitter = new Emitter<boolean>();
 
     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);
 

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<boolean>();
-    override readonly onDidChangeVisibility = this.onDidChangeVisibilityEmitter.event;
-
     @postConstruct()
     protected override init(): void {
         super.init();

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;

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 {

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<string, ResourcePropertiesCategoryNode>;
     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);
 

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<ScmHistoryListNode>
     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,

packages/scm-extra/src/browser/scm-navigable-list-widget.tsx

@@ -34,8 +34,7 @@ export abstract class ScmNavigableListWidget<T extends { selected?: boolean }> 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();

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') {

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);