Fix types on CopyPasteController.get (#200600)

Fixes #200597
microsoft · Dec 12, 2023 · fec4c8e · fec4c8e
1 parent 61c2876
commit fec4c8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/vs/editor/contrib/clipboard/browser/clipboard.ts b/src/vs/editor/contrib/clipboard/browser/clipboard.ts
@@ -229,7 +229,7 @@ if (PasteAction) {
 		if (focusedEditor && focusedEditor.hasTextFocus()) {
 			const result = focusedEditor.getContainerDomNode().ownerDocument.execCommand('paste');
 			if (result) {
-				return CopyPasteController.get(focusedEditor).finishedPaste();
+				return CopyPasteController.get(focusedEditor)?.finishedPaste() ?? Promise.resolve();
 			} else if (platform.isWeb) {
 				// Use the clipboard service if document.execCommand('paste') was not successful
 				return (async () => {

diff --git a/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts b/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
@@ -51,8 +51,8 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 
 	public static readonly ID = 'editor.contrib.copyPasteActionController';
 
-	public static get(editor: ICodeEditor): CopyPasteController {
-		return editor.getContribution<CopyPasteController>(CopyPasteController.ID)!;
+	public static get(editor: ICodeEditor): CopyPasteController | null {
+		return editor.getContribution<CopyPasteController>(CopyPasteController.ID);
 	}
 
 	private readonly _editor: ICodeEditor;