From ae15d09cbccd50204d94beaa24bca0bc0f7db470 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 15 Feb 2018 10:38:37 -0800 Subject: [PATCH] Mark injected service properties as readonly --- src/vs/editor/browser/services/bulkEdit.ts | 2 +- .../contrib/codelens/codelensController.ts | 4 ++-- .../contrib/colorPicker/colorDetector.ts | 4 ++-- .../editor/contrib/contextmenu/contextmenu.ts | 10 ++++----- src/vs/editor/contrib/find/findController.ts | 8 +++---- .../editor/contrib/find/simpleFindWidget.ts | 2 +- src/vs/editor/contrib/gotoError/gotoError.ts | 6 ++--- src/vs/editor/contrib/hover/hover.ts | 4 ++-- .../referenceSearch/referencesController.ts | 16 +++++++------- .../referenceSearch/referencesWidget.ts | 8 +++---- src/vs/editor/contrib/rename/rename.ts | 6 ++--- .../contrib/snippet/snippetController2.ts | 2 +- .../test/snippetController2.old.test.ts | 2 +- .../contrib/suggest/suggestController.ts | 6 ++--- .../editor/contrib/suggest/suggestMemory.ts | 2 +- .../accessibilityHelp/accessibilityHelp.ts | 6 ++--- .../actions/browser/menuItemActionItem.ts | 4 ++-- src/vs/platform/actions/common/actions.ts | 2 +- src/vs/platform/actions/common/menu.ts | 4 ++-- src/vs/platform/actions/common/menuService.ts | 4 ++-- .../commands/common/commandService.ts | 6 ++--- .../electron-browser/lifecycleService.ts | 8 +++---- .../platform/opener/browser/openerService.ts | 4 ++-- .../mainThreadDocumentsAndEditors.ts | 12 +++++----- .../api/electron-browser/mainThreadEditors.ts | 2 +- .../mainThreadSaveParticipant.ts | 10 ++++----- .../api/electron-browser/mainThreadTask.ts | 4 ++-- .../electron-browser/mainThreadWorkspace.ts | 6 ++--- .../browser/parts/editor/textEditor.ts | 6 ++--- .../browser/parts/views/customView.ts | 2 +- src/vs/workbench/common/resources.ts | 4 ++-- .../electron-browser/accessibility.ts | 8 +++---- .../electron-browser/terminalService.ts | 6 ++--- .../electron-browser/extensionTipsService.ts | 4 ++-- .../markers/browser/markersFileDecorations.ts | 6 ++--- .../markers/browser/markersTreeController.ts | 2 +- .../browser/keybindingsEditorContribution.ts | 6 ++--- .../parts/search/browser/openSymbolHandler.ts | 6 ++--- .../electron-browser/snippetsService.ts | 4 ++-- .../electron-browser/task.contribution.ts | 2 +- .../parts/terminal/common/terminalService.ts | 4 ++-- .../electron-browser/terminalActions.ts | 6 ++--- .../electron-browser/terminalConfigHelper.ts | 8 +++---- .../electron-browser/terminalFindWidget.ts | 4 ++-- .../electron-browser/terminalInstance.ts | 22 +++++++++---------- .../electron-browser/terminalLinkHandler.ts | 6 ++--- .../electron-browser/terminalPanel.ts | 10 ++++----- .../electron-browser/terminalService.ts | 12 +++++----- .../terminal/electron-browser/terminalTab.ts | 2 +- .../electron-browser/releaseNotesEditor.ts | 4 ++-- .../welcome/overlay/browser/welcomeOverlay.ts | 2 +- .../progress/browser/progressService2.ts | 4 ++-- 52 files changed, 147 insertions(+), 147 deletions(-) diff --git a/src/vs/editor/browser/services/bulkEdit.ts b/src/vs/editor/browser/services/bulkEdit.ts index cded7ca6be5..6753f7bb6e1 100644 --- a/src/vs/editor/browser/services/bulkEdit.ts +++ b/src/vs/editor/browser/services/bulkEdit.ts @@ -271,7 +271,7 @@ export class BulkEdit { constructor( editor: ICodeEditor, progress: IProgressRunner, - @ITextModelService private _textModelService: ITextModelService, + @ITextModelService private readonly _textModelService: ITextModelService, @optional(IFileService) private _fileService: IFileService ) { this._editor = editor; diff --git a/src/vs/editor/contrib/codelens/codelensController.ts b/src/vs/editor/contrib/codelens/codelensController.ts index 20909ec04d7..693ecec734c 100644 --- a/src/vs/editor/contrib/codelens/codelensController.ts +++ b/src/vs/editor/contrib/codelens/codelensController.ts @@ -36,8 +36,8 @@ export class CodeLensContribution implements editorCommon.IEditorContribution { constructor( private _editor: editorBrowser.ICodeEditor, - @ICommandService private _commandService: ICommandService, - @IMessageService private _messageService: IMessageService + @ICommandService private readonly _commandService: ICommandService, + @IMessageService private readonly _messageService: IMessageService ) { this._isEnabled = this._editor.getConfiguration().contribInfo.codeLens; diff --git a/src/vs/editor/contrib/colorPicker/colorDetector.ts b/src/vs/editor/contrib/colorPicker/colorDetector.ts index 007f0e472ae..b839e90d207 100644 --- a/src/vs/editor/contrib/colorPicker/colorDetector.ts +++ b/src/vs/editor/contrib/colorPicker/colorDetector.ts @@ -39,8 +39,8 @@ export class ColorDetector implements IEditorContribution { private _isEnabled: boolean; constructor(private _editor: ICodeEditor, - @ICodeEditorService private _codeEditorService: ICodeEditorService, - @IConfigurationService private _configurationService: IConfigurationService + @ICodeEditorService private readonly _codeEditorService: ICodeEditorService, + @IConfigurationService private readonly _configurationService: IConfigurationService ) { this._globalToDispose.push(_editor.onDidChangeModel((e) => { this._isEnabled = this.isEnabled(); diff --git a/src/vs/editor/contrib/contextmenu/contextmenu.ts b/src/vs/editor/contrib/contextmenu/contextmenu.ts index c3028475d32..f3c1ab86c25 100644 --- a/src/vs/editor/contrib/contextmenu/contextmenu.ts +++ b/src/vs/editor/contrib/contextmenu/contextmenu.ts @@ -40,11 +40,11 @@ export class ContextMenuController implements IEditorContribution { constructor( editor: ICodeEditor, - @IContextMenuService private _contextMenuService: IContextMenuService, - @IContextViewService private _contextViewService: IContextViewService, - @IContextKeyService private _contextKeyService: IContextKeyService, - @IKeybindingService private _keybindingService: IKeybindingService, - @IMenuService private _menuService: IMenuService + @IContextMenuService private readonly _contextMenuService: IContextMenuService, + @IContextViewService private readonly _contextViewService: IContextViewService, + @IContextKeyService private readonly _contextKeyService: IContextKeyService, + @IKeybindingService private readonly _keybindingService: IKeybindingService, + @IMenuService private readonly _menuService: IMenuService ) { this._editor = editor; diff --git a/src/vs/editor/contrib/find/findController.ts b/src/vs/editor/contrib/find/findController.ts index aea6fb8abbc..334de9e40e2 100644 --- a/src/vs/editor/contrib/find/findController.ts +++ b/src/vs/editor/contrib/find/findController.ts @@ -362,10 +362,10 @@ export class FindController extends CommonFindController implements IFindControl constructor( editor: ICodeEditor, - @IContextViewService private _contextViewService: IContextViewService, - @IContextKeyService private _contextKeyService: IContextKeyService, - @IKeybindingService private _keybindingService: IKeybindingService, - @IThemeService private _themeService: IThemeService, + @IContextViewService private readonly _contextViewService: IContextViewService, + @IContextKeyService private readonly _contextKeyService: IContextKeyService, + @IKeybindingService private readonly _keybindingService: IKeybindingService, + @IThemeService private readonly _themeService: IThemeService, @IStorageService storageService: IStorageService, @optional(IClipboardService) clipboardService: IClipboardService ) { diff --git a/src/vs/editor/contrib/find/simpleFindWidget.ts b/src/vs/editor/contrib/find/simpleFindWidget.ts index a4216e51f39..b4c396e4e40 100644 --- a/src/vs/editor/contrib/find/simpleFindWidget.ts +++ b/src/vs/editor/contrib/find/simpleFindWidget.ts @@ -33,7 +33,7 @@ export abstract class SimpleFindWidget extends Widget { protected _updateHistoryDelayer: Delayer; constructor( - @IContextViewService private _contextViewService: IContextViewService, + @IContextViewService private readonly _contextViewService: IContextViewService, private animate: boolean = true ) { super(); diff --git a/src/vs/editor/contrib/gotoError/gotoError.ts b/src/vs/editor/contrib/gotoError/gotoError.ts index 9efd2151ada..626e4c802e8 100644 --- a/src/vs/editor/contrib/gotoError/gotoError.ts +++ b/src/vs/editor/contrib/gotoError/gotoError.ts @@ -430,9 +430,9 @@ class MarkerController implements editorCommon.IEditorContribution { constructor( editor: ICodeEditor, - @IMarkerService private _markerService: IMarkerService, - @IContextKeyService private _contextKeyService: IContextKeyService, - @IThemeService private _themeService: IThemeService + @IMarkerService private readonly _markerService: IMarkerService, + @IContextKeyService private readonly _contextKeyService: IContextKeyService, + @IThemeService private readonly _themeService: IThemeService ) { this._editor = editor; this._markersNavigationVisible = CONTEXT_MARKERS_NAVIGATION_VISIBLE.bindTo(this._contextKeyService); diff --git a/src/vs/editor/contrib/hover/hover.ts b/src/vs/editor/contrib/hover/hover.ts index 047e21db91b..af7f1a66d41 100644 --- a/src/vs/editor/contrib/hover/hover.ts +++ b/src/vs/editor/contrib/hover/hover.ts @@ -56,8 +56,8 @@ export class ModesHoverController implements editorCommon.IEditorContribution { } constructor(editor: ICodeEditor, - @IOpenerService private _openerService: IOpenerService, - @IModeService private _modeService: IModeService + @IOpenerService private readonly _openerService: IOpenerService, + @IModeService private readonly _modeService: IModeService ) { this._editor = editor; diff --git a/src/vs/editor/contrib/referenceSearch/referencesController.ts b/src/vs/editor/contrib/referenceSearch/referencesController.ts index d82c3378137..0dc0f36b083 100644 --- a/src/vs/editor/contrib/referenceSearch/referencesController.ts +++ b/src/vs/editor/contrib/referenceSearch/referencesController.ts @@ -55,14 +55,14 @@ export class ReferencesController implements editorCommon.IEditorContribution { public constructor( editor: ICodeEditor, @IContextKeyService contextKeyService: IContextKeyService, - @IEditorService private _editorService: IEditorService, - @ITextModelService private _textModelResolverService: ITextModelService, - @IMessageService private _messageService: IMessageService, - @IInstantiationService private _instantiationService: IInstantiationService, - @IWorkspaceContextService private _contextService: IWorkspaceContextService, - @IStorageService private _storageService: IStorageService, - @IThemeService private _themeService: IThemeService, - @IConfigurationService private _configurationService: IConfigurationService, + @IEditorService private readonly _editorService: IEditorService, + @ITextModelService private readonly _textModelResolverService: ITextModelService, + @IMessageService private readonly _messageService: IMessageService, + @IInstantiationService private readonly _instantiationService: IInstantiationService, + @IWorkspaceContextService private readonly _contextService: IWorkspaceContextService, + @IStorageService private readonly _storageService: IStorageService, + @IThemeService private readonly _themeService: IThemeService, + @IConfigurationService private readonly _configurationService: IConfigurationService, @optional(IEnvironmentService) private _environmentService: IEnvironmentService ) { this._editor = editor; diff --git a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts index 7b0e5ee38ed..ee73377d033 100644 --- a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts @@ -164,7 +164,7 @@ class DecorationsManager implements IDisposable { class DataSource implements tree.IDataSource { constructor( - @ITextModelService private _textModelResolverService: ITextModelService + @ITextModelService private readonly _textModelResolverService: ITextModelService ) { // } @@ -305,7 +305,7 @@ class FileReferencesTemplate { constructor( container: HTMLElement, - @IWorkspaceContextService private _contextService: IWorkspaceContextService, + @IWorkspaceContextService private readonly _contextService: IWorkspaceContextService, @optional(IEnvironmentService) private _environmentService: IEnvironmentService, @IThemeService themeService: IThemeService, ) { @@ -372,8 +372,8 @@ class Renderer implements tree.IRenderer { }; constructor( - @IWorkspaceContextService private _contextService: IWorkspaceContextService, - @IThemeService private _themeService: IThemeService, + @IWorkspaceContextService private readonly _contextService: IWorkspaceContextService, + @IThemeService private readonly _themeService: IThemeService, @optional(IEnvironmentService) private _environmentService: IEnvironmentService, ) { // diff --git a/src/vs/editor/contrib/rename/rename.ts b/src/vs/editor/contrib/rename/rename.ts index f6cbd734f42..1d7cda764c7 100644 --- a/src/vs/editor/contrib/rename/rename.ts +++ b/src/vs/editor/contrib/rename/rename.ts @@ -113,9 +113,9 @@ class RenameController implements IEditorContribution { constructor( private editor: ICodeEditor, - @IMessageService private _messageService: IMessageService, - @ITextModelService private _textModelResolverService: ITextModelService, - @IProgressService private _progressService: IProgressService, + @IMessageService private readonly _messageService: IMessageService, + @ITextModelService private readonly _textModelResolverService: ITextModelService, + @IProgressService private readonly _progressService: IProgressService, @IContextKeyService contextKeyService: IContextKeyService, @IThemeService themeService: IThemeService, @optional(IFileService) private _fileService: IFileService diff --git a/src/vs/editor/contrib/snippet/snippetController2.ts b/src/vs/editor/contrib/snippet/snippetController2.ts index eda1c4e1509..f929ab3239f 100644 --- a/src/vs/editor/contrib/snippet/snippetController2.ts +++ b/src/vs/editor/contrib/snippet/snippetController2.ts @@ -42,7 +42,7 @@ export class SnippetController2 implements IEditorContribution { constructor( private readonly _editor: ICodeEditor, - @ILogService private _logService: ILogService, + @ILogService private readonly _logService: ILogService, @IContextKeyService contextKeyService: IContextKeyService ) { this._inSnippet = SnippetController2.InSnippetMode.bindTo(contextKeyService); diff --git a/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts b/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts index 6979ff09551..a7e46d98f0d 100644 --- a/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts +++ b/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts @@ -18,7 +18,7 @@ class TestSnippetController extends SnippetController2 { constructor( editor: ICodeEditor, - @IContextKeyService private _contextKeyService: IContextKeyService + @IContextKeyService private readonly _contextKeyService: IContextKeyService ) { super(editor, new NullLogService(), _contextKeyService); } diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts index 7173f07aea6..d5b911c551c 100644 --- a/src/vs/editor/contrib/suggest/suggestController.ts +++ b/src/vs/editor/contrib/suggest/suggestController.ts @@ -90,9 +90,9 @@ export class SuggestController implements IEditorContribution { constructor( private _editor: ICodeEditor, - @ICommandService private _commandService: ICommandService, - @IContextKeyService private _contextKeyService: IContextKeyService, - @IInstantiationService private _instantiationService: IInstantiationService, + @ICommandService private readonly _commandService: ICommandService, + @IContextKeyService private readonly _contextKeyService: IContextKeyService, + @IInstantiationService private readonly _instantiationService: IInstantiationService, ) { this._model = new SuggestModel(this._editor); this._memory = _instantiationService.createInstance(SuggestMemories, this._editor.getConfiguration().contribInfo.suggestSelection); diff --git a/src/vs/editor/contrib/suggest/suggestMemory.ts b/src/vs/editor/contrib/suggest/suggestMemory.ts index 58df1fd7179..7ead0af993a 100644 --- a/src/vs/editor/contrib/suggest/suggestMemory.ts +++ b/src/vs/editor/contrib/suggest/suggestMemory.ts @@ -177,7 +177,7 @@ export class SuggestMemories { constructor( mode: MemMode, - @IStorageService private _storageService: IStorageService + @IStorageService private readonly _storageService: IStorageService ) { this._persistSoon = new RunOnceScheduler(() => this._flush(), 3000); this.setMode(mode); diff --git a/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts b/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts index 44f2fca8421..7f6504e4607 100644 --- a/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts +++ b/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts @@ -115,9 +115,9 @@ class AccessibilityHelpWidget extends Widget implements IOverlayWidget { constructor( editor: ICodeEditor, - @IContextKeyService private _contextKeyService: IContextKeyService, - @IKeybindingService private _keybindingService: IKeybindingService, - @IOpenerService private _openerService: IOpenerService + @IContextKeyService private readonly _contextKeyService: IContextKeyService, + @IKeybindingService private readonly _keybindingService: IKeybindingService, + @IOpenerService private readonly _openerService: IOpenerService ) { super(); diff --git a/src/vs/platform/actions/browser/menuItemActionItem.ts b/src/vs/platform/actions/browser/menuItemActionItem.ts index 9f8e5bda400..653fbc84b9e 100644 --- a/src/vs/platform/actions/browser/menuItemActionItem.ts +++ b/src/vs/platform/actions/browser/menuItemActionItem.ts @@ -128,9 +128,9 @@ export class MenuItemActionItem extends ActionItem { constructor( public _action: MenuItemAction, - @IKeybindingService private _keybindingService: IKeybindingService, + @IKeybindingService private readonly _keybindingService: IKeybindingService, @IMessageService protected _messageService: IMessageService, - @IContextMenuService private _contextMenuService: IContextMenuService + @IContextMenuService private readonly _contextMenuService: IContextMenuService ) { super(undefined, _action, { icon: !!(_action.class || _action.item.iconPath), label: !_action.class && !_action.item.iconPath }); } diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts index f8786606a24..b1150d970f3 100644 --- a/src/vs/platform/actions/common/actions.ts +++ b/src/vs/platform/actions/common/actions.ts @@ -154,7 +154,7 @@ export class ExecuteCommandAction extends Action { constructor( id: string, label: string, - @ICommandService private _commandService: ICommandService) { + @ICommandService private readonly _commandService: ICommandService) { super(id, label); } diff --git a/src/vs/platform/actions/common/menu.ts b/src/vs/platform/actions/common/menu.ts index eed9d50ea4c..e9d904f3345 100644 --- a/src/vs/platform/actions/common/menu.ts +++ b/src/vs/platform/actions/common/menu.ts @@ -23,8 +23,8 @@ export class Menu implements IMenu { constructor( id: MenuId, startupSignal: TPromise, - @ICommandService private _commandService: ICommandService, - @IContextKeyService private _contextKeyService: IContextKeyService + @ICommandService private readonly _commandService: ICommandService, + @IContextKeyService private readonly _contextKeyService: IContextKeyService ) { startupSignal.then(_ => { const menuItems = MenuRegistry.getMenuItems(id); diff --git a/src/vs/platform/actions/common/menuService.ts b/src/vs/platform/actions/common/menuService.ts index c48ef95154b..db0ec647dac 100644 --- a/src/vs/platform/actions/common/menuService.ts +++ b/src/vs/platform/actions/common/menuService.ts @@ -16,8 +16,8 @@ export class MenuService implements IMenuService { _serviceBrand: any; constructor( - @IExtensionService private _extensionService: IExtensionService, - @ICommandService private _commandService: ICommandService + @IExtensionService private readonly _extensionService: IExtensionService, + @ICommandService private readonly _commandService: ICommandService ) { // } diff --git a/src/vs/platform/commands/common/commandService.ts b/src/vs/platform/commands/common/commandService.ts index db0aff02f20..b104d7c776c 100644 --- a/src/vs/platform/commands/common/commandService.ts +++ b/src/vs/platform/commands/common/commandService.ts @@ -22,9 +22,9 @@ export class CommandService extends Disposable implements ICommandService { public readonly onWillExecuteCommand: Event = this._onWillExecuteCommand.event; constructor( - @IInstantiationService private _instantiationService: IInstantiationService, - @IExtensionService private _extensionService: IExtensionService, - @ILogService private _logService: ILogService + @IInstantiationService private readonly _instantiationService: IInstantiationService, + @IExtensionService private readonly _extensionService: IExtensionService, + @ILogService private readonly _logService: ILogService ) { super(); this._extensionService.whenInstalledExtensionsRegistered().then(value => this._extensionHostIsReady = value); diff --git a/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts b/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts index 26d27676441..48d4c8dfe48 100644 --- a/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts +++ b/src/vs/platform/lifecycle/electron-browser/lifecycleService.ts @@ -31,10 +31,10 @@ export class LifecycleService implements ILifecycleService { private _phaseWhen = new Map(); constructor( - @IMessageService private _messageService: IMessageService, - @IWindowService private _windowService: IWindowService, - @IStorageService private _storageService: IStorageService, - @ILogService private _logService: ILogService + @IMessageService private readonly _messageService: IMessageService, + @IWindowService private readonly _windowService: IWindowService, + @IStorageService private readonly _storageService: IStorageService, + @ILogService private readonly _logService: ILogService ) { const lastShutdownReason = this._storageService.getInteger(LifecycleService._lastShutdownReasonKey, StorageScope.WORKSPACE); this._storageService.remove(LifecycleService._lastShutdownReasonKey, StorageScope.WORKSPACE); diff --git a/src/vs/platform/opener/browser/openerService.ts b/src/vs/platform/opener/browser/openerService.ts index fa76e7730b4..83cadb145e2 100644 --- a/src/vs/platform/opener/browser/openerService.ts +++ b/src/vs/platform/opener/browser/openerService.ts @@ -22,8 +22,8 @@ export class OpenerService implements IOpenerService { _serviceBrand: any; constructor( - @IEditorService private _editorService: IEditorService, - @ICommandService private _commandService: ICommandService, + @IEditorService private readonly _editorService: IEditorService, + @ICommandService private readonly _commandService: ICommandService, @optional(ITelemetryService) private _telemetryService: ITelemetryService = NullTelemetryService ) { // diff --git a/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts index ab5c345cb80..d7d1c5ea866 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts @@ -157,9 +157,9 @@ class MainThreadDocumentAndEditorStateComputer { constructor( private readonly _onDidChangeState: (delta: DocumentAndEditorStateDelta) => void, - @IModelService private _modelService: IModelService, - @ICodeEditorService private _codeEditorService: ICodeEditorService, - @IWorkbenchEditorService private _workbenchEditorService: IWorkbenchEditorService + @IModelService private readonly _modelService: IModelService, + @ICodeEditorService private readonly _codeEditorService: ICodeEditorService, + @IWorkbenchEditorService private readonly _workbenchEditorService: IWorkbenchEditorService ) { this._modelService.onModelAdded(this._updateStateOnModelAdd, this, this._toDispose); this._modelService.onModelRemoved(this._updateState, this, this._toDispose); @@ -299,9 +299,9 @@ export class MainThreadDocumentsAndEditors { constructor( extHostContext: IExtHostContext, - @IModelService private _modelService: IModelService, - @ITextFileService private _textFileService: ITextFileService, - @IWorkbenchEditorService private _workbenchEditorService: IWorkbenchEditorService, + @IModelService private readonly _modelService: IModelService, + @ITextFileService private readonly _textFileService: ITextFileService, + @IWorkbenchEditorService private readonly _workbenchEditorService: IWorkbenchEditorService, @ICodeEditorService codeEditorService: ICodeEditorService, @IModeService modeService: IModeService, @IFileService fileService: IFileService, diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts index 409e9df963d..bb0d1d1c941 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts @@ -41,7 +41,7 @@ export class MainThreadEditors implements MainThreadEditorsShape { constructor( documentsAndEditors: MainThreadDocumentsAndEditors, extHostContext: IExtHostContext, - @ICodeEditorService private _codeEditorService: ICodeEditorService, + @ICodeEditorService private readonly _codeEditorService: ICodeEditorService, @IWorkbenchEditorService workbenchEditorService: IWorkbenchEditorService, @IEditorGroupService editorGroupService: IEditorGroupService, @ITextModelService private readonly _textModelResolverService: ITextModelService, diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts index 83ec60aedcf..1aee0cdd391 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts @@ -179,9 +179,9 @@ export class TrimFinalNewLinesParticipant implements ISaveParticipantParticipant class FormatOnSaveParticipant implements ISaveParticipantParticipant { constructor( - @ICodeEditorService private _editorService: ICodeEditorService, - @IEditorWorkerService private _editorWorkerService: IEditorWorkerService, - @IConfigurationService private _configurationService: IConfigurationService + @ICodeEditorService private readonly _editorService: ICodeEditorService, + @IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService, + @IConfigurationService private readonly _configurationService: IConfigurationService ) { // Nothing } @@ -288,8 +288,8 @@ export class SaveParticipant implements ISaveParticipant { constructor( extHostContext: IExtHostContext, @IInstantiationService instantiationService: IInstantiationService, - @IProgressService2 private _progressService: IProgressService2, - @ILogService private _logService: ILogService + @IProgressService2 private readonly _progressService: IProgressService2, + @ILogService private readonly _logService: ILogService ) { this._saveParticipants = [ instantiationService.createInstance(TrimWhitespaceParticipant), diff --git a/src/vs/workbench/api/electron-browser/mainThreadTask.ts b/src/vs/workbench/api/electron-browser/mainThreadTask.ts index 9980e755deb..b6bf7cc83c5 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadTask.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadTask.ts @@ -23,8 +23,8 @@ export class MainThreadTask implements MainThreadTaskShape { constructor( extHostContext: IExtHostContext, - @ITaskService private _taskService: ITaskService, - @IWorkspaceContextService private _workspaceContextServer: IWorkspaceContextService + @ITaskService private readonly _taskService: ITaskService, + @IWorkspaceContextService private readonly _workspaceContextServer: IWorkspaceContextService ) { this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostTask); this._activeHandles = Object.create(null); diff --git a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts index 275298bcad4..c85997bc5d4 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts @@ -30,9 +30,9 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape { @ISearchService private readonly _searchService: ISearchService, @IWorkspaceContextService private readonly _contextService: IWorkspaceContextService, @ITextFileService private readonly _textFileService: ITextFileService, - @IConfigurationService private _configurationService: IConfigurationService, - @IWorkspaceEditingService private _workspaceEditingService: IWorkspaceEditingService, - @IStatusbarService private _statusbarService: IStatusbarService + @IConfigurationService private readonly _configurationService: IConfigurationService, + @IWorkspaceEditingService private readonly _workspaceEditingService: IWorkspaceEditingService, + @IStatusbarService private readonly _statusbarService: IStatusbarService ) { this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostWorkspace); this._contextService.onDidChangeWorkspaceFolders(this._onDidChangeWorkspace, this, this._toDispose); diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts index 179956d9c07..13827bc1503 100644 --- a/src/vs/workbench/browser/parts/editor/textEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textEditor.ts @@ -50,11 +50,11 @@ export abstract class BaseTextEditor extends BaseEditor { constructor( id: string, @ITelemetryService telemetryService: ITelemetryService, - @IInstantiationService private _instantiationService: IInstantiationService, + @IInstantiationService private readonly _instantiationService: IInstantiationService, @IStorageService private storageService: IStorageService, - @ITextResourceConfigurationService private _configurationService: ITextResourceConfigurationService, + @ITextResourceConfigurationService private readonly _configurationService: ITextResourceConfigurationService, @IThemeService protected themeService: IThemeService, - @ITextFileService private _textFileService: ITextFileService, + @ITextFileService private readonly _textFileService: ITextFileService, @IEditorGroupService protected editorGroupService: IEditorGroupService ) { super(id, telemetryService, themeService); diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts index 17065601c26..5381405294e 100644 --- a/src/vs/workbench/browser/parts/views/customView.ts +++ b/src/vs/workbench/browser/parts/views/customView.ts @@ -488,7 +488,7 @@ class TreeController extends WorkbenchTreeController { private treeViewId: string, private menus: Menus, @IContextMenuService private contextMenuService: IContextMenuService, - @IKeybindingService private _keybindingService: IKeybindingService, + @IKeybindingService private readonly _keybindingService: IKeybindingService, @IConfigurationService configurationService: IConfigurationService ) { super({}, configurationService); diff --git a/src/vs/workbench/common/resources.ts b/src/vs/workbench/common/resources.ts index b4f626742fe..ce37e8b8eff 100644 --- a/src/vs/workbench/common/resources.ts +++ b/src/vs/workbench/common/resources.ts @@ -32,8 +32,8 @@ export class ResourceContextKey implements IContextKey { constructor( @IContextKeyService contextKeyService: IContextKeyService, - @IModeService private _modeService: IModeService, - @IFileService private _fileService: IFileService + @IModeService private readonly _modeService: IModeService, + @IFileService private readonly _fileService: IFileService ) { this._schemeKey = ResourceContextKey.Scheme.bindTo(contextKeyService); this._filenameKey = ResourceContextKey.Filename.bindTo(contextKeyService); diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts b/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts index bfc2994524a..a9e4ec6741e 100644 --- a/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts +++ b/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts @@ -82,10 +82,10 @@ class AccessibilityHelpWidget extends Widget implements IOverlayWidget { constructor( editor: ICodeEditor, - @IContextKeyService private _contextKeyService: IContextKeyService, - @IKeybindingService private _keybindingService: IKeybindingService, - @IConfigurationService private _configurationService: IConfigurationService, - @IOpenerService private _openerService: IOpenerService + @IContextKeyService private readonly _contextKeyService: IContextKeyService, + @IKeybindingService private readonly _keybindingService: IKeybindingService, + @IConfigurationService private readonly _configurationService: IConfigurationService, + @IOpenerService private readonly _openerService: IOpenerService ) { super(); diff --git a/src/vs/workbench/parts/execution/electron-browser/terminalService.ts b/src/vs/workbench/parts/execution/electron-browser/terminalService.ts index 1d25e068cbe..6329d0d1f7e 100644 --- a/src/vs/workbench/parts/execution/electron-browser/terminalService.ts +++ b/src/vs/workbench/parts/execution/electron-browser/terminalService.ts @@ -31,7 +31,7 @@ export class WinTerminalService implements ITerminalService { private static readonly CMD = 'cmd.exe'; constructor( - @IConfigurationService private _configurationService: IConfigurationService + @IConfigurationService private readonly _configurationService: IConfigurationService ) { } @@ -120,7 +120,7 @@ export class MacTerminalService implements ITerminalService { private static readonly OSASCRIPT = '/usr/bin/osascript'; // osascript is the AppleScript interpreter on OS X constructor( - @IConfigurationService private _configurationService: IConfigurationService + @IConfigurationService private readonly _configurationService: IConfigurationService ) { } public openTerminal(cwd?: string): void { @@ -211,7 +211,7 @@ export class LinuxTerminalService implements ITerminalService { private static readonly WAIT_MESSAGE = nls.localize('press.any.key', "Press any key to continue..."); constructor( - @IConfigurationService private _configurationService: IConfigurationService + @IConfigurationService private readonly _configurationService: IConfigurationService ) { } diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts index 0d46433a6a2..c8fe96f5fcb 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts @@ -66,8 +66,8 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe private proactiveRecommendationsFetched: boolean = false; constructor( - @IExtensionGalleryService private _galleryService: IExtensionGalleryService, - @IModelService private _modelService: IModelService, + @IExtensionGalleryService private readonly _galleryService: IExtensionGalleryService, + @IModelService private readonly _modelService: IModelService, @IStorageService private storageService: IStorageService, @IChoiceService private choiceService: IChoiceService, @IExtensionManagementService private extensionsService: IExtensionManagementService, diff --git a/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts b/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts index 447a5f43abf..e2b8e12034c 100644 --- a/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts +++ b/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts @@ -60,9 +60,9 @@ class MarkersFileDecorations implements IWorkbenchContribution { private _enabled: boolean; constructor( - @IMarkerService private _markerService: IMarkerService, - @IDecorationsService private _decorationsService: IDecorationsService, - @IConfigurationService private _configurationService: IConfigurationService + @IMarkerService private readonly _markerService: IMarkerService, + @IDecorationsService private readonly _decorationsService: IDecorationsService, + @IConfigurationService private readonly _configurationService: IConfigurationService ) { // this._disposables = [ diff --git a/src/vs/workbench/parts/markers/browser/markersTreeController.ts b/src/vs/workbench/parts/markers/browser/markersTreeController.ts index 548b3fb7b6b..8c6d21f3e6a 100644 --- a/src/vs/workbench/parts/markers/browser/markersTreeController.ts +++ b/src/vs/workbench/parts/markers/browser/markersTreeController.ts @@ -21,7 +21,7 @@ export class Controller extends WorkbenchTreeController { constructor( @IContextMenuService private contextMenuService: IContextMenuService, @IMenuService private menuService: IMenuService, - @IKeybindingService private _keybindingService: IKeybindingService, + @IKeybindingService private readonly _keybindingService: IKeybindingService, @IConfigurationService configurationService: IConfigurationService ) { super({}, configurationService); diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts index b1bf80c1496..806ac0f38fa 100644 --- a/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts +++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts @@ -48,7 +48,7 @@ export class DefineKeybindingController extends Disposable implements editorComm constructor( private _editor: ICodeEditor, - @IInstantiationService private _instantiationService: IInstantiationService + @IInstantiationService private readonly _instantiationService: IInstantiationService ) { super(); @@ -125,7 +125,7 @@ export class KeybindingWidgetRenderer extends Disposable { constructor( private _editor: ICodeEditor, - @IInstantiationService private _instantiationService: IInstantiationService + @IInstantiationService private readonly _instantiationService: IInstantiationService ) { super(); this._launchWidget = this._register(this._instantiationService.createInstance(FloatingClickWidget, this._editor, NLS_LAUNCH_MESSAGE, DefineKeybindingCommand.ID)); @@ -171,7 +171,7 @@ export class KeybindingEditorDecorationsRenderer extends Disposable { constructor( private _editor: ICodeEditor, - @IKeybindingService private _keybindingService: IKeybindingService, + @IKeybindingService private readonly _keybindingService: IKeybindingService, ) { super(); diff --git a/src/vs/workbench/parts/search/browser/openSymbolHandler.ts b/src/vs/workbench/parts/search/browser/openSymbolHandler.ts index 88401644d73..4f1a912594e 100644 --- a/src/vs/workbench/parts/search/browser/openSymbolHandler.ts +++ b/src/vs/workbench/parts/search/browser/openSymbolHandler.ts @@ -34,10 +34,10 @@ class SymbolEntry extends EditorQuickOpenEntry { constructor( private _bearing: SymbolInformation, private _provider: IWorkspaceSymbolProvider, - @IConfigurationService private _configurationService: IConfigurationService, - @IWorkspaceContextService private _contextService: IWorkspaceContextService, + @IConfigurationService private readonly _configurationService: IConfigurationService, + @IWorkspaceContextService private readonly _contextService: IWorkspaceContextService, @IWorkbenchEditorService editorService: IWorkbenchEditorService, - @IEnvironmentService private _environmentService: IEnvironmentService + @IEnvironmentService private readonly _environmentService: IEnvironmentService ) { super(editorService); } diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts index f1695bc6c63..722ba217562 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts @@ -298,8 +298,8 @@ export class SnippetSuggestion implements ISuggestion { export class SnippetSuggestProvider implements ISuggestSupport { constructor( - @IModeService private _modeService: IModeService, - @ISnippetsService private _snippets: ISnippetsService + @IModeService private readonly _modeService: IModeService, + @ISnippetsService private readonly _snippets: ISnippetsService ) { // } diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts index 7354af78892..0fb82f1b37d 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts +++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts @@ -500,7 +500,7 @@ class TaskService implements ITaskService { @IStorageService private storageService: IStorageService, @IProgressService2 private progressService: IProgressService2, @IOpenerService private openerService: IOpenerService, - @IWindowService private _windowServive: IWindowService + @IWindowService private readonly _windowServive: IWindowService ) { this.configurationService = configurationService; this.markerService = markerService; diff --git a/src/vs/workbench/parts/terminal/common/terminalService.ts b/src/vs/workbench/parts/terminal/common/terminalService.ts index ee7e20df287..82ef1eaf3d9 100644 --- a/src/vs/workbench/parts/terminal/common/terminalService.ts +++ b/src/vs/workbench/parts/terminal/common/terminalService.ts @@ -43,9 +43,9 @@ export abstract class TerminalService implements ITerminalService { public abstract get configHelper(): ITerminalConfigHelper; constructor( - @IContextKeyService private _contextKeyService: IContextKeyService, + @IContextKeyService private readonly _contextKeyService: IContextKeyService, @IPanelService protected _panelService: IPanelService, - @IPartService private _partService: IPartService, + @IPartService private readonly _partService: IPartService, @ILifecycleService lifecycleService: ILifecycleService ) { this._activeTabIndex = 0; diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts index f3187aa043d..25ffd59fe6e 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts @@ -157,7 +157,7 @@ export abstract class BaseSendTextTerminalAction extends Action { id: string, label: string, private _text: string, - @ITerminalService private _terminalService: ITerminalService + @ITerminalService private readonly _terminalService: ITerminalService ) { super(id, label); } @@ -302,7 +302,7 @@ export class SplitVerticalTerminalAction extends Action { constructor( id: string, label: string, - @ITerminalService private _terminalService: ITerminalService + @ITerminalService private readonly _terminalService: ITerminalService ) { super(id, label); } @@ -321,7 +321,7 @@ export abstract class BaseFocusDirectionTerminalAction extends Action { constructor( id: string, label: string, private _direction: Direction, - @ITerminalService private _terminalService: ITerminalService + @ITerminalService private readonly _terminalService: ITerminalService ) { super(id, label); } diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts index 24a10026878..f3e549e7746 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts @@ -33,10 +33,10 @@ export class TerminalConfigHelper implements ITerminalConfigHelper { public config: ITerminalConfiguration; public constructor( - @IConfigurationService private _configurationService: IConfigurationService, - @IWorkspaceConfigurationService private _workspaceConfigurationService: IWorkspaceConfigurationService, - @IChoiceService private _choiceService: IChoiceService, - @IStorageService private _storageService: IStorageService + @IConfigurationService private readonly _configurationService: IConfigurationService, + @IWorkspaceConfigurationService private readonly _workspaceConfigurationService: IWorkspaceConfigurationService, + @IChoiceService private readonly _choiceService: IChoiceService, + @IStorageService private readonly _storageService: IStorageService ) { this._updateConfig(); this._configurationService.onDidChangeConfiguration(e => { diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts index 431ea507364..54f6566bf1f 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts @@ -13,8 +13,8 @@ export class TerminalFindWidget extends SimpleFindWidget { constructor( @IContextViewService _contextViewService: IContextViewService, - @IContextKeyService private _contextKeyService: IContextKeyService, - @ITerminalService private _terminalService: ITerminalService + @IContextKeyService private readonly _contextKeyService: IContextKeyService, + @ITerminalService private readonly _terminalService: ITerminalService ) { super(_contextViewService); this._findInputFocused = KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED.bindTo(this._contextKeyService); diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts index e8a97b3f809..50fcaca4306 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts @@ -118,17 +118,17 @@ export class TerminalInstance implements ITerminalInstance { private _configHelper: TerminalConfigHelper, private _container: HTMLElement, private _shellLaunchConfig: IShellLaunchConfig, - @IContextKeyService private _contextKeyService: IContextKeyService, - @IKeybindingService private _keybindingService: IKeybindingService, - @IMessageService private _messageService: IMessageService, - @IPanelService private _panelService: IPanelService, - @IInstantiationService private _instantiationService: IInstantiationService, - @IClipboardService private _clipboardService: IClipboardService, - @IHistoryService private _historyService: IHistoryService, - @IThemeService private _themeService: IThemeService, - @IConfigurationResolverService private _configurationResolverService: IConfigurationResolverService, - @IWorkspaceContextService private _workspaceContextService: IWorkspaceContextService, - @IConfigurationService private _configurationService: IConfigurationService + @IContextKeyService private readonly _contextKeyService: IContextKeyService, + @IKeybindingService private readonly _keybindingService: IKeybindingService, + @IMessageService private readonly _messageService: IMessageService, + @IPanelService private readonly _panelService: IPanelService, + @IInstantiationService private readonly _instantiationService: IInstantiationService, + @IClipboardService private readonly _clipboardService: IClipboardService, + @IHistoryService private readonly _historyService: IHistoryService, + @IThemeService private readonly _themeService: IThemeService, + @IConfigurationResolverService private readonly _configurationResolverService: IConfigurationResolverService, + @IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService, + @IConfigurationService private readonly _configurationService: IConfigurationService ) { this._instanceDisposables = []; this._processDisposables = []; diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts index bb1bbe0019f..21d7615761b 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts @@ -66,9 +66,9 @@ export class TerminalLinkHandler { private _xterm: any, private _platform: platform.Platform, private _initialCwd: string, - @IOpenerService private _openerService: IOpenerService, - @IConfigurationService private _configurationService: IConfigurationService, - @ITerminalService private _terminalService: ITerminalService + @IOpenerService private readonly _openerService: IOpenerService, + @IConfigurationService private readonly _configurationService: IConfigurationService, + @ITerminalService private readonly _terminalService: ITerminalService ) { const baseLocalLinkClause = _platform === platform.Platform.Windows ? winLocalLinkClause : unixLocalLinkClause; // Append line and column number regex diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts index a47e312f952..a66423a6618 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts @@ -42,11 +42,11 @@ export class TerminalPanel extends Panel { private _findWidget: TerminalFindWidget; constructor( - @IConfigurationService private _configurationService: IConfigurationService, - @IContextMenuService private _contextMenuService: IContextMenuService, - @IInstantiationService private _instantiationService: IInstantiationService, - @ITerminalService private _terminalService: ITerminalService, - @ILifecycleService private _lifecycleService: ILifecycleService, + @IConfigurationService private readonly _configurationService: IConfigurationService, + @IContextMenuService private readonly _contextMenuService: IContextMenuService, + @IInstantiationService private readonly _instantiationService: IInstantiationService, + @ITerminalService private readonly _terminalService: ITerminalService, + @ILifecycleService private readonly _lifecycleService: ILifecycleService, @IThemeService protected themeService: IThemeService, @ITelemetryService telemetryService: ITelemetryService ) { diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts index a06d25e3e4e..df182935d06 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts @@ -38,12 +38,12 @@ export class TerminalService extends AbstractTerminalService implements ITermina @IPanelService _panelService: IPanelService, @IPartService _partService: IPartService, @ILifecycleService _lifecycleService: ILifecycleService, - @IConfigurationService private _configurationService: IConfigurationService, - @IInstantiationService private _instantiationService: IInstantiationService, - @IQuickOpenService private _quickOpenService: IQuickOpenService, - @IChoiceService private _choiceService: IChoiceService, - @IStorageService private _storageService: IStorageService, - @IMessageService private _messageService: IMessageService + @IConfigurationService private readonly _configurationService: IConfigurationService, + @IInstantiationService private readonly _instantiationService: IInstantiationService, + @IQuickOpenService private readonly _quickOpenService: IQuickOpenService, + @IChoiceService private readonly _choiceService: IChoiceService, + @IStorageService private readonly _storageService: IStorageService, + @IMessageService private readonly _messageService: IMessageService ) { super(_contextKeyService, _panelService, _partService, _lifecycleService); diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts index 801aca5ad10..04acf742dbc 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts @@ -211,7 +211,7 @@ export class TerminalTab extends Disposable implements ITerminalTab { configHelper: TerminalConfigHelper, private _container: HTMLElement, shellLaunchConfig: IShellLaunchConfig, - @IInstantiationService private _instantiationService: IInstantiationService + @IInstantiationService private readonly _instantiationService: IInstantiationService ) { super(); this._onDisposed = new Emitter(); diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts index e1b0a6163ef..52abc7a5262 100644 --- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts +++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts @@ -64,8 +64,8 @@ export class ReleaseNotesEditor extends WebviewEditor { @IOpenerService private openerService: IOpenerService, @IModeService private modeService: IModeService, @IPartService private partService: IPartService, - @IContextViewService private _contextViewService: IContextViewService, - @IWorkspaceContextService private _contextService: IWorkspaceContextService + @IContextViewService private readonly _contextViewService: IContextViewService, + @IWorkspaceContextService private readonly _contextService: IWorkspaceContextService ) { super(ReleaseNotesEditor.ID, telemetryService, themeService, storageService, contextKeyService); } diff --git a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts index 26b5cf2c7e9..75313c3e266 100644 --- a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts +++ b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts @@ -149,7 +149,7 @@ class WelcomeOverlay { @IPartService private partService: IPartService, @IWorkbenchEditorService private editorService: IWorkbenchEditorService, @ICommandService private commandService: ICommandService, - @IContextKeyService private _contextKeyService: IContextKeyService, + @IContextKeyService private readonly _contextKeyService: IContextKeyService, @IKeybindingService private keybindingService: IKeybindingService ) { this._overlayVisible = OVERLAY_VISIBLE.bindTo(this._contextKeyService); diff --git a/src/vs/workbench/services/progress/browser/progressService2.ts b/src/vs/workbench/services/progress/browser/progressService2.ts index cf356213af6..b728fbc0e01 100644 --- a/src/vs/workbench/services/progress/browser/progressService2.ts +++ b/src/vs/workbench/services/progress/browser/progressService2.ts @@ -61,8 +61,8 @@ export class ProgressService2 implements IProgressService2 { private _stack: [IProgressOptions, Progress][] = []; constructor( - @IActivityService private _activityBar: IActivityService, - @IViewletService private _viewletService: IViewletService + @IActivityService private readonly _activityBar: IActivityService, + @IViewletService private readonly _viewletService: IViewletService ) { // }