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

WI-33637 Attach to the current project asks additional question — dotIdeaDir

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-11-30 12:28:24 +01:00
parent f73f0c1227
commit 303f61d093
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/platform/ModuleAttachProcessor.kt
+6 -7
View File
@@ -114,19 +114,18 @@ class ModuleAttachProcessor : ProjectAttachProcessor() {
}
override fun attachToProject(project: Project, projectDir: Path, callback: ProjectOpenedCallback?): Boolean {
if (!projectDir.exists()) {
val projectDirParent = projectDir.parent!!
val newProject = ProjectManagerEx.getInstanceEx().newProject(projectDirParent.fileName.toString(), projectDirParent.toString(), true, false) ?: return false
val baseDir = LocalFileSystem.getInstance().refreshAndFindFileByPath(projectDirParent.systemIndependentPath)
val dotIdeaDir = projectDir.resolve(Project.DIRECTORY_STORE_FOLDER)
if (!dotIdeaDir.exists()) {
val newProject = ProjectManagerEx.getInstanceEx().newProject(projectDir.fileName.toString(), projectDir.toString(), true, false) ?: return false
val baseDir = LocalFileSystem.getInstance().refreshAndFindFileByPath(projectDir.systemIndependentPath)
PlatformProjectOpenProcessor.runDirectoryProjectConfigurators(baseDir, newProject)
newProject.save()
runWriteAction { Disposer.dispose(newProject) }
}
var isAttached = findMainModule(project, projectDir, callback)
var isAttached = findMainModule(project, dotIdeaDir, callback)
if (!isAttached) {
isAttached = findMainModule(project, projectDir.resolve(Project.DIRECTORY_STORE_FOLDER), callback)
isAttached = findMainModule(project, projectDir, callback)
}
if (isAttached) {
return true