#728 | Register sub-modules source directories for custom modules

epam · Sep 17, 2023 · 68ee272 · 68ee272
1 parent dd88f53
commit 68ee272
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 
 ### Fixes
 - `SAP Commerce` tool window sometimes appears without any content [#725](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/725)
+- Register sub-modules source directories for custom modules [#728](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/728)
 
 ## [2023.2.8]
 

diff --git a/resources/META-INF/optional-java-dependencies.xml b/resources/META-INF/optional-java-dependencies.xml
@@ -35,7 +35,7 @@
         <applicationService serviceInterface="com.intellij.idea.plugin.hybris.project.configurators.CompilerOutputPathsConfigurator"
                             serviceImplementation="com.intellij.idea.plugin.hybris.project.configurators.impl.DefaultCompilerOutputPathsConfigurator"/>
 
-        <applicationService serviceImplementation="com.intellij.idea.plugin.hybris.project.configurators.impl.RegularContentRootConfigurator"/>
+        <applicationService serviceImplementation="com.intellij.idea.plugin.hybris.project.configurators.impl.DefaultContentRootConfigurator"/>
 
         <applicationService serviceInterface="com.intellij.idea.plugin.hybris.project.configurators.GroupModuleConfigurator"
                             serviceImplementation="com.intellij.idea.plugin.hybris.project.configurators.impl.DefaultGroupModuleConfigurator"/>

diff --git a/src/com/intellij/idea/plugin/hybris/project/configurators/ContentRootConfigurator.kt b/src/com/intellij/idea/plugin/hybris/project/configurators/ContentRootConfigurator.kt
@@ -18,7 +18,7 @@
  */
 package com.intellij.idea.plugin.hybris.project.configurators
 
-import com.intellij.idea.plugin.hybris.project.configurators.impl.RegularContentRootConfigurator
+import com.intellij.idea.plugin.hybris.project.configurators.impl.DefaultContentRootConfigurator
 import com.intellij.idea.plugin.hybris.project.descriptors.ModuleDescriptor
 import com.intellij.idea.plugin.hybris.settings.HybrisApplicationSettings
 import com.intellij.openapi.application.ApplicationManager
@@ -35,6 +35,6 @@ interface ContentRootConfigurator {
     )
 
     companion object {
-        val instance: ContentRootConfigurator = ApplicationManager.getApplication().getService(RegularContentRootConfigurator::class.java)
+        val instance: ContentRootConfigurator = ApplicationManager.getApplication().getService(DefaultContentRootConfigurator::class.java)
     }
 }
diff --git a/.../impl/RegularContentRootConfigurator.java → .../impl/DefaultContentRootConfigurator.java b/.../impl/RegularContentRootConfigurator.java → .../impl/DefaultContentRootConfigurator.java
@@ -47,7 +47,7 @@
 import static com.intellij.idea.plugin.hybris.common.HybrisConstants.*;
 import static com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils.message;
 
-public class RegularContentRootConfigurator implements ContentRootConfigurator {
+public class DefaultContentRootConfigurator implements ContentRootConfigurator {
 
     // module name -> relative paths
     private static final Map<String, List<String>> ROOTS_TO_IGNORE = new HashMap<>();
@@ -109,7 +109,7 @@ protected void configureCommonRoots(
         @NotNull final HybrisApplicationSettings appSettings
     ) {
         final var rootProjectDescriptor = moduleDescriptor.getRootProjectDescriptor();
-        if (moduleDescriptor instanceof YCustomRegularModuleDescriptor
+        if (isCustomModuleDescriptor(moduleDescriptor)
             || EXTENSION_NAME_PLATFORM_SERVICES.equals(moduleDescriptor.getName())
             || !rootProjectDescriptor.isImportOotbModulesInReadOnlyMode()) {
             addSourceRoots(contentEntry, moduleDescriptor.getModuleRootDirectory(), dirsToIgnore, appSettings, SRC_DIR_NAMES, JavaSourceRootType.SOURCE);
@@ -125,7 +125,7 @@ protected void configureCommonRoots(
 
         addSourceRoots(contentEntry, moduleDescriptor.getModuleRootDirectory(), dirsToIgnore, appSettings, TEST_SRC_DIR_NAMES, JavaSourceRootType.TEST_SOURCE);
 
-        if (!(moduleDescriptor instanceof YCustomRegularModuleDescriptor) && rootProjectDescriptor.isExcludeTestSources()) {
+        if (!isCustomModuleDescriptor(moduleDescriptor) && rootProjectDescriptor.isExcludeTestSources()) {
             excludeDirectories(contentEntry, moduleDescriptor.getModuleRootDirectory(), TEST_SRC_DIR_NAMES);
         }
 
@@ -350,6 +350,11 @@ protected void configureWebInf(
         }
     }
 
+    private static boolean isCustomModuleDescriptor(final @NotNull ModuleDescriptor moduleDescriptor) {
+        return moduleDescriptor instanceof YCustomRegularModuleDescriptor
+            || (moduleDescriptor instanceof final YSubModuleDescriptor ySubModuleDescriptor && ySubModuleDescriptor.getOwner() instanceof YCustomRegularModuleDescriptor);
+    }
+
     private void addResourcesDirectory(final @NotNull ContentEntry contentEntry, final File platformBootstrapDirectory) {
         final var platformBootstrapResourcesDirectory = new File(platformBootstrapDirectory, RESOURCES_DIRECTORY);
         contentEntry.addSourceFolder(