From 0876dda522ab37146fada7a5ed922108e9f214a2 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Wed, 17 Feb 2021 21:29:31 +0300 Subject: [PATCH] [project wizard] correctly determine if code is running inside Project Structure dialog (EA-255178) Actually ProjectStructureConfigurable.getInstance() returns non-null value even if Project Structure dialog is closed, so should take ModifiableModuleModel from it. GitOrigin-RevId: a6f3283703d5f7a2f3a398830d70cb45c9bf97eb --- .../ide/projectWizard/ModuleNameLocationComponent.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ModuleNameLocationComponent.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ModuleNameLocationComponent.java index aa7953f432a4..08baa6445abf 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/ModuleNameLocationComponent.java +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ModuleNameLocationComponent.java @@ -6,6 +6,7 @@ import com.intellij.ide.JavaUiBundle; import com.intellij.ide.highlighter.ModuleFileType; import com.intellij.ide.util.BrowseFilesListener; import com.intellij.ide.util.projectWizard.*; +import com.intellij.openapi.module.ModifiableModuleModel; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.options.ConfigurationException; @@ -206,8 +207,10 @@ public class ModuleNameLocationComponent implements ModuleNameLocationSettings { final String moduleName = getModuleName(); final Module module; final ProjectStructureConfigurable fromConfigurable = ProjectStructureConfigurable.getInstance(project); - if (fromConfigurable != null) { - module = fromConfigurable.getModulesConfig().getModule(moduleName); + ModifiableModuleModel modifiableModel = fromConfigurable != null ? fromConfigurable.getContext().getModulesConfigurator().getModuleModel() + : null; + if (modifiableModel != null) { + module = modifiableModel.findModuleByName(moduleName); } else { module = ModuleManager.getInstance(project).findModuleByName(moduleName);