💄 optional services

Benjamin Pasero · Benjamin Pasero · commit 72a7ece4b2ff · 2020-08-28T08:59:36.000+02:00
diff --git a/src/vs/editor/contrib/find/findController.ts b/src/vs/editor/contrib/find/findController.ts
@@ -20,7 +20,6 @@ import { MenuId } from 'vs/platform/actions/common/actions';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IContextKey, IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { optional } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
@@ -371,7 +370,6 @@ export class CommonFindController extends Disposable implements IEditorContribut
 
 	public async getGlobalBufferTerm(): Promise<string> {
 		if (this._editor.getOption(EditorOption.find).globalFindClipboard
-			&& this._clipboardService
 			&& this._editor.hasModel()
 			&& !this._editor.getModel().isTooLargeForSyncing()
 		) {
@@ -382,7 +380,6 @@ export class CommonFindController extends Disposable implements IEditorContribut
 
 	public setGlobalBufferTerm(text: string): void {
 		if (this._editor.getOption(EditorOption.find).globalFindClipboard
-			&& this._clipboardService
 			&& this._editor.hasModel()
 			&& !this._editor.getModel().isTooLargeForSyncing()
 		) {
@@ -406,7 +403,7 @@ export class FindController extends CommonFindController implements IFindControl
 		@INotificationService private readonly _notificationService: INotificationService,
 		@IStorageService _storageService: IStorageService,
 		@IStorageKeysSyncRegistryService private readonly _storageKeysSyncRegistryService: IStorageKeysSyncRegistryService,
-		@optional(IClipboardService) clipboardService: IClipboardService,
+		@IClipboardService clipboardService: IClipboardService,
 	) {
 		super(editor, _contextKeyService, _storageService, clipboardService);
 		this._widget = null;
diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -89,7 +89,7 @@ export class TelemetryService implements ITelemetryService {
 	}
 
 	private _updateUserOptIn(): void {
-		const config = this._configurationService.getValue<any>(TELEMETRY_SECTION_ID);
+		const config = this._configurationService?.getValue<any>(TELEMETRY_SECTION_ID);
 		this._userOptIn = config ? config.enableTelemetry : this._userOptIn;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ export class TelemetryService implements ITelemetryService {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`private _updateUserOptIn(): void {`
`92`		`- const config = this._configurationService.getValue<any>(TELEMETRY_SECTION_ID);`
	`92`	`+ const config = this._configurationService?.getValue<any>(TELEMETRY_SECTION_ID);`
`93`	`93`	`this._userOptIn = config ? config.enableTelemetry : this._userOptIn;`
`94`	`94`	`}`
`95`	`95`