MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 09:03:31 +07:00
Code Issues Packages Projects Releases Wiki Activity

intelli-lang: fix resizing of Java method parameter form (IDEA-254971)

Browse Source 
GitOrigin-RevId: cb8af213200f6636d40efb1c456ec3ec937e028e
This commit is contained in:
Bas Leijdekkers
2020-11-09 16:48:30 +00:00
committed by intellij-monorepo-bot
parent e33dfe8204
commit 9e0dbabb9a
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.form
+3 -3
View File
@@ -10,13 +10,13 @@
<children>
<nested-form id="1d540" form-file="org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.form" binding="myLanguagePanel" custom-create="true">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</nested-form>
<grid id="84778" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="0" vgap="0">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
@@ -49,7 +49,7 @@
</grid>
<nested-form id="b6e0b" form-file="org/intellij/plugins/intelliLang/inject/config/ui/AdvancedPanel.form" binding="myAdvancedPanel" custom-create="true">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</nested-form>
</children>
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.java
+3 -5
View File
@@ -55,6 +55,7 @@ import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.Enumeration;
public class MethodParameterPanel extends AbstractInjectionPanel<MethodParameterInjection> {
@@ -88,6 +89,7 @@ public class MethodParameterPanel extends AbstractInjectionPanel<MethodParameter
return document;
}, "");
myClassPanel.add(myClassField, BorderLayout.CENTER);
myParamsTable.setTableHeader(null);
myParamsTable.getTree().setShowsRootHandles(true);
myParamsTable.getTree().setCellRenderer(new ColoredTreeCellRenderer() {
@Override
@@ -202,11 +204,7 @@ public class MethodParameterPanel extends AbstractInjectionPanel<MethodParameter
private void refreshTreeStructure() {
myRootNode.removeAllChildren();
final ArrayList<PsiMethod> methods = new ArrayList<>(myData.keySet());
methods.sort((o1, o2) -> {
final int names = o1.getName().compareTo(o2.getName());
if (names != 0) return names;
return o1.getParameterList().getParametersCount() - o2.getParameterList().getParametersCount();
});
methods.sort(Comparator.comparing(PsiMethod::getName).thenComparingInt(o -> o.getParameterList().getParametersCount()));
for (PsiMethod method : methods) {
final PsiParameter[] params = method.getParameterList().getParameters();
final DefaultMutableTreeNode methodNode = new DefaultMutableTreeNode(method, true);