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

IJPL-212573 IJPL-160311 cleanup

Browse Source 
GitOrigin-RevId: dbf538c35ebd1bbaf60b01b2335a1b99badb2fb5
This commit is contained in:
Vladimir Krivosheev
2025-10-26 17:46:01 +00:00
committed by intellij-monorepo-bot
parent a34ead7293
commit 3da280d176
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+3 -3
View File
@@ -400,7 +400,7 @@ fun collectExportedLibrariesFromLibraryModules(
private fun getProductModuleJarName(moduleName: String, context: BuildContext, frontendModuleFilter: FrontendModuleFilter): String {
return when {
isModuleCloseSource(moduleName, context = context) -> if (frontendModuleFilter.isBackendModule(moduleName)) PRODUCT_BACKEND_JAR else PRODUCT_JAR
isModuleCloseSource(moduleName = moduleName, context = context) -> if (frontendModuleFilter.isBackendModule(moduleName)) PRODUCT_BACKEND_JAR else PRODUCT_JAR
else -> PlatformJarNames.getPlatformModuleJarName(moduleName, frontendModuleFilter)
}
}
@@ -456,8 +456,8 @@ private fun isModuleCloseSource(moduleName: String, context: BuildContext): Bool
return false
}
return sourceRoots.any { moduleSourceRoot ->
!moduleSourceRoot.path.startsWith(context.paths.communityHomeDir)
return sourceRoots.any {
!it.path.startsWith(context.paths.communityHomeDir)
}
}
platform/core-impl/src/com/intellij/ide/plugins/ClassPathXmlPathResolver.kt
+3 -4
View File
@@ -72,10 +72,9 @@ class ClassPathXmlPathResolver(
}
}
return PluginDescriptorFromXmlStreamConsumer(readContext, toXIncludeLoader(dataLoader)).let {
it.consume(resource, dataLoader.toString())
it.getBuilder()
}
val consumer = PluginDescriptorFromXmlStreamConsumer(readContext, toXIncludeLoader(dataLoader))
consumer.consume(resource, dataLoader.toString())
return consumer.getBuilder()
}
override fun resolvePath(readContext: PluginDescriptorReaderContext, dataLoader: DataLoader, relativePath: String): PluginDescriptorBuilder? {
platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/XmlReader.kt
+5 -5
View File
@@ -413,13 +413,13 @@ private fun readExtensionPoints(
if (elementName != PluginXmlConst.EXTENSION_POINT_ELEM) {
if (elementName == PluginXmlConst.INCLUDE_ELEM && reader.namespaceURI == PluginXmlConst.XINCLUDE_NAMESPACE_URI) {
val partial = PluginDescriptorFromXmlStreamConsumer.withIncludeBase(
consumer.readContext,
consumer.xIncludeLoader,
consumer.includeBase,
readContext = consumer.readContext,
xIncludeLoader = consumer.xIncludeLoader,
includeBase = consumer.includeBase,
)
readInclude(
partial,
reader,
consumer = partial,
reader = reader,
allowedPointer = PluginXmlConst.EXTENSION_POINTS_XINCLUDE_VALUE
)
LOG.warn("`include` is supported only on a root level (${reader.location})")