wangtao
/
EasyCode
mirror of https://gitee.com/makejava/EasyCode.git
1
0
Fork 2
Code Issues Releases Wiki Activity

修复gradle项目代码生成位置不正确问题与空指针异常问题

This commit is contained in:
makejava 2020-11-03 22:52:40 +08:00
parent f497bf6907
commit cf016d0d41
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -25,7 +25,7 @@ apply plugin: 'java'
apply plugin: 'org.jetbrains.intellij' apply plugin: 'org.jetbrains.intellij'
group 'com.sjhy' group 'com.sjhy'
version '1.2.4-RC3' version '1.2.4-RC4'
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8

21
src/main/java/com/sjhy/plugin/tool/ModuleUtils.java
View File

@ -3,9 +3,11 @@ package com.sjhy.plugin.tool;
import com.intellij.openapi.module.Module; import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil; import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.openapi.vfs.VirtualFileManager;
import com.sjhy.plugin.constants.MsgValue;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jps.model.java.JavaSourceRootType; import org.jetbrains.jps.model.java.JavaSourceRootType;
@ -40,10 +42,17 @@ public final class ModuleUtils {
if (modulePath.contains(".idea/modules/")) { if (modulePath.contains(".idea/modules/")) {
modulePath = modulePath.replace(".idea/modules/",""); modulePath = modulePath.replace(".idea/modules/","");
} }
if (modulePath.contains(".idea/modules")) {
modulePath = modulePath.replace(".idea/modules","");
}
if (modulePath.contains("/.idea")) { if (modulePath.contains("/.idea")) {
modulePath = modulePath.replace("/.idea",""); modulePath = modulePath.replace("/.idea","");
} }
return VirtualFileManager.getInstance().findFileByUrl(String.format("file://%s", modulePath)); VirtualFile dir = VirtualFileManager.getInstance().findFileByUrl(String.format("file://%s", modulePath));
if (dir == null) {
Messages.showInfoMessage("无法获取Module路径, path=" + modulePath, MsgValue.TITLE_INFO);
}
return dir;
} }
/** /**
@ -56,13 +65,21 @@ public final class ModuleUtils {
List<VirtualFile> virtualFileList = ModuleRootManager.getInstance(module).getSourceRoots(JavaSourceRootType.SOURCE); List<VirtualFile> virtualFileList = ModuleRootManager.getInstance(module).getSourceRoots(JavaSourceRootType.SOURCE);
if (CollectionUtil.isEmpty(virtualFileList)) { if (CollectionUtil.isEmpty(virtualFileList)) {
VirtualFile modulePath = getModuleDir(module); VirtualFile modulePath = getModuleDir(module);
// 尝试智能识别原代码路径(通过上面的方式，IDEA不能百分百拿到原代码路径) // 尝试智能识别源代码路径(通过上面的方式，IDEA不能百分百拿到源代码路径)
VirtualFile srcDir = VfsUtil.findRelativeFile(modulePath, "src", "main", "java"); VirtualFile srcDir = VfsUtil.findRelativeFile(modulePath, "src", "main", "java");
if (srcDir != null && srcDir.isDirectory()) { if (srcDir != null && srcDir.isDirectory()) {
return srcDir; return srcDir;
} }
return modulePath; return modulePath;
} }
if (virtualFileList.size() > 1) {
for (VirtualFile file : virtualFileList) {
String tmpPath = file.getPath();
if (!tmpPath.contains("build") && !tmpPath.contains("generated")) {
return file;
}
}
}
return virtualFileList.get(0); return virtualFileList.get(0);
} }