Skip to content

Move write action out of AWT event for PhpServiceArgumentIntention #1220

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 3 commits into from
Sep 22, 2018
Merged

Move write action out of AWT event for PhpServiceArgumentIntention #1220

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
243d989
Move write action out of AWT event for PhpServiceArgumentIntention
cedricziel Aug 21, 2018
0e8c1f4
Move back to JBList to support legacy platform
cedricziel Aug 21, 2018
7962303
Inline Callback
cedricziel Sep 11, 2018
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
90 changes: 48 additions & 42 deletions ...n/java/fr/adrienbrault/idea/symfony2plugin/dic/intention/PhpServiceArgumentIntention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,57 +30,62 @@ public class PhpServiceArgumentIntention extends PsiElementBaseIntentionAction {
@Override
public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement psiElement) throws IncorrectOperationException {
PhpClass phpClass = PsiTreeUtil.getParentOfType(psiElement, PhpClass.class);
if(phpClass != null) {
Set<String> serviceNames = ContainerCollectionResolver.ServiceCollector.create(project).convertClassNameToServices(phpClass.getFQN());
if(serviceNames.size() > 0) {
Collection<PsiElement> psiElements = new ArrayList<>();
for(String serviceName: serviceNames) {
psiElements.addAll(ServiceIndexUtil.findServiceDefinitions(project, serviceName));
}

if(psiElements.size() > 0) {
Map<String, PsiElement> map = new HashMap<>();

for (PsiElement element : psiElements) {
map.put(VfsUtil.getRelativePath(element.getContainingFile().getVirtualFile(), element.getProject().getBaseDir()), element);
}

final JBList<String> list = new JBList<>(map.keySet());

JBPopupFactory.getInstance().createListPopupBuilder(list)
.setTitle("Symfony: Services Definitions")
.setItemChoosenCallback(() -> new WriteCommandAction.Simple(editor.getProject(), "Service Update") {
@Override
protected void run() {
String selectedValue = list.getSelectedValue();

PsiElement target = map.get(selectedValue);
invokeByScope(target, editor);
}
}.execute())
.createPopup()
.showInBestPositionFor(editor);
}
}
if (phpClass == null) {

return;
}

Set<String> serviceNames = ContainerCollectionResolver.ServiceCollector.create(project).convertClassNameToServices(phpClass.getFQN());
if (serviceNames.isEmpty()) {

return;
}

Collection<PsiElement> psiElements = new ArrayList<>();
for (String serviceName : serviceNames) {
psiElements.addAll(ServiceIndexUtil.findServiceDefinitions(project, serviceName));
}

if (psiElements.isEmpty()) {

return;
}

Map<String, PsiElement> map = new HashMap<>();

for (PsiElement element : psiElements) {
map.put(VfsUtil.getRelativePath(element.getContainingFile().getVirtualFile(), element.getProject().getBaseDir()), element);
}

final JBList<String> list = new JBList<>(map.keySet());
JBPopupFactory.getInstance().createListPopupBuilder(list)
.setTitle("Symfony: Services Definitions")
.setItemChoosenCallback(() -> {
WriteCommandAction.writeCommandAction(project).withName("Service Update").run(() -> {
invokeByScope(map.get(list.getSelectedValue()), editor);
});
})
.createPopup()
.showInBestPositionFor(editor)
;
}

private void invokeByScope(@NotNull PsiElement psiElement, @NotNull Editor editor) {
boolean success = false;

if(psiElement instanceof XmlTag) {
if (psiElement instanceof XmlTag) {
List<String> args = ServiceActionUtil.getXmlMissingArgumentTypes((XmlTag) psiElement, true, new ContainerCollectionResolver.LazyServiceCollector(psiElement.getProject()));

success = args.size() > 0;
if (success) {
ServiceActionUtil.fixServiceArgument(args, (XmlTag) psiElement);
}
} else if(psiElement instanceof YAMLKeyValue) {
} else if (psiElement instanceof YAMLKeyValue) {
List<String> args = ServiceActionUtil.getYamlMissingArgumentTypes(
psiElement.getProject(),
ServiceActionUtil.ServiceYamlContainer.create((YAMLKeyValue) psiElement),
false,
new ContainerCollectionResolver.LazyServiceCollector(psiElement.getProject())
psiElement.getProject(),
ServiceActionUtil.ServiceYamlContainer.create((YAMLKeyValue) psiElement),
false,
new ContainerCollectionResolver.LazyServiceCollector(psiElement.getProject())
);

success = args.size() > 0;
Expand All @@ -89,13 +94,14 @@ private void invokeByScope(@NotNull PsiElement psiElement, @NotNull Editor edito
}
}

if(!success) {
if (!success) {
HintManager.getInstance().showErrorHint(editor, "No argument update needed");

return;
}

String relativePath = VfsUtil.getRelativePath(psiElement.getContainingFile().getVirtualFile(), psiElement.getProject().getBaseDir());
if(relativePath == null) {
if (relativePath == null) {
relativePath = "n/a";
}

Expand Down Expand Up @@ -125,7 +131,7 @@ private Set<String> getServicesInScope(@NotNull PsiElement psiElement) {
PhpClass phpClass = PsiTreeUtil.getParentOfType(psiElement, PhpClass.class);

return phpClass == null
? Collections.emptySet()
: ContainerCollectionResolver.ServiceCollector.create(psiElement.getProject()).convertClassNameToServices(phpClass.getFQN());
? Collections.emptySet()
: ContainerCollectionResolver.ServiceCollector.create(psiElement.getProject()).convertClassNameToServices(phpClass.getFQN());
}
}