azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Configure Kotlin action fails for Idea 145 or higher

Browse Source 
#KT-11593 Fixed
This commit is contained in:
Natalia Ukhorskaya
2016-03-31 11:28:53 +03:00
parent cba7c85c36
commit c91026f0c0
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java
+16 -2
View File
@@ -25,6 +25,7 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.DependencyScope;
import com.intellij.openapi.roots.ExternalLibraryDescriptor;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
@@ -303,9 +304,22 @@ public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfi
return project.getBasePath() + "/" + GradleConstants.DEFAULT_SCRIPT_NAME;
}
@NotNull
@Nullable
private static String getModuleFilePath(@NotNull Module module) {
return new File(module.getModuleFilePath()).getParent() + "/" + GradleConstants.DEFAULT_SCRIPT_NAME;
String moduleDir = new File(module.getModuleFilePath()).getParent();
File buildGradleFile = new File(moduleDir + "/" + GradleConstants.DEFAULT_SCRIPT_NAME);
if (buildGradleFile.exists()) {
return buildGradleFile.getPath();
}
// since IDEA 145 module file is located in .idea directory
for (VirtualFile file : ModuleRootManager.getInstance(module).getContentRoots()) {
buildGradleFile = new File(file.getPath() + "/" + GradleConstants.DEFAULT_SCRIPT_NAME);
if (buildGradleFile.exists()) {
return buildGradleFile.getPath();
}
}
return null;
}
private static boolean isSnapshot(@NotNull String version) {