Skip to content

Commit efe3c84

Browse files
VISTALLVISTALL
committed
reduce dependency to ide.impl module
1 parent 100ff9d commit efe3c84

88 files changed

Lines changed: 5133 additions & 5145 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/HotSwapManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
import consulo.annotation.component.ServiceAPI;
2323
import consulo.annotation.component.ServiceImpl;
2424
import consulo.application.Application;
25-
import consulo.ide.impl.idea.openapi.util.io.FileUtil;
2625
import consulo.logging.Logger;
2726
import consulo.module.content.layer.OrderEnumerator;
2827
import consulo.platform.Platform;
2928
import consulo.project.Project;
29+
import consulo.util.io.FileUtil;
3030
import consulo.util.lang.Pair;
3131
import consulo.util.lang.StringUtil;
3232
import consulo.virtualFileSystem.VirtualFile;

‎java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/actions/JvmSmartStepIntoHandler.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@
2727
import consulo.execution.debug.XDebuggerActions;
2828
import consulo.execution.debug.ui.DebuggerUIUtil;
2929
import consulo.fileEditor.TextEditor;
30-
import consulo.ide.impl.idea.ui.popup.list.ListPopupImpl;
3130
import consulo.language.psi.PsiElement;
3231
import consulo.ui.annotation.RequiredUIAccess;
3332
import consulo.ui.ex.awt.JBList;
33+
import consulo.ui.ex.popup.JBPopupFactory;
34+
import consulo.ui.ex.popup.ListPopup;
3435
import jakarta.annotation.Nonnull;
3536
import jakarta.annotation.Nullable;
3637

