Skip to content

Simplify JavaCodeTemplateFilter#accept #8794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2025
Merged

Simplify JavaCodeTemplateFilter#accept #8794

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 7 additions & 18 deletions java/java.editor/src/org/netbeans/modules/editor/java/JavaCodeTemplateFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
import com.sun.source.tree.Tree;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.swing.text.Document;
Expand All @@ -34,6 +32,7 @@
import com.sun.source.tree.ExpressionTree;
import com.sun.source.util.SourcePositions;
import com.sun.source.util.TreePath;
import java.util.Set;
import org.netbeans.api.java.lexer.JavaTokenId;
import org.netbeans.api.java.source.CompilationController;
import org.netbeans.api.java.source.JavaSource.Phase;
Expand Down Expand Up @@ -74,7 +73,7 @@ private JavaCodeTemplateFilter(Document doc, int startOffset, int endOffset) {
final AtomicBoolean cancel = new AtomicBoolean();
BaseProgressUtils.runOffEventDispatchThread(() -> {
try {
ParserManager.parse(Collections.singleton(source), new UserTask() {
ParserManager.parse(Set.of(source), new UserTask() {
@Override
public void run(ResultIterator resultIterator) throws Exception {
if (cancel.get()) {
Expand Down Expand Up @@ -205,22 +204,12 @@ public synchronized boolean accept(CodeTemplate template) {
if (treeKindCtx == null && stringCtx == null) {
return false;
}
EnumSet<Tree.Kind> treeKindContexts = EnumSet.noneOf(Tree.Kind.class);
HashSet stringContexts = new HashSet();
getTemplateContexts(template, treeKindContexts, stringContexts);
return treeKindContexts.isEmpty() && stringContexts.isEmpty() && treeKindCtx != Tree.Kind.STRING_LITERAL || treeKindContexts.contains(treeKindCtx) || stringContexts.contains(stringCtx);
}

private void getTemplateContexts(CodeTemplate template, EnumSet<Tree.Kind> treeKindContexts, HashSet<String> stringContexts) {
List<String> contexts = template.getContexts();
if (contexts != null) {
for(String context : contexts) {
try {
treeKindContexts.add(Tree.Kind.valueOf(context));
} catch (IllegalArgumentException iae) {
stringContexts.add(context);
}
}
if (contexts == null || contexts.isEmpty()) {
return treeKindCtx != Tree.Kind.STRING_LITERAL;
} else {
return (treeKindCtx != null && contexts.contains(treeKindCtx.name()))
|| (stringCtx != null && contexts.contains(stringCtx));
}
}

Expand Down
Loading