From c6b67fe47c535d7852a248a07e35cc228d1fc481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=A4der?= Date: Sat, 17 Feb 2024 11:03:49 +0100 Subject: [PATCH] Update WorkspaceEdit metadata typing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #13355 Contributed on behalf of STMicroelectronics Signed-off-by: Thomas Mäder --- packages/plugin-ext/src/plugin/types-impl.ts | 8 ++++---- packages/plugin/src/theia.d.ts | 12 ++---------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/packages/plugin-ext/src/plugin/types-impl.ts b/packages/plugin-ext/src/plugin/types-impl.ts index 2115d74cabf74..d89f2d78194fa 100644 --- a/packages/plugin-ext/src/plugin/types-impl.ts +++ b/packages/plugin-ext/src/plugin/types-impl.ts @@ -1869,13 +1869,13 @@ export class WorkspaceEdit implements theia.WorkspaceEdit { } set(uri: URI, edits: ReadonlyArray): void; - set(uri: URI, edits: ReadonlyArray<[TextEdit | SnippetTextEdit, theia.WorkspaceEditEntryMetadata]>): void; + set(uri: URI, edits: ReadonlyArray<[TextEdit | SnippetTextEdit, theia.WorkspaceEditEntryMetadata | undefined]>): void; set(uri: URI, edits: ReadonlyArray): void; - set(uri: URI, edits: ReadonlyArray<[NotebookEdit, theia.WorkspaceEditEntryMetadata]>): void; + set(uri: URI, edits: ReadonlyArray<[NotebookEdit, theia.WorkspaceEditEntryMetadata | undefined]>): void; set(uri: URI, edits: ReadonlyArray): void { + | NotebookEdit | [NotebookEdit, theia.WorkspaceEditEntryMetadata | undefined] + | [TextEdit | SnippetTextEdit, theia.WorkspaceEditEntryMetadata | undefined]>): void { if (!edits) { // remove all text edits for `uri` for (let i = 0; i < this._edits.length; i++) { diff --git a/packages/plugin/src/theia.d.ts b/packages/plugin/src/theia.d.ts index f187bfffd0b5e..0c6c5a8bf2492 100644 --- a/packages/plugin/src/theia.d.ts +++ b/packages/plugin/src/theia.d.ts @@ -10258,15 +10258,7 @@ export module '@theia/plugin' { * @param uri A resource identifier. * @param edits An array of edits. */ - set(uri: Uri, edits: ReadonlyArray<[TextEdit | SnippetTextEdit, WorkspaceEditEntryMetadata]>): void; - - /** - * Set (and replace) text edits or snippet edits with metadata for a resource. - * - * @param uri A resource identifier. - * @param edits An array of edits. - */ - set(uri: Uri, edits: ReadonlyArray<[TextEdit | SnippetTextEdit, WorkspaceEditEntryMetadata]>): void; + set(uri: Uri, edits: ReadonlyArray<[TextEdit | SnippetTextEdit, WorkspaceEditEntryMetadata | undefined]>): void; /** * Set (and replace) notebook edits for a resource. @@ -10282,7 +10274,7 @@ export module '@theia/plugin' { * @param uri A resource identifier. * @param edits An array of edits. */ - set(uri: Uri, edits: ReadonlyArray<[NotebookEdit, WorkspaceEditEntryMetadata]>): void; + set(uri: Uri, edits: ReadonlyArray<[NotebookEdit, WorkspaceEditEntryMetadata | undefined]>): void; /** * Get the text edits for a resource.