mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-18 09:34:34 +07:00
IJPL-207762 [command completion] extract nested classes from JavaCommandCompletionFactory to upper level
GitOrigin-RevId: 52e85daa8b41c476772259fb6c8fc861130b367d
This commit is contained in:
Max Medvedev
committed by
intellij-monorepo-bot
intellij-monorepo-bot
parent
ca39ed7818
commit
d327bf69b2
@@ -1189,11 +1189,11 @@
|
||||
|
||||
<codeInsight.completion.command.factory language="JAVA" implementationClass="com.intellij.codeInsight.completion.commands.JavaCommandCompletionFactory" />
|
||||
<codeInsight.completion.intention.skipper language="JAVA"
|
||||
implementationClass="com.intellij.codeInsight.completion.commands.JavaCommandCompletionFactory$JavaIntentionCommandSkipper"/>
|
||||
implementationClass="com.intellij.codeInsight.completion.commands.JavaIntentionCommandSkipper"/>
|
||||
<codeInsight.completion.intention.skipper language="JAVA"
|
||||
implementationClass="com.intellij.codeInsight.intention.impl.JavaRefactoringIntentionCommandSkipper"/>
|
||||
<codeInsight.completion.intention.offset.provider language="JAVA"
|
||||
implementationClass="com.intellij.codeInsight.completion.commands.JavaCommandCompletionFactory$JavaIntentionCommandOffsetProvider"/>
|
||||
implementationClass="com.intellij.codeInsight.completion.commands.JavaIntentionCommandOffsetProvider"/>
|
||||
<!--<codeInsight.completion.command.provider language="JAVA" implementationClass="com.intellij.codeInsight.completion.command.commands.SimpleRunMarkerCommandProvider" />-->
|
||||
<codeInsight.completion.command.provider language="JAVA" implementationClass="com.intellij.codeInsight.completion.command.commands.DirectIntentionCommandProvider" order="last"/>
|
||||
<codeInsight.completion.command.provider language="JAVA" implementationClass="com.intellij.codeInsight.completion.commands.impl.JavaGenerateCommandCompletion" />
|
||||
|
||||
+1
-108
@@ -1,41 +1,19 @@
|
||||
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.codeInsight.completion.commands;
|
||||
|
||||
import com.intellij.codeInsight.completion.command.CommandCompletionFactory;
|
||||
import com.intellij.codeInsight.completion.command.commands.IntentionCommandOffsetProvider;
|
||||
import com.intellij.codeInsight.completion.command.commands.IntentionCommandSkipper;
|
||||
import com.intellij.codeInsight.daemon.impl.quickfix.CreateGetterOrSetterFix;
|
||||
import com.intellij.codeInsight.daemon.impl.quickfix.ExpensivePsiIntentionAction;
|
||||
import com.intellij.codeInsight.intention.CommonIntentionAction;
|
||||
import com.intellij.codeInspection.LocalQuickFix;
|
||||
import com.intellij.codeInspection.ex.QuickFixWrapper;
|
||||
import com.intellij.modcommand.ModCommandAction;
|
||||
import com.intellij.modcommand.ModCommandService;
|
||||
import com.intellij.openapi.editor.Document;
|
||||
import com.intellij.openapi.project.DumbAware;
|
||||
import com.intellij.openapi.util.text.StringUtil;
|
||||
import com.intellij.psi.JavaTokenType;
|
||||
import com.intellij.psi.PsiClass;
|
||||
import com.intellij.psi.PsiElement;
|
||||
import com.intellij.psi.PsiFile;
|
||||
import com.intellij.psi.PsiJShellFile;
|
||||
import com.intellij.psi.PsiJavaFile;
|
||||
import com.intellij.psi.PsiJavaToken;
|
||||
import com.intellij.psi.PsiLiteralExpression;
|
||||
import com.intellij.psi.PsiParameterList;
|
||||
import com.intellij.psi.PsiTypeElement;
|
||||
import com.intellij.psi.PsiWhiteSpace;
|
||||
import com.intellij.psi.util.PsiTreeUtil;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.ArrayDeque;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Queue;
|
||||
import java.util.Set;
|
||||
|
||||
class JavaCommandCompletionFactory implements CommandCompletionFactory, DumbAware {
|
||||
|
||||
@Override
|
||||
@@ -69,89 +47,4 @@ class JavaCommandCompletionFactory implements CommandCompletionFactory, DumbAwar
|
||||
PsiElement prevPrevLeaf = PsiTreeUtil.prevLeaf(prevLeaf, true);
|
||||
return PsiTreeUtil.getParentOfType(prevPrevLeaf, PsiTypeElement.class) != null;
|
||||
}
|
||||
|
||||
static class JavaIntentionCommandSkipper implements IntentionCommandSkipper {
|
||||
@Override
|
||||
public boolean skip(@NotNull CommonIntentionAction action, @NotNull PsiFile psiFile, int offset) {
|
||||
if (action instanceof ExpensivePsiIntentionAction) return true;
|
||||
LocalQuickFix fix = QuickFixWrapper.unwrap(action);
|
||||
if (fix != null) {
|
||||
ModCommandAction unwrappedAction = ModCommandService.getInstance().unwrap(fix);
|
||||
if (unwrappedAction instanceof CreateGetterOrSetterFix) return true;
|
||||
}
|
||||
return IntentionCommandSkipper.super.skip(action, psiFile, offset);
|
||||
}
|
||||
}
|
||||
|
||||
static class JavaIntentionCommandOffsetProvider implements IntentionCommandOffsetProvider {
|
||||
@Override
|
||||
public @NotNull List<@NotNull Integer> findOffsets(@NotNull PsiFile psiFile, int offset) {
|
||||
Set<Integer> results = new HashSet<>();
|
||||
Document document = psiFile.getFileDocument();
|
||||
Queue<Integer> queue = new ArrayDeque<>();
|
||||
queue.add(offset);
|
||||
while (!queue.isEmpty()) {
|
||||
Integer currentOffset = queue.poll();
|
||||
if (currentOffset == 0) continue;
|
||||
PsiElement element = psiFile.findElementAt(currentOffset - 1);
|
||||
int currentLine = document.getLineNumber(currentOffset - 1);
|
||||
while (element instanceof PsiWhiteSpace ||
|
||||
element != null &&
|
||||
StringUtil.isEmptyOrSpaces(element.getText())) {
|
||||
element = element.getPrevSibling();
|
||||
if (element == null) {
|
||||
break;
|
||||
}
|
||||
element = PsiTreeUtil.getDeepestLast(element);
|
||||
if (currentLine != document.getLineNumber(element.getTextRange().getEndOffset())) {
|
||||
element = null;
|
||||
break;
|
||||
}
|
||||
currentOffset = element.getTextRange().getEndOffset();
|
||||
}
|
||||
results.add(currentOffset);
|
||||
if (element == null) continue;
|
||||
if (element.getParent() instanceof PsiLiteralExpression literalExpression && literalExpression.getValue() instanceof String) {
|
||||
results.add(literalExpression.getTextRange().getEndOffset() - (literalExpression.isTextBlock() ? 3 : 1));
|
||||
}
|
||||
PsiElement parent = element.getParent();
|
||||
if (element instanceof PsiJavaToken) {
|
||||
Character open = braces.get(element.getText().charAt(0));
|
||||
//collect first from last
|
||||
PsiElement curParent = parent;
|
||||
if (open != null && curParent.getTextRange().getEndOffset() == element.getTextRange().getEndOffset()) {
|
||||
while (curParent.getTextRange().getEndOffset() == element.getTextRange().getEndOffset()) {
|
||||
int nextOffset = curParent.getTextRange().getStartOffset();
|
||||
curParent = curParent.getParent();
|
||||
boolean stopParent = curParent == null || curParent instanceof PsiClass || curParent instanceof PsiFile;
|
||||
if (results.add(nextOffset) && !stopParent) {
|
||||
queue.add(nextOffset);
|
||||
}
|
||||
if (stopParent) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
//collect open from closed
|
||||
if (open != null) {
|
||||
for (PsiElement child : parent.getChildren()) {
|
||||
if (child instanceof PsiJavaToken && child.getText().charAt(0) == open) {
|
||||
int nextOffset = child.getTextRange().getStartOffset();
|
||||
if (!results.contains(nextOffset)) {
|
||||
queue.add(nextOffset);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return new ArrayList<>(results);
|
||||
}
|
||||
|
||||
private static final Map<Character, Character> braces =
|
||||
Map.of(']', '[',
|
||||
'}', '{',
|
||||
')', '(');
|
||||
}
|
||||
}
|
||||
|
||||
+94
@@ -0,0 +1,94 @@
|
||||
// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.codeInsight.completion.commands;
|
||||
|
||||
import com.intellij.codeInsight.completion.command.commands.IntentionCommandOffsetProvider;
|
||||
import com.intellij.openapi.editor.Document;
|
||||
import com.intellij.openapi.util.text.StringUtil;
|
||||
import com.intellij.psi.PsiClass;
|
||||
import com.intellij.psi.PsiElement;
|
||||
import com.intellij.psi.PsiFile;
|
||||
import com.intellij.psi.PsiJavaToken;
|
||||
import com.intellij.psi.PsiLiteralExpression;
|
||||
import com.intellij.psi.PsiWhiteSpace;
|
||||
import com.intellij.psi.util.PsiTreeUtil;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.ArrayDeque;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Queue;
|
||||
import java.util.Set;
|
||||
|
||||
class JavaIntentionCommandOffsetProvider implements IntentionCommandOffsetProvider {
|
||||
@Override
|
||||
public @NotNull List<@NotNull Integer> findOffsets(@NotNull PsiFile psiFile, int offset) {
|
||||
Set<Integer> results = new HashSet<>();
|
||||
Document document = psiFile.getFileDocument();
|
||||
Queue<Integer> queue = new ArrayDeque<>();
|
||||
queue.add(offset);
|
||||
while (!queue.isEmpty()) {
|
||||
Integer currentOffset = queue.poll();
|
||||
if (currentOffset == 0) continue;
|
||||
PsiElement element = psiFile.findElementAt(currentOffset - 1);
|
||||
int currentLine = document.getLineNumber(currentOffset - 1);
|
||||
while (element instanceof PsiWhiteSpace ||
|
||||
element != null &&
|
||||
StringUtil.isEmptyOrSpaces(element.getText())) {
|
||||
element = element.getPrevSibling();
|
||||
if (element == null) {
|
||||
break;
|
||||
}
|
||||
element = PsiTreeUtil.getDeepestLast(element);
|
||||
if (currentLine != document.getLineNumber(element.getTextRange().getEndOffset())) {
|
||||
element = null;
|
||||
break;
|
||||
}
|
||||
currentOffset = element.getTextRange().getEndOffset();
|
||||
}
|
||||
results.add(currentOffset);
|
||||
if (element == null) continue;
|
||||
if (element.getParent() instanceof PsiLiteralExpression literalExpression && literalExpression.getValue() instanceof String) {
|
||||
results.add(literalExpression.getTextRange().getEndOffset() - (literalExpression.isTextBlock() ? 3 : 1));
|
||||
}
|
||||
PsiElement parent = element.getParent();
|
||||
if (element instanceof PsiJavaToken) {
|
||||
Character open = braces.get(element.getText().charAt(0));
|
||||
//collect first from last
|
||||
PsiElement curParent = parent;
|
||||
if (open != null && curParent.getTextRange().getEndOffset() == element.getTextRange().getEndOffset()) {
|
||||
while (curParent.getTextRange().getEndOffset() == element.getTextRange().getEndOffset()) {
|
||||
int nextOffset = curParent.getTextRange().getStartOffset();
|
||||
curParent = curParent.getParent();
|
||||
boolean stopParent = curParent == null || curParent instanceof PsiClass || curParent instanceof PsiFile;
|
||||
if (results.add(nextOffset) && !stopParent) {
|
||||
queue.add(nextOffset);
|
||||
}
|
||||
if (stopParent) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
//collect open from closed
|
||||
if (open != null) {
|
||||
for (PsiElement child : parent.getChildren()) {
|
||||
if (child instanceof PsiJavaToken && child.getText().charAt(0) == open) {
|
||||
int nextOffset = child.getTextRange().getStartOffset();
|
||||
if (!results.contains(nextOffset)) {
|
||||
queue.add(nextOffset);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return new ArrayList<>(results);
|
||||
}
|
||||
|
||||
private static final Map<Character, Character> braces =
|
||||
Map.of(']', '[',
|
||||
'}', '{',
|
||||
')', '(');
|
||||
}
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package com.intellij.codeInsight.completion.commands;
|
||||
|
||||
import com.intellij.codeInsight.completion.command.commands.IntentionCommandSkipper;
|
||||
import com.intellij.codeInsight.daemon.impl.quickfix.CreateGetterOrSetterFix;
|
||||
import com.intellij.codeInsight.daemon.impl.quickfix.ExpensivePsiIntentionAction;
|
||||
import com.intellij.codeInsight.intention.CommonIntentionAction;
|
||||
import com.intellij.codeInspection.LocalQuickFix;
|
||||
import com.intellij.codeInspection.ex.QuickFixWrapper;
|
||||
import com.intellij.modcommand.ModCommandAction;
|
||||
import com.intellij.modcommand.ModCommandService;
|
||||
import com.intellij.psi.PsiFile;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
class JavaIntentionCommandSkipper implements IntentionCommandSkipper {
|
||||
@Override
|
||||
public boolean skip(@NotNull CommonIntentionAction action, @NotNull PsiFile psiFile, int offset) {
|
||||
if (action instanceof ExpensivePsiIntentionAction) return true;
|
||||
LocalQuickFix fix = QuickFixWrapper.unwrap(action);
|
||||
if (fix != null) {
|
||||
ModCommandAction unwrappedAction = ModCommandService.getInstance().unwrap(fix);
|
||||
if (unwrappedAction instanceof CreateGetterOrSetterFix) return true;
|
||||
}
|
||||
return IntentionCommandSkipper.super.skip(action, psiFile, offset);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user