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

Fix GradleNoduleBuilder use qualified names check

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2017-10-07 01:04:05 +03:00
committed by Nikolay Krasko
parent 4c775a9516
commit ceaa34201e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/gradle/kdsl/GradleModuleBuilder.java
+6 -2
View File
@@ -28,6 +28,7 @@ import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.components.StorageScheme; import com.intellij.openapi.components.StorageScheme;
import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.externalSystem.ExternalSystemModulePropertyManager;
import com.intellij.openapi.externalSystem.importing.ImportSpec; import com.intellij.openapi.externalSystem.importing.ImportSpec;
import com.intellij.openapi.externalSystem.importing.ImportSpecBuilder; import com.intellij.openapi.externalSystem.importing.ImportSpecBuilder;
import com.intellij.openapi.externalSystem.model.ExternalSystemDataKeys; import com.intellij.openapi.externalSystem.model.ExternalSystemDataKeys;
@@ -133,7 +134,7 @@ public class GradleModuleBuilder extends AbstractExternalModuleBuilder<GradlePro
moduleName = getName(); moduleName = getName();
} }
else { else {
moduleName = ModuleGrouperKt.isQualifiedModuleNamesEnabled(myWizardContext.getProject()) && StringUtil.isNotEmpty(myProjectId.getGroupId()) moduleName = getExternalProjectSettings().isUseQualifiedModuleNames() && StringUtil.isNotEmpty(myProjectId.getGroupId())
? (myProjectId.getGroupId() + '.' + myProjectId.getArtifactId()) ? (myProjectId.getGroupId() + '.' + myProjectId.getArtifactId())
: myProjectId.getArtifactId(); : myProjectId.getArtifactId();
} }
@@ -232,6 +233,9 @@ public class GradleModuleBuilder extends AbstractExternalModuleBuilder<GradlePro
LOG.warn("Unexpected exception on applying frameworks templates", e); LOG.warn("Unexpected exception on applying frameworks templates", e);
} }
// it will be set later in any case, but save is called immediately after project creation, so, to ensure that it will be properly saved as external system module
ExternalSystemModulePropertyManager.getInstance(module).setExternalId(GradleConstants.SYSTEM_ID);
final Project project = module.getProject(); final Project project = module.getProject();
if (myWizardContext.isCreatingNewProject()) { if (myWizardContext.isCreatingNewProject()) {
getExternalProjectSettings().setExternalProjectPath(rootProjectPath); getExternalProjectSettings().setExternalProjectPath(rootProjectPath);
@@ -488,4 +492,4 @@ public class GradleModuleBuilder extends AbstractExternalModuleBuilder<GradlePro
} }
return project; return project;
} }
} }