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

fix check in KotlinMavenConfigurator.isConfigured

Browse Source
This commit is contained in:
Michael Nedzelsky
2014-12-19 13:44:04 +03:00
parent 6793464cd0
commit 98fde07c9e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/configuration/KotlinMavenConfigurator.java
+4 -2
View File
@@ -102,6 +102,8 @@ public abstract class KotlinMavenConfigurator implements KotlinProjectConfigurat
} }
MavenDomProjectModel domProjectModel = getMavenDomProjectModel(module); MavenDomProjectModel domProjectModel = getMavenDomProjectModel(module);
if (domProjectModel == null) return false;
return hasKotlinMavenPlugin(domProjectModel) && hasDependencyOnLibrary(domProjectModel); return hasKotlinMavenPlugin(domProjectModel) && hasDependencyOnLibrary(domProjectModel);
} }
@@ -198,10 +200,10 @@ public abstract class KotlinMavenConfigurator implements KotlinProjectConfigurat
} }
} }
@NotNull @Nullable
private static MavenDomProjectModel getMavenDomProjectModel(@NotNull Module module) { private static MavenDomProjectModel getMavenDomProjectModel(@NotNull Module module) {
PsiFile pomFile = findModulePomFile(module); PsiFile pomFile = findModulePomFile(module);
assert pomFile != null : "pom file should not be null"; if (pomFile == null) return null;
VirtualFile virtualFile = pomFile.getVirtualFile(); VirtualFile virtualFile = pomFile.getVirtualFile();
assert virtualFile != null : "Virtual file should exists for psi file " + pomFile.getName(); assert virtualFile != null : "Virtual file should exists for psi file " + pomFile.getName();