Skip to content

Fix incompatible Idea SDK features #1

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix incompatible Idea SDK features #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 22 additions & 8 deletions src/com/seventh7/mybatis/alias/BeanAliasResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,56 @@
package com.seventh7.mybatis.alias;

import com.google.common.collect.Sets;
import java.util.Collection;
import java.util.Set;

import com.google.common.collect.Sets;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.spring.CommonSpringModel;
import com.intellij.spring.SpringManager;
import com.intellij.spring.model.SpringBeanPointer;
import com.intellij.spring.model.SpringModelSearchParameters;
import com.intellij.spring.model.utils.SpringModelSearchers;
import com.intellij.spring.model.utils.SpringPropertyUtils;
import com.intellij.spring.model.xml.beans.SpringPropertyDefinition;

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.Collection;
import java.util.Set;

/**
* @author yanglin
*/
public class BeanAliasResolver extends PackageAliasResolver{

private static final String MAPPER_ALIAS_PACKAGE_CLASS = "org.mybatis.spring.SqlSessionFactoryBean";
private static final String MAPPER_ALIAS_PROPERTY = "typeAliasesPackage";
private ModuleManager moduleManager;
private final SpringModelSearchParameters.BeanClass searchParameters;
private ModuleManager moduleManager;
private SpringManager springManager;

public BeanAliasResolver(Project project) {
super(project);
this.moduleManager = ModuleManager.getInstance(project);
this.springManager = SpringManager.getInstance(project);
this.searchParameters = createBeanSearchParameters(project);
}

@NotNull @Override
private SpringModelSearchParameters.BeanClass createBeanSearchParameters(Project project) {
final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project);
final PsiClass psiClass = psiFacade.findClass(MAPPER_ALIAS_PACKAGE_CLASS, GlobalSearchScope.projectScope(project));
return psiClass == null? null: SpringModelSearchParameters.byClass(psiClass);
}

@NotNull @Override
public Collection<String> getPackages(@Nullable PsiElement element) {
Set<String> res = Sets.newHashSet();
if (searchParameters == null) {
return res;
}
for (Module module : moduleManager.getModules()) {
for (CommonSpringModel springModel : springManager.getCombinedModel(module).getModelsToProcess()) {
addPackages(res, springModel);
Expand All @@ -46,7 +60,7 @@ public Collection<String> getPackages(@Nullable PsiElement element) {
}

private void addPackages(Set<String> res, CommonSpringModel springModel) {
for (SpringBeanPointer springBaseBeanPointer : springModel.findBeansByPsiClassWithInheritance(MAPPER_ALIAS_PACKAGE_CLASS)) {
for (SpringBeanPointer springBaseBeanPointer : SpringModelSearchers.findBeans(springModel, searchParameters)) {
SpringPropertyDefinition basePackages = SpringPropertyUtils.findPropertyByName(springBaseBeanPointer.getSpringBean(), MAPPER_ALIAS_PROPERTY);
if (basePackages != null) {
final String value = basePackages.getValueElement().getStringValue();
Expand Down
2 changes: 1 addition & 1 deletion src/com/seventh7/mybatis/service/EditorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class EditorService {

public EditorService(Project project) {
this.project = project;
this.codeFormatterFacade = new CodeFormatterFacade(new CodeStyleSettings());
this.codeFormatterFacade = new CodeFormatterFacade(new CodeStyleSettings(), null);
this.fileEditorManager = FileEditorManager.getInstance(project);
}

Expand Down