Skip to content

Forwardport 3 2 2 >4 0 0 #585

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 8 commits into from
May 3, 2021
Merged

Forwardport 3 2 2 >4 0 0 #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
66edec0
3.2.2 initial
Apr 21, 2021
51c78ef
Fixed `Java.lang.IllegalArgumentException` During adding a new method…
Apr 26, 2021
42fe978
Fixed wrong new entity layout name and edit entity layout name inside it
bohdan-harniuk Apr 26, 2021
c125854
Added change to changelog
bohdan-harniuk Apr 26, 2021
a5b8bba
Merge pull request #581 from bohdan-harniuk/fix-wrong-layout-names-fo…
Apr 27, 2021
9fd8ec1
Merge branch '3.2.2-develop' of github.com:magento/magento2-phpstorm-…
Apr 27, 2021
c17aa3d
Merge pull request #580 from magento/576-`Java.lang.IllegalArgumentEx…
Apr 28, 2021
c295277
Merge branch '4.0.0-develop' of github.com:magento/magento2-phpstorm-…
May 3, 2021
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).

## 4.0.0

## 3.2.2

### Fixed

- New entity layout name and edit entity layout name inside it
- `Java.lang.IllegalArgumentException` During adding a new method into an existing plugin

## 3.2.1

### Fixed
Expand Down
44 changes: 5 additions & 39 deletions resources/META-INF/pluginIcon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 15 additions & 7 deletions src/com/magento/idea/magento2plugin/actions/generation/PluginGenerateMethodHandlerBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import gnu.trove.THashSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
Expand Down Expand Up @@ -318,18 +317,27 @@ public static Collection<PhpNamedElementNode> fixOrderToBeAsOriginalFiles(
final PhpNamedElementNode... selected
) {
final List<PhpNamedElementNode> newSelected = ContainerUtil.newArrayList(selected);
Collections.sort(newSelected, (o1, o2) -> {
newSelected.sort((o1, o2) -> {
final PsiElement psiElement = o1.getPsiElement();
final PsiElement psiElement2 = o2.getPsiElement();
final PsiFile containingFile = psiElement.getContainingFile();
final PsiFile containingFile2 = psiElement2.getContainingFile();
return containingFile.equals(containingFile2)
? psiElement.getTextOffset() - psiElement2.getTextOffset()
: containingFile.getName().compareTo(containingFile2.getName());
? psiElement.getTextOffset() - psiElement2.getTextOffset()
: getDocumentPosition(containingFile, containingFile2);
});
return newSelected;
}

private static int getDocumentPosition(
final PsiFile containingFile,
final PsiFile containingFile2
) {
return containingFile.getVirtualFile().getPresentableUrl().compareTo(
containingFile2.getVirtualFile().getPresentableUrl()
);
}

private static int getSuitableEditorPosition(final Editor editor, final PhpFile phpFile) {
final PsiElement currElement = phpFile.findElementAt(editor.getCaretModel().getOffset());
if (currElement != null) {
Expand Down Expand Up @@ -371,9 +379,9 @@ private static boolean isClassMember(final PsiElement element) {
return false;
}
final IElementType elementType = element.getNode().getElementType();
return elementType == PhpElementTypes.CLASS_FIELDS
|| elementType == PhpElementTypes.CLASS_CONSTANTS
|| elementType == PhpStubElementTypes.CLASS_METHOD;
return elementType.equals(PhpElementTypes.CLASS_FIELDS)
|| elementType.equals(PhpElementTypes.CLASS_CONSTANTS)
|| elementType.equals(PhpStubElementTypes.CLASS_METHOD);
}

private static int getNextPos(final PsiElement element) {
Expand Down
3 changes: 1 addition & 2 deletions src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
import com.magento.idea.magento2plugin.ui.FilteredComboBox;
import com.magento.idea.magento2plugin.ui.table.TableGroupWrapper;
import com.magento.idea.magento2plugin.util.CamelCaseToSnakeCase;
import com.magento.idea.magento2plugin.util.FirstLetterToLowercaseUtil;
import com.magento.idea.magento2plugin.util.magento.GetAclResourcesListUtil;
import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
import java.awt.Cursor;
Expand Down Expand Up @@ -445,7 +444,7 @@ private EntityCreatorContextData getEntityCreatorContextData(
final String dtoInterfaceClassName = entityName.concat(DTO_INTERFACE_SUFFIX);

final String actionsPathPrefix = dialogData.getRoute() + File.separator
+ FirstLetterToLowercaseUtil.convert(entityName) + File.separator;
+ entityName.toLowerCase(Locale.getDefault()) + File.separator;
final NamespaceBuilder dtoModelNamespace =
new DataModelFile(moduleName, dtoClassName).getNamespaceBuilder();
final NamespaceBuilder dtoInterfaceNamespace =
Expand Down