Skip to content

Commit

Permalink
language-server: CodeActionProvider respects only field when returnin…
Browse files Browse the repository at this point in the history
…g code actions by filtering out code actions with a kind value that doesn't match (closes #775)
  • Loading branch information
joshtynjala committed Oct 7, 2024
1 parent 7d8bc1f commit 6e00d9e
Showing 1 changed file with 27 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import com.as3mxml.vscode.commands.ICommandConstants;
import com.as3mxml.vscode.project.ILspProject;
import com.as3mxml.vscode.project.ActionScriptProjectData;
import com.as3mxml.vscode.utils.ASTUtils;
import com.as3mxml.vscode.utils.CodeActionsUtils;
import com.as3mxml.vscode.utils.CompilationUnitUtils.IncludeFileData;
import com.as3mxml.vscode.utils.CompilerProjectUtils;
import com.as3mxml.vscode.utils.FileTracker;
import com.as3mxml.vscode.utils.ImportRange;
import com.as3mxml.vscode.utils.LanguageServerCompilerUtils;
import com.as3mxml.vscode.utils.MXMLDataUtils;
import com.as3mxml.vscode.utils.SourcePathUtils;
import com.as3mxml.vscode.utils.ActionScriptProjectManager;
import com.google.common.collect.Lists;
import com.google.gson.JsonObject;
import java.util.stream.Collectors;

import org.apache.royale.compiler.definitions.IDefinition;
import org.apache.royale.compiler.definitions.IInterfaceDefinition;
Expand Down Expand Up @@ -64,6 +49,22 @@
import org.eclipse.lsp4j.jsonrpc.CancelChecker;
import org.eclipse.lsp4j.jsonrpc.messages.Either;

import com.as3mxml.vscode.commands.ICommandConstants;
import com.as3mxml.vscode.project.ActionScriptProjectData;
import com.as3mxml.vscode.project.ILspProject;
import com.as3mxml.vscode.utils.ASTUtils;
import com.as3mxml.vscode.utils.ActionScriptProjectManager;
import com.as3mxml.vscode.utils.CodeActionsUtils;
import com.as3mxml.vscode.utils.CompilationUnitUtils.IncludeFileData;
import com.as3mxml.vscode.utils.CompilerProjectUtils;
import com.as3mxml.vscode.utils.FileTracker;
import com.as3mxml.vscode.utils.ImportRange;
import com.as3mxml.vscode.utils.LanguageServerCompilerUtils;
import com.as3mxml.vscode.utils.MXMLDataUtils;
import com.as3mxml.vscode.utils.SourcePathUtils;
import com.google.common.collect.Lists;
import com.google.gson.JsonObject;

public class CodeActionProvider {
private static final String FILE_EXTENSION_MXML = ".mxml";

Expand Down Expand Up @@ -134,6 +135,16 @@ public List<Either<Command, CodeAction>> codeAction(CodeActionParams params, Can
if (cancelToken != null) {
cancelToken.checkCanceled();
}
List<String> only = params.getContext().getOnly();
if (only != null) {
codeActions = codeActions.stream().filter(item -> {
if (item.isLeft()) {
return true;
}
CodeAction codeAction = item.getRight();
return only.contains(codeAction.getKind());
}).collect(Collectors.toList());
}
return codeActions;
}

Expand Down

0 comments on commit 6e00d9e

Please sign in to comment.