MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

external system: reuse module created by module wizard IDEA-169008

Browse Source
This commit is contained in:
Vladislav.Soroka
2017-03-07 12:47:25 +03:00
parent 96bd43fe07
commit 15221dd37f
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/IdeModelsProviderImpl.java
+3 -6
View File
@@ -15,7 +15,6 @@
*/
package com.intellij.openapi.externalSystem.service.project;
import com.intellij.openapi.externalSystem.model.ExternalSystemDataKeys;
import com.intellij.openapi.externalSystem.model.project.*;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleGrouperKt;
@@ -103,11 +102,9 @@ public class IdeModelsProviderImpl implements IdeModelsProvider {
}
private static boolean isApplicableIdeModule(@NotNull ModuleData moduleData, @NotNull Module ideModule) {
if (ideModule.getProject().getUserData(ExternalSystemDataKeys.NEWLY_CREATED_PROJECT) == Boolean.TRUE) {
for (VirtualFile root : ModuleRootManager.getInstance(ideModule).getContentRoots()) {
if (pathsEqual(root.getPath(), moduleData.getLinkedExternalProjectPath())) {
return true;
}
for (VirtualFile root : ModuleRootManager.getInstance(ideModule).getContentRoots()) {
if (pathsEqual(root.getPath(), moduleData.getLinkedExternalProjectPath())) {
return true;
}
}
return isExternalSystemAwareModule(moduleData.getOwner(), ideModule) &&