MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

don't write workspace components config from default project to misc.xml on new proect creation

Browse Source
This commit is contained in:
Vladimir Krivosheev
2017-04-24 15:31:53 +02:00
parent 688a3afe2b
commit b88cf52083
2 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/configuration-store-impl/src/ProjectStoreImpl.kt
+20 -10
View File
@@ -24,6 +24,7 @@ import com.intellij.openapi.application.invokeAndWaitIfNeed
import com.intellij.openapi.application.runReadAction
import com.intellij.openapi.components.*
import com.intellij.openapi.components.StateStorage.SaveSession
import com.intellij.openapi.components.impl.ServiceManagerImpl
import com.intellij.openapi.components.impl.stores.IComponentStore
import com.intellij.openapi.components.impl.stores.IProjectStore
import com.intellij.openapi.components.impl.stores.StoreUtil
@@ -460,25 +461,34 @@ fun removeWorkspaceComponentConfiguration(defaultProject: Project, element: Elem
@Suppress("DEPRECATION")
val projectComponents = defaultProject.getComponents(PersistentStateComponent::class.java)
projectComponents.forEachGuaranteed {
val stateAnnotation = StoreUtil.getStateSpec(it.javaClass)
if (stateAnnotation == null || stateAnnotation.name.isNullOrEmpty()) {
return@forEachGuaranteed
getNameIfWorkspaceStorage(it.javaClass)?.let {
workspaceComponentNames.add(it)
}
}
val storage = stateAnnotation.storages.sortByDeprecated().firstOrNull() ?: return@forEachGuaranteed
if (storage.path != StoragePathMacros.WORKSPACE_FILE) {
return@forEachGuaranteed
ServiceManagerImpl.processAllImplementationClasses(defaultProject as ProjectImpl) { aClass, pluginDescriptor ->
getNameIfWorkspaceStorage(aClass)?.let {
workspaceComponentNames.add(it)
}
workspaceComponentNames.add(stateAnnotation.name)
true
}
val iterator = componentElements.iterator()
for (componentElement in iterator) {
val name = componentElement.getAttributeValue("name")
if (name != null && workspaceComponentNames.contains(name)) {
val name = componentElement.getAttributeValue("name") ?: continue
if (workspaceComponentNames.contains(name)) {
iterator.remove()
}
}
return
}
private fun getNameIfWorkspaceStorage(aClass: Class<*>): String? {
val stateAnnotation = StoreUtil.getStateSpec(aClass)
if (stateAnnotation == null || stateAnnotation.name.isNullOrEmpty()) {
return null
}
val storage = stateAnnotation.storages.sortByDeprecated().firstOrNull() ?: return null
return if (storage.path == StoragePathMacros.WORKSPACE_FILE) stateAnnotation.name else null
}
platform/configuration-store-impl/src/StateStorageManagerImpl.kt
+12 -9
View File
@@ -220,14 +220,7 @@ open class StateStorageManagerImpl(private val rootTagName: String,
return constructor.newInstance(componentManager!!, this) as StateStorage
}
val effectiveRoamingType: RoamingType
if (roamingType != RoamingType.DISABLED && (collapsedPath == StoragePathMacros.WORKSPACE_FILE || collapsedPath == "other.xml")) {
effectiveRoamingType = RoamingType.DISABLED
}
else {
effectiveRoamingType = roamingType
}
val effectiveRoamingType = getEffectiveRoamingType(roamingType, collapsedPath)
if (isUseVfsListener == ThreeState.UNSURE) {
isUseVfsListener = ThreeState.fromBoolean(streamProvider == null || !streamProvider!!.isApplicable(collapsedPath, effectiveRoamingType))
}
@@ -451,4 +444,14 @@ fun removeMacroIfStartsWith(path: String, macro: String) = if (path.startsWithMa
@Suppress("DEPRECATION")
internal val Storage.path: String
get() = if (value.isNullOrEmpty()) file else value
get() = if (value.isNullOrEmpty()) file else value
private fun getEffectiveRoamingType(roamingType: RoamingType, collapsedPath: String): RoamingType {
if (roamingType != RoamingType.DISABLED && (collapsedPath == StoragePathMacros.WORKSPACE_FILE || collapsedPath == "other.xml")) {
return RoamingType.DISABLED
}
else {
return roamingType
}
}