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

when gradle/maven project is opened in headless mode (e.g. to run offline inspections) open existing project and run import to ensure that old IDE-specific configuration (e.g. inspection profiles) won't be deleted and project model will be updated (IDEA-119815)

Browse Source
This commit is contained in:
nik
2015-10-29 11:26:17 +03:00
parent 77c054a654
commit fc09d0ce08
1 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.java
+29 -18
View File
@@ -162,26 +162,34 @@ public abstract class ProjectOpenProcessorBase<T extends ProjectImportBuilder> e
}
boolean shouldOpenExisting = false;
if (!ApplicationManager.getApplication().isHeadlessEnvironment() && (projectFile.exists() || dotIdeaFile.exists())) {
String existingName;
if (dotIdeaFile.exists()) {
existingName = "an existing project";
pathToOpen = dotIdeaFile.getParent();
boolean importToProject = false;
if (projectFile.exists() || dotIdeaFile.exists()) {
if (ApplicationManager.getApplication().isHeadlessEnvironment()) {
shouldOpenExisting = true;
importToProject = true;
}
else {
existingName = "'" + projectFile.getName() + "'";
pathToOpen = projectFilePath;
String existingName;
if (dotIdeaFile.exists()) {
existingName = "an existing project";
pathToOpen = dotIdeaFile.getParent();
}
else {
existingName = "'" + projectFile.getName() + "'";
pathToOpen = projectFilePath;
}
int result = Messages.showYesNoCancelDialog(
projectToClose,
IdeBundle.message("project.import.open.existing", existingName, projectFile.getParent(), virtualFile.getName()),
IdeBundle.message("title.open.project"),
IdeBundle.message("project.import.open.existing.openExisting"),
IdeBundle.message("project.import.open.existing.reimport"),
CommonBundle.message("button.cancel"),
Messages.getQuestionIcon());
if (result == Messages.CANCEL) return null;
shouldOpenExisting = result == Messages.YES;
importToProject = !shouldOpenExisting;
}
int result = Messages.showYesNoCancelDialog(
projectToClose,
IdeBundle.message("project.import.open.existing", existingName, projectFile.getParent(), virtualFile.getName()),
IdeBundle.message("title.open.project"),
IdeBundle.message("project.import.open.existing.openExisting"),
IdeBundle.message("project.import.open.existing.reimport"),
CommonBundle.message("button.cancel"),
Messages.getQuestionIcon());
if (result == Messages.CANCEL) return null;
shouldOpenExisting = result == Messages.YES;
}
final Project projectToOpen;
@@ -195,8 +203,11 @@ public abstract class ProjectOpenProcessorBase<T extends ProjectImportBuilder> e
}
else {
projectToOpen = ProjectManagerEx.getInstanceEx().newProject(wizardContext.getProjectName(), pathToOpen, true, false);
}
if (projectToOpen == null) return null;
if (projectToOpen == null || !getBuilder().validate(projectToClose, projectToOpen)) {
if (importToProject) {
if (!getBuilder().validate(projectToClose, projectToOpen)) {
return null;
}