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

External storage — do not store external modules in the .idea/modules.xml

Browse Source
This commit is contained in:
Vladimir Krivosheev
2017-11-03 10:51:00 +01:00
parent 4049ea3135
commit 2ad4ab52fb
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/projectModel-impl/src/com/intellij/openapi/module/impl/ExternalModuleListStorage.kt
+11 -2
View File
@@ -6,6 +6,7 @@ import com.intellij.openapi.components.State
import com.intellij.openapi.components.Storage
import com.intellij.openapi.module.Module
import com.intellij.openapi.project.Project
import com.intellij.openapi.project.isExternalStorageEnabled
import com.intellij.openapi.roots.ExternalProjectSystemRegistry
import com.intellij.openapi.roots.ProjectModelElement
import com.intellij.openapi.roots.ProjectModelExternalSource
@@ -18,8 +19,12 @@ internal class ExternalModuleListStorage(private val project: Project) : Persist
override fun getState(): Element {
val e = Element("state")
if (!project.isExternalStorageEnabled) {
return e
}
val moduleManager = ModuleManagerImpl.getInstanceImpl(project)
moduleManager.writeExternal(e, getFilteredModuleList(moduleManager.modules, true))
moduleManager.writeExternal(e, getFilteredModuleList(project, moduleManager.modules, true))
return e
}
@@ -38,7 +43,11 @@ internal class ExternalModuleListStorage(private val project: Project) : Persist
}
}
fun getFilteredModuleList(modules: Array<Module>, isExternal: Boolean): List<Module> {
fun getFilteredModuleList(project: Project, modules: Array<Module>, isExternal: Boolean): List<Module> {
if (!project.isExternalStorageEnabled) {
return modules.asList()
}
val externalProjectSystemRegistry = ExternalProjectSystemRegistry.getInstance()
return modules.filter { (externalProjectSystemRegistry.getExternalSource(it) != null) == isExternal }
}
platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java
+1 -1
View File
@@ -120,7 +120,7 @@ public abstract class ModuleManagerImpl extends ModuleManager implements Disposa
@Override
public Element getState() {
final Element e = new Element("state");
writeExternal(e, getFilteredModuleList(getModules(), false));
writeExternal(e, getFilteredModuleList(myProject, getModules(), false));
return e;
}