@@ -78,7 +79,7 @@ public void execute(SmartStepTarget chosenTarget) {
7879
session.stepInto(true, createMethodFilter(chosenTarget));
7980
}
8081
});
81-
ListPopupImpl popup = new ListPopupImpl(popupStep);
82+
ListPopup popup = JBPopupFactory.getInstance().createListPopup(popupStep);
8283
DebuggerUIUtil.registerExtraHandleShortcuts(popup, XDebuggerActions.STEP_INTO);
8384
DebuggerUIUtil.registerExtraHandleShortcuts(popup, XDebuggerActions.SMART_STEP_INTO);
8485
popup.addListSelectionListener(e -> {

‎java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/EditorEvaluationCommand.java‎

Lines changed: 54 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -15,82 +15,86 @@
1515
*/
1616
package com.intellij.java.debugger.impl.ui;
1717

18-
import consulo.language.editor.hint.HintManager;
19-
import consulo.ide.impl.idea.codeInsight.hint.HintManagerImpl;
2018
import com.intellij.java.debugger.DebuggerBundle;
19+
import com.intellij.java.debugger.engine.evaluation.EvaluateException;
20+
import com.intellij.java.debugger.impl.DebuggerContextImpl;
2121
import com.intellij.java.debugger.impl.DebuggerInvocationUtil;
2222
import com.intellij.java.debugger.impl.DebuggerManagerEx;
23-
import com.intellij.java.debugger.engine.evaluation.EvaluateException;
2423
import com.intellij.java.debugger.impl.engine.evaluation.EvaluationContextImpl;
2524
import com.intellij.java.debugger.impl.engine.events.DebuggerContextCommandImpl;
26-
import com.intellij.java.debugger.impl.DebuggerContextImpl;
2725
import consulo.application.ApplicationManager;
28-
import consulo.codeEditor.Editor;
29-
import consulo.component.ProcessCanceledException;
3026
import consulo.application.progress.ProgressIndicator;
31-
import consulo.project.Project;
3227
import consulo.application.util.function.Computable;
28+
import consulo.codeEditor.Editor;
29+
import consulo.component.ProcessCanceledException;
30+
import consulo.language.editor.hint.HintManager;
3331
import consulo.language.psi.PsiElement;
34-
32+
import consulo.project.Project;
3533
import jakarta.annotation.Nullable;
3634

3735
/**
3836
* @author lex
3937
*/
4038
public abstract class EditorEvaluationCommand<T> extends DebuggerContextCommandImpl {
41-
protected final PsiElement myElement;
42-
@Nullable private final Editor myEditor;
43-
protected final ProgressIndicator myProgressIndicator;
44-
private final DebuggerContextImpl myDebuggerContext;
39+
protected final PsiElement myElement;
40+
@Nullable
41+
private final Editor myEditor;
42+
protected final ProgressIndicator myProgressIndicator;
43+
private final DebuggerContextImpl myDebuggerContext;
4544

46-
public EditorEvaluationCommand(@Nullable Editor editor, PsiElement expression, DebuggerContextImpl context,
47-
final ProgressIndicator indicator) {
48-
super(context);
49-
Project project = expression.getProject();
50-
myProgressIndicator = indicator;
51-
myEditor = editor;
52-
myElement = expression;
53-
myDebuggerContext = (DebuggerManagerEx.getInstanceEx(project)).getContext();
54-
}
45+
public EditorEvaluationCommand(@Nullable Editor editor, PsiElement expression, DebuggerContextImpl context,
46+
final ProgressIndicator indicator) {
47+
super(context);
48+
Project project = expression.getProject();
49+
myProgressIndicator = indicator;
50+
myEditor = editor;
51+
myElement = expression;
52+
myDebuggerContext = (DebuggerManagerEx.getInstanceEx(project)).getContext();
53+
}
5554

56-
public Priority getPriority() {
57-
return Priority.HIGH;
58-
}
55+
public Priority getPriority() {
56+
return Priority.HIGH;
57+
}
5958

60-
protected abstract T evaluate(EvaluationContextImpl evaluationContext) throws EvaluateException;
59+
protected abstract T evaluate(EvaluationContextImpl evaluationContext) throws EvaluateException;
6160

62-
public T evaluate() throws EvaluateException {
63-
myProgressIndicator.setText(DebuggerBundle.message("progress.evaluating", ApplicationManager.getApplication().runReadAction(new Computable<String>() {
61+
public T evaluate() throws EvaluateException {
62+
myProgressIndicator.setText(DebuggerBundle.message("progress.evaluating", ApplicationManager.getApplication().runReadAction(new Computable<String>() {
6463
public String compute() {
65-
return myElement.getText();
64+
return myElement.getText();
6665
}
67-
})));
66+
})));
6867

69-
try {
70-
T result = evaluate(myDebuggerContext.createEvaluationContext());
68+
try {
69+
T result = evaluate(myDebuggerContext.createEvaluationContext());
7170

72-
if (myProgressIndicator.isCanceled()) throw new ProcessCanceledException();
71+
if (myProgressIndicator.isCanceled()) {
72+
throw new ProcessCanceledException();
73+
}
7374

74-
return result;
75-
} catch (final EvaluateException e) {
76-
if (myEditor != null) {
77-
DebuggerInvocationUtil.invokeLater(myDebuggerContext.getProject(), new Runnable() {
78-
public void run() {
79-
showEvaluationHint(myEditor, myElement, e);
80-
}
81-
}, myProgressIndicator.getModalityState());
82-
}
83-
throw e;
75+
return result;
76+
}
77+
catch (final EvaluateException e) {
78+
if (myEditor != null) {
79+
DebuggerInvocationUtil.invokeLater(myDebuggerContext.getProject(), new Runnable() {
80+
public void run() {
81+
showEvaluationHint(myEditor, myElement, e);
82+
}
83+
}, myProgressIndicator.getModalityState());
84+
}
85+
throw e;
86+
}
8487
}
85-
}
8688

87-
public static void showEvaluationHint(final Editor myEditor, final PsiElement myElement, final EvaluateException e) {
88-
if (myEditor.isDisposed() || !myEditor.getComponent().isVisible()) return;
89+
public static void showEvaluationHint(final Editor myEditor, final PsiElement myElement, final EvaluateException e) {
90+
if (myEditor.isDisposed() || !myEditor.getComponent().isVisible()) {
91+
return;
92+
}
8993

90-
HintManager.getInstance().showErrorHint(myEditor, e.getMessage(), myElement.getTextRange().getStartOffset(),
91-
myElement.getTextRange().getEndOffset(), HintManagerImpl.UNDER,
92-
HintManagerImpl.HIDE_BY_ESCAPE | HintManagerImpl.HIDE_BY_TEXT_CHANGE,
93-
1500);
94-
}
94+
HintManager.getInstance().showErrorHint(myEditor, e.getMessage(), myElement.getTextRange().getStartOffset(),
95+
myElement.getTextRange().getEndOffset(), HintManager.UNDER,
96+
HintManager.HIDE_BY_ESCAPE | HintManager.HIDE_BY_TEXT_CHANGE,
97+
1500);
98+
}
9599

96100
}

‎java-intellilang/src/main/java/consulo/java/impl/intelliLang/JavaLanguageInjectionSupport.java‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import consulo.application.AllIcons;
2626
import consulo.application.Result;
2727
import consulo.configurable.Configurable;
28-
import consulo.ide.impl.idea.util.ArrayUtilRt;
29-
import consulo.ide.impl.idea.util.NullableFunction;
3028
import consulo.ide.setting.ShowSettingsUtil;
3129
import consulo.java.impl.intelliLang.config.MethodParameterInjection;
3230
import consulo.java.impl.intelliLang.config.ui.MethodParameterPanel;
@@ -50,6 +48,7 @@
5048
import consulo.ui.ex.action.AnActionEvent;
5149
import consulo.ui.ex.awt.DialogBuilder;
5250
import consulo.ui.ex.awt.DialogWrapper;
51+
import consulo.util.collection.ArrayUtil;
5352
import consulo.util.collection.ContainerUtil;
5453
import consulo.util.lang.Pair;
5554
import consulo.util.lang.StringUtil;
@@ -119,14 +118,12 @@ public boolean removeInjectionInPlace(final PsiLanguageInjectionHost psiElement)
119118
return false;
120119
}
121120
final ArrayList<BaseInjection> originalInjections = new ArrayList<BaseInjection>(injectionsMap.keySet());
122-
final List<BaseInjection> newInjections = ContainerUtil.mapNotNull(originalInjections, new NullableFunction<BaseInjection, BaseInjection>() {
123-
public BaseInjection apply(final BaseInjection injection) {
124-
final Pair<PsiMethod, Integer> pair = injectionsMap.get(injection);
125-
final String placeText = getPatternStringForJavaPlace(pair.first, pair.second);
126-
final BaseInjection newInjection = injection.copy();
127-
newInjection.setPlaceEnabled(placeText, false);
128-
return InjectorUtils.canBeRemoved(newInjection) ? null : newInjection;
129-
}
121+
final List<BaseInjection> newInjections = ContainerUtil.mapNotNull(originalInjections, injection -> {
122+
final Pair<PsiMethod, Integer> pair = injectionsMap.get(injection);
123+
final String placeText = getPatternStringForJavaPlace(pair.first, pair.second);
124+
final BaseInjection newInjection = injection.copy();
125+
newInjection.setPlaceEnabled(placeText, false);
126+
return InjectorUtils.canBeRemoved(newInjection) ? null : newInjection;
130127
});
131128
configuration.replaceInjectionsWithUndo(project, newInjections, originalInjections, annotations);
132129
return true;
@@ -475,7 +472,7 @@ private static MethodParameterInjection createFrom(final Project project,
475472
}
476473
if (isInjectable(method.getReturnType(), method.getProject())) {
477474
final int parameterIndex = -1;
478-
int index = ArrayUtilRt.find(injection.getInjectionPlaces(), new InjectionPlace(
475+
int index = ArrayUtil.find(injection.getInjectionPlaces(), new InjectionPlace(
479476
compiler.compileElementPattern(getPatternStringForJavaPlace(method, parameterIndex)), true));
480477
final InjectionPlace place = index > -1 ? injection.getInjectionPlaces()[index] : null;
481478
methodInfo.setReturnFlag(place != null && place.isEnabled() || includeAllPlaces);
@@ -485,7 +482,7 @@ private static MethodParameterInjection createFrom(final Project project,
485482
for (int i = 0; i < parameters.length; i++) {
486483
final PsiParameter p = parameters[i];
487484
if (isInjectable(p.getType(), p.getProject())) {
488-
int index = ArrayUtilRt.find(injection.getInjectionPlaces(),
485+
int index = ArrayUtil.find(injection.getInjectionPlaces(),
489486
new InjectionPlace(compiler.compileElementPattern(getPatternStringForJavaPlace(method, i)),
490487
true));
491488
final InjectionPlace place = index > -1 ? injection.getInjectionPlaces()[index] : null;

‎java-intellilang/src/main/java/consulo/java/impl/intelliLang/config/ui/MethodParameterPanel.java‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.intellij.java.language.psi.util.PsiFormatUtil;
2020
import com.intellij.java.language.util.TreeClassChooser;
2121
import com.intellij.java.language.util.TreeClassChooserFactory;
22-
import consulo.annotation.access.RequiredReadAction;
2322
import consulo.application.AllIcons;
2423
import consulo.application.Application;
2524
import consulo.application.util.function.Computable;
@@ -31,7 +30,6 @@
3130
import consulo.ide.impl.idea.ui.dualView.TreeTableView;
3231
import consulo.ide.impl.idea.ui.treeStructure.treetable.ListTreeTableModelOnColumns;
3332
import consulo.ide.impl.idea.ui.treeStructure.treetable.TreeColumnInfo;
34-
import consulo.ide.impl.idea.util.containers.Convertor;
3533
import consulo.java.impl.intelliLang.config.MethodParameterInjection;
3634
import consulo.java.impl.intelliLang.util.PsiUtilEx;
3735
import consulo.language.editor.ui.awt.ReferenceEditorWithBrowseButton;
@@ -63,7 +61,6 @@
6361
import javax.swing.table.TableCellEditor;
6462
import javax.swing.table.TableCellRenderer;
6563
import javax.swing.tree.DefaultMutableTreeNode;
66-
import javax.swing.tree.TreePath;
6764
import java.awt.*;
6865
import java.awt.event.ActionEvent;
6966
import java.awt.event.ActionListener;
@@ -141,13 +138,9 @@ else if (o instanceof PsiParameter parameter) {
141138

142139
});
143140
init(injection.copy());
144-
new TreeTableSpeedSearch(myParamsTable, new Convertor<>() {
145-
@Nullable
146-
@RequiredReadAction
147-
public String convert(final TreePath o) {
148-
final Object userObject = ((DefaultMutableTreeNode)o.getLastPathComponent()).getUserObject();
149-
return userObject instanceof PsiNamedElement namedElement ? namedElement.getName() : null;
150-
}
141+
new TreeTableSpeedSearch(myParamsTable, o -> {
142+
final Object userObject = ((DefaultMutableTreeNode)o.getLastPathComponent()).getUserObject();
143+
return userObject instanceof PsiNamedElement namedElement ? namedElement.getName() : null;
151144
});
152145
new AnAction("Toggle") {
153146
@Override

‎java-intellilang/src/main/java/consulo/java/impl/intelliLang/pattern/compiler/InstrumentationItem.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
*/
1616
package consulo.java.impl.intelliLang.pattern.compiler;
1717

18-
import java.io.File;
19-
20-
import jakarta.annotation.Nonnull;
21-
2218
import consulo.compiler.FileProcessingCompiler;
2319
import consulo.compiler.ValidityState;
24-
import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore;
2520
import consulo.virtualFileSystem.VirtualFile;
21+
import consulo.virtualFileSystem.util.VirtualFileUtil;
22+
import jakarta.annotation.Nonnull;
23+
24+
import java.io.File;
2625

2726
class InstrumentationItem implements FileProcessingCompiler.ProcessingItem
2827
{
@@ -39,7 +38,7 @@ public InstrumentationItem(@Nonnull VirtualFile classFile, boolean jdk6)
3938
@Nonnull
4039
public File getFile()
4140
{
42-
return VfsUtilCore.virtualToIoFile(myClassFile);
41+
return VirtualFileUtil.virtualToIoFile(myClassFile);
4342
}
4443

4544
@Nonnull

0 commit comments

Comments
 (0)