Skip to content

Commit e377626

Browse files
committed
activate instrumentCode for form and other code generation on build and use buildSearchableOptions
1 parent f457961 commit e377626

17 files changed

+0
-974
lines changed

build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ intellijPlatform {
6060
pluginConfiguration {
6161
name = properties("pluginName")
6262
}
63-
instrumentCode = false
64-
buildSearchableOptions = false
6563

6664
pluginVerification {
6765
ides {

src/main/java/fr/adrienbrault/idea/symfony2plugin/SettingsForm.java

Lines changed: 0 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111
import com.intellij.openapi.ui.TextFieldWithBrowseButton;
1212
import com.intellij.openapi.vfs.VfsUtil;
1313
import com.intellij.openapi.vfs.VirtualFile;
14-
import com.intellij.uiDesigner.core.GridConstraints;
15-
import com.intellij.uiDesigner.core.GridLayoutManager;
16-
import com.intellij.uiDesigner.core.Spacer;
17-
import com.jgoodies.forms.layout.CellConstraints;
18-
import com.jgoodies.forms.layout.FormLayout;
1914
import fr.adrienbrault.idea.symfony2plugin.stubs.util.IndexUtil;
2015
import fr.adrienbrault.idea.symfony2plugin.util.IdeHelper;
2116
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
@@ -26,7 +21,6 @@
2621
import org.jetbrains.annotations.Nullable;
2722

2823
import javax.swing.*;
29-
import java.awt.*;
3024
import java.awt.event.ActionEvent;
3125
import java.awt.event.MouseAdapter;
3226
import java.awt.event.MouseEvent;
@@ -256,122 +250,4 @@ public void mouseExited(MouseEvent mouseEvent) {
256250
public static void show(@NotNull Project project) {
257251
ShowSettingsUtilImpl.showSettingsDialog(project, "Symfony2.SettingsForm", null);
258252
}
259-
260-
{
261-
// GUI initializer generated by IntelliJ IDEA GUI Designer
262-
// >>> IMPORTANT!! <<<
263-
// DO NOT EDIT OR ADD ANY CODE HERE!
264-
$$$setupUI$$$();
265-
}
266-
267-
/**
268-
* Method generated by IntelliJ IDEA GUI Designer
269-
* >>> IMPORTANT!! <<<
270-
* DO NOT edit this method OR call it in your code!
271-
*
272-
* @noinspection ALL
273-
*/
274-
private void $$$setupUI$$$() {
275-
panel1 = new JPanel();
276-
panel1.setLayout(new GridLayoutManager(2, 5, new Insets(0, 0, 0, 0), -1, -1));
277-
final JPanel panel2 = new JPanel();
278-
panel2.setLayout(new FormLayout("fill:max(d;4px):noGrow,left:4dlu:noGrow,fill:d:grow,left:4dlu:noGrow,fill:max(d;4px):noGrow,left:4dlu:noGrow,fill:max(d;4px):noGrow", "center:max(d;4px):noGrow,top:4dlu:noGrow,center:max(d;4px):noGrow,top:4dlu:noGrow,center:max(d;4px):noGrow,top:6dlu:noGrow,center:max(d;4px):noGrow,top:4dlu:noGrow,center:max(d;4px):noGrow,top:4dlu:noGrow,center:max(d;4px):noGrow,top:4dlu:noGrow,center:max(d;4px):noGrow,top:4dlu:noGrow,center:max(d;4px):noGrow,top:4dlu:noGrow,center:max(d;4px):noGrow,top:4dlu:noGrow,center:max(d;4px):noGrow,top:4dlu:noGrow,center:max(d;4px):noGrow,top:4dlu:noGrow,center:max(d;4px):noGrow,top:4dlu:noGrow,center:max(d;4px):noGrow,top:4dlu:noGrow,center:max(d;4px):noGrow,top:4dlu:noGrow,center:max(d;4px):noGrow,top:4dlu:noGrow,center:max(d;4px):noGrow,top:4dlu:noGrow,center:max(d;4px):noGrow"));
279-
panel1.add(panel2, new GridConstraints(1, 0, 1, 5, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
280-
directoryToWebLabel = new JLabel();
281-
directoryToWebLabel.setText("Web Directory");
282-
CellConstraints cc = new CellConstraints();
283-
panel2.add(directoryToWebLabel, cc.xy(1, 3));
284-
directoryToWeb = new TextFieldWithBrowseButton();
285-
panel2.add(directoryToWeb, cc.xy(3, 3, CellConstraints.FILL, CellConstraints.DEFAULT));
286-
directoryToWebReset = new JButton();
287-
directoryToWebReset.setText("Default");
288-
panel2.add(directoryToWebReset, cc.xy(5, 3));
289-
final JLabel label1 = new JLabel();
290-
label1.setText("Translation Root Path");
291-
panel2.add(label1, cc.xy(1, 1));
292-
pathToTranslationRootTextField = new TextFieldWithBrowseButton();
293-
panel2.add(pathToTranslationRootTextField, cc.xy(3, 1, CellConstraints.FILL, CellConstraints.DEFAULT));
294-
pathToTranslationRootTextFieldReset = new JButton();
295-
pathToTranslationRootTextFieldReset.setText("Default");
296-
panel2.add(pathToTranslationRootTextFieldReset, cc.xy(5, 1));
297-
final JLabel label2 = new JLabel();
298-
label2.setText("Code Folding");
299-
panel2.add(label2, cc.xy(3, 9));
300-
codeFoldingPhpRoute = new JCheckBox();
301-
codeFoldingPhpRoute.setText("Route (PHP)");
302-
panel2.add(codeFoldingPhpRoute, cc.xy(3, 11));
303-
codeFoldingPhpModel = new JCheckBox();
304-
codeFoldingPhpModel.setText("Repository Entity (PHP)");
305-
panel2.add(codeFoldingPhpModel, cc.xy(3, 13));
306-
codeFoldingTwigRoute = new JCheckBox();
307-
codeFoldingTwigRoute.setText("Route (Twig)");
308-
panel2.add(codeFoldingTwigRoute, cc.xy(3, 17));
309-
codeFoldingPhpTemplate = new JCheckBox();
310-
codeFoldingPhpTemplate.setText("Template (PHP)");
311-
panel2.add(codeFoldingPhpTemplate, cc.xy(3, 15));
312-
codeFoldingTwigTemplate = new JCheckBox();
313-
codeFoldingTwigTemplate.setText("Template (Twig)");
314-
panel2.add(codeFoldingTwigTemplate, cc.xy(3, 19));
315-
codeFoldingTwigConstant = new JCheckBox();
316-
codeFoldingTwigConstant.setText("Constant (Twig)");
317-
panel2.add(codeFoldingTwigConstant, cc.xy(3, 21));
318-
enableSchedulerCheckBox = new JCheckBox();
319-
enableSchedulerCheckBox.setText("Enable 5min scheduler (reopen Project after change)");
320-
enableSchedulerCheckBox.setMnemonic('S');
321-
enableSchedulerCheckBox.setDisplayedMnemonicIndex(12);
322-
panel2.add(enableSchedulerCheckBox, cc.xy(3, 5));
323-
final JLabel label3 = new JLabel();
324-
label3.setText("Download remote files (exp.)");
325-
panel2.add(label3, cc.xy(1, 5));
326-
final JLabel label4 = new JLabel();
327-
label4.setText("Custom Features");
328-
panel2.add(label4, cc.xy(3, 23));
329-
featureTwigIcon = new JCheckBox();
330-
featureTwigIcon.setText("Twig Icon Decoration");
331-
featureTwigIcon.setToolTipText("Decorate Twig file icons with layer to show possible content type");
332-
panel2.add(featureTwigIcon, cc.xy(3, 25));
333-
directoryToAppLabel = new JLabel();
334-
directoryToAppLabel.setText("App Directory");
335-
panel2.add(directoryToAppLabel, cc.xy(1, 33));
336-
directoryToApp = new TextFieldWithBrowseButton();
337-
panel2.add(directoryToApp, cc.xy(3, 33, CellConstraints.FILL, CellConstraints.DEFAULT));
338-
directoryToAppReset = new JButton();
339-
directoryToAppReset.setText("Default");
340-
panel2.add(directoryToAppReset, cc.xy(5, 33));
341-
final JLabel label5 = new JLabel();
342-
label5.setText("Legacy Features");
343-
panel2.add(label5, cc.xy(1, 31));
344-
featureTypeProvider = new JCheckBox();
345-
featureTypeProvider.setText("Type Provider");
346-
featureTypeProvider.setToolTipText("Resolve return type via parameter eg \"ContainerInterface::get, EntityManager::find\"");
347-
panel2.add(featureTypeProvider, cc.xy(3, 29));
348-
dismissYamlSchemaNotification = new JCheckBox();
349-
dismissYamlSchemaNotification.setText("Dismiss YAML Schema Notification");
350-
dismissYamlSchemaNotification.setToolTipText("Don't show notification banner suggesting to add YAML schema hint for Symfony service files");
351-
panel2.add(dismissYamlSchemaNotification, cc.xy(3, 27));
352-
pluginEnabled = new JCheckBox();
353-
pluginEnabled.setText("Enable for Project (needs restart)");
354-
panel1.add(pluginEnabled, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
355-
buttonHelp = new JButton();
356-
buttonHelp.setHorizontalAlignment(0);
357-
buttonHelp.setHorizontalTextPosition(4);
358-
buttonHelp.setText("Project Page / Documentation");
359-
panel1.add(buttonHelp, new GridConstraints(0, 4, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
360-
buttonReindex = new JButton();
361-
buttonReindex.setText("Clear Index");
362-
panel1.add(buttonReindex, new GridConstraints(0, 3, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
363-
final Spacer spacer1 = new Spacer();
364-
panel1.add(spacer1, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
365-
buttonAutoConfigure = new JButton();
366-
buttonAutoConfigure.setText("Auto Configure");
367-
panel1.add(buttonAutoConfigure, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
368-
}
369-
370-
/**
371-
* @noinspection ALL
372-
*/
373-
public JComponent $$$getRootComponent$$$() {
374-
return panel1;
375-
}
376-
377253
}

src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialog.java

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
import com.intellij.openapi.ui.ComboBox;
66
import com.intellij.ui.ToolbarDecorator;
77
import com.intellij.ui.table.TableView;
8-
import com.intellij.uiDesigner.core.GridConstraints;
9-
import com.intellij.uiDesigner.core.GridLayoutManager;
10-
import com.intellij.uiDesigner.core.Spacer;
118
import com.intellij.util.ui.ColumnInfo;
129
import com.intellij.util.ui.ListTableModel;
1310
import com.jetbrains.php.lang.psi.elements.PhpClass;
@@ -110,42 +107,6 @@ private void createUIComponents() {
110107

111108
}
112109

113-
{
114-
// GUI initializer generated by IntelliJ IDEA GUI Designer
115-
// >>> IMPORTANT!! <<<
116-
// DO NOT EDIT OR ADD ANY CODE HERE!
117-
$$$setupUI$$$();
118-
}
119-
120-
/**
121-
* Method generated by IntelliJ IDEA GUI Designer
122-
* >>> IMPORTANT!! <<<
123-
* DO NOT edit this method OR call it in your code!
124-
*
125-
* @noinspection ALL
126-
*/
127-
private void $$$setupUI$$$() {
128-
createUIComponents();
129-
panel1 = new JPanel();
130-
panel1.setLayout(new GridLayoutManager(2, 3, new Insets(5, 5, 5, 5), -1, -1));
131-
generateButton = new JButton();
132-
generateButton.setText("Generate");
133-
panel1.add(generateButton, new GridConstraints(1, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
134-
closeButton = new JButton();
135-
closeButton.setText("Close");
136-
panel1.add(closeButton, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
137-
final Spacer spacer1 = new Spacer();
138-
panel1.add(spacer1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
139-
panel1.add(mainPanel, new GridConstraints(0, 0, 1, 3, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
140-
}
141-
142-
/**
143-
* @noinspection ALL
144-
*/
145-
public JComponent $$$getRootComponent$$$() {
146-
return panel1;
147-
}
148-
149110
private static class ServiceParameter {
150111

151112
private final String classFqn;

0 commit comments

Comments
 (0)