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

Maven: maven configurator shouldn't add resources directory to sources list

Browse Source 
#KT-7781 Fixed
This commit is contained in:
Sergey Mashkov
2015-05-19 17:23:01 +03:00
parent 6c59a311fb
commit f9ab08ed47
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java
+7 -1
View File
@@ -42,6 +42,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.maven.dom.MavenDomUtil; import org.jetbrains.idea.maven.dom.MavenDomUtil;
import org.jetbrains.idea.maven.dom.model.*; import org.jetbrains.idea.maven.dom.model.*;
import org.jetbrains.idea.maven.project.MavenProjectsManager; import org.jetbrains.idea.maven.project.MavenProjectsManager;
import org.jetbrains.jps.model.java.JavaSourceRootType;
import org.jetbrains.kotlin.cli.common.KotlinVersion; import org.jetbrains.kotlin.cli.common.KotlinVersion;
import org.jetbrains.kotlin.idea.JetPluginUtil; import org.jetbrains.kotlin.idea.JetPluginUtil;
import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersion; import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersion;
@@ -188,7 +189,7 @@ public abstract class KotlinMavenConfigurator implements KotlinProjectConfigurat
for (ContentEntry contentEntry : ModuleRootManager.getInstance(module).getContentEntries()) { for (ContentEntry contentEntry : ModuleRootManager.getInstance(module).getContentEntries()) {
SourceFolder[] folders = contentEntry.getSourceFolders(); SourceFolder[] folders = contentEntry.getSourceFolders();
for (SourceFolder sourceFolder : folders) { for (SourceFolder sourceFolder : folders) {
if (isTest && sourceFolder.isTestSource() || !isTest && !sourceFolder.isTestSource()) { if (isRelatedSourceRoot(isTest, sourceFolder)) {
VirtualFile sourceFolderFile = sourceFolder.getFile(); VirtualFile sourceFolderFile = sourceFolder.getFile();
if (sourceFolderFile != null) { if (sourceFolderFile != null) {
String relativePath = VfsUtilCore.getRelativePath(sourceFolderFile, virtualFile.getParent(), '/'); String relativePath = VfsUtilCore.getRelativePath(sourceFolderFile, virtualFile.getParent(), '/');
@@ -200,6 +201,11 @@ public abstract class KotlinMavenConfigurator implements KotlinProjectConfigurat
} }
} }
private static boolean isRelatedSourceRoot(boolean isTest, SourceFolder folder) {
return isTest && folder.getRootType() == JavaSourceRootType.TEST_SOURCE ||
(!isTest && folder.getRootType() == JavaSourceRootType.SOURCE);
}
@Nullable @Nullable
private static MavenDomProjectModel getMavenDomProjectModel(@NotNull Module module) { private static MavenDomProjectModel getMavenDomProjectModel(@NotNull Module module) {
PsiFile pomFile = findModulePomFile(module); PsiFile pomFile = findModulePomFile(module);