Skip to content

Commit

Permalink
fix broken source actions
Browse files Browse the repository at this point in the history
  • Loading branch information
hopehadfield committed Aug 9, 2024
1 parent 00abea2 commit 866d26a
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -315,19 +315,21 @@ export async function activate(context: ExtensionContext): Promise<ExtensionAPI>
if (token.isCancellationRequested) {
return item;
}
const docChanges = result.edit.documentChanges;
for (const editType of docChanges) {
if ("textDocument" in editType) {
for (const edit of editType.edits) {
if ("snippet" in edit) {
documentUris.push(editType.textDocument.uri);
snippetEdits.push(new SnippetTextEdit(asRange((edit as any).range), new SnippetString((edit as any).snippet.value)));
const docChanges = result.edit !== undefined ? result.edit.documentChanges : undefined;
if (docChanges !== undefined) {
for (const editType of docChanges) {
if ("textDocument" in editType) {
for (const edit of editType.edits) {
if ("snippet" in edit) {
documentUris.push(editType.textDocument.uri);
snippetEdits.push(new SnippetTextEdit(asRange((edit as any).range), new SnippetString((edit as any).snippet.value)));
}
}
}
}
}
const codeAction = await client.protocol2CodeConverter.asCodeAction(result, token);
const docEdits = codeAction.edit.entries();
const docEdits = codeAction.edit !== undefined? codeAction.edit.entries() : [];
const newWorkspaceEdit = new WorkspaceEdit();
for (const doc of docEdits) {
const uri = doc[0];
Expand All @@ -350,7 +352,9 @@ export async function activate(context: ExtensionContext): Promise<ExtensionAPI>
newWorkspaceEdit.set(uri, doc[1]);
}
}
codeAction.edit = newWorkspaceEdit;
if (newWorkspaceEdit.size > 0) {
codeAction.edit = newWorkspaceEdit;
}
return codeAction;
}, (error) => {
return client.handleFailedRequest(CodeActionResolveRequest.type, token, error, item);
Expand Down

0 comments on commit 866d26a

Please sign in to comment.