MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-159596 cleanup

Browse Source 
GitOrigin-RevId: 419e6224a64861b99849b655e61e7dba4107f5cc
This commit is contained in:
Vladimir Krivosheev
2024-08-04 19:41:25 +02:00
committed by intellij-monorepo-bot
parent 1ed0c32b06
commit becc5d63c5
4 changed files with 76 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xml/impl/src/com/intellij/javaee/ExternalResourcesRootsProvider.java
View File

@@ -21,8 +21,8 @@ final class ExternalResourcesRootsProvider extends IndexableSetContributor {
ExternalResourceManagerExImpl manager = (ExternalResourceManagerExImpl)ExternalResourceManager.getInstance();
Set<String> duplicateCheck = new HashSet<>();
Set<VirtualFile> set = new HashSet<>();
for (Map<String, ExternalResourceManagerExImpl.Resource> map : manager.getStandardResources$intellij_xml_psi_impl()) {
for (ExternalResourceManagerExImpl.Resource resource : map.values()) {
for (Map<String, ExternalResource> map : manager.getStandardResources$intellij_xml_psi_impl()) {
for (ExternalResource resource : map.values()) {
String url = resource.getResourceUrl();
if (url != null) {
url = url.substring(0, url.lastIndexOf('/') + 1);

65
xml/xml-psi-impl/src/com/intellij/javaee/ExternalResourceManagerExImpl.kt
View File

@@ -22,7 +22,6 @@ import com.intellij.openapi.util.SystemInfo
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.vfs.VfsUtilCore
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.impl.VirtualFilePointerContainerImpl.URL_ATTR
import com.intellij.psi.PsiFile
import com.intellij.psi.util.CachedValueProvider
import com.intellij.psi.util.CachedValuesManager
@@ -30,6 +29,7 @@ import com.intellij.util.ArrayUtilRt
import com.intellij.util.concurrency.SynchronizedClearableLazy
import com.intellij.util.concurrency.ThreadingAssertions
import com.intellij.util.containers.MultiMap
import com.intellij.util.io.URLUtil
import com.intellij.xml.Html5SchemaProvider
import com.intellij.xml.XmlSchemaProvider
import com.intellij.xml.index.XmlNamespaceIndex
@@ -48,7 +48,7 @@ private val LOG = logger<ExternalResourceManagerExImpl>()
private const val DEFAULT_VERSION = ""
private const val CATALOG_PROPERTIES_ELEMENT = "CATALOG_PROPERTIES"
private val XSD_1_1 = ExternalResourceManagerExImpl.Resource(
private val XSD_1_1 = ExternalResource(
file = "/standardSchemas/XMLSchema-1_1/XMLSchema.xsd",
aClass = ExternalResourceManagerExImpl::class.java,
classLoader = null,
@@ -56,6 +56,7 @@ private val XSD_1_1 = ExternalResourceManagerExImpl.Resource(
private const val HTML5_DOCTYPE_ELEMENT = "HTML5"
private const val URL_ATTR: @NonNls String = "url"
private const val RESOURCE_ELEMENT: @NonNls String = "resource"
private const val LOCATION_ATTR: @NonNls String = "location"
private const val IGNORED_RESOURCE_ELEMENT: @NonNls String = "ignored-resource"
@@ -104,7 +105,7 @@ open class ExternalResourceManagerExImpl : ExternalResourceManagerEx(), Persiste
const val JCP_NS: @NonNls String = "http://xmlns.jcp.org/xml/ns/javaee/"
const val JAKARTA_NS: @NonNls String = "https://jakarta.ee/xml/ns/jakartaee/"
fun <T> getOrCreateMap(resources: MutableMap<String, MutableMap<String, T>>, version: String?): MutableMap<String, T> {
internal fun <T> getOrCreateMap(resources: MutableMap<String, MutableMap<String, T>>, version: String?): MutableMap<String, T> {
return resources.computeIfAbsent(version ?: DEFAULT_VERSION) { HashMap() }
}
@@ -117,7 +118,7 @@ open class ExternalResourceManagerExImpl : ExternalResourceManagerEx(), Persiste
}
}
internal open fun computeStdResources(): Map<String, MutableMap<String, Resource>> {
internal open fun computeStdResources(): Map<String, MutableMap<String, ExternalResource>> {
val registrar = ResourceRegistrarImpl()
for (provider in StandardResourceProvider.EP_NAME.lazySequence()) {
provider.registerResources(registrar)
@@ -417,9 +418,13 @@ open class ExternalResourceManagerExImpl : ExternalResourceManagerEx(), Persiste
incModificationCount()
for (element in state.getChildren(RESOURCE_ELEMENT)) {
val url = element.getAttributeValue(URL_ATTR)
if (!url.isNullOrEmpty()) {
addSilently(url, DEFAULT_VERSION, element.getAttributeValue(LOCATION_ATTR)!!.replace('/', File.separatorChar))
val url = element.getAttributeValue(URL_ATTR) ?: continue
if (url.isNotEmpty()) {
addSilently(
url = url,
version = DEFAULT_VERSION,
location = element.getAttributeValue(LOCATION_ATTR)!!.replace('/', File.separatorChar),
)
}
}
@@ -453,18 +458,14 @@ open class ExternalResourceManagerExImpl : ExternalResourceManagerEx(), Persiste
incModificationCount()
}
internal fun getStandardResources(): Collection<MutableMap<String, Resource>> = standardResources.value.values
internal fun getStandardResources(): Collection<MutableMap<String, ExternalResource>> = standardResources.value.values
override fun getDefaultHtmlDoctype(project: Project): String {
val doctype = getProjectResources(project).defaultHtmlDoctype
if (XmlUtil.XHTML_URI == doctype) {
return XmlUtil.XHTML4_SCHEMA_LOCATION
}
else if (HTML5_DOCTYPE_ELEMENT == doctype) {
return Html5SchemaProvider.getHtml5SchemaLocation()
}
else {
return doctype!!
return when {
XmlUtil.XHTML_URI == doctype -> XmlUtil.XHTML4_SCHEMA_LOCATION
HTML5_DOCTYPE_ELEMENT == doctype -> Html5SchemaProvider.getHtml5SchemaLocation()
else -> doctype!!
}
}
@@ -504,15 +505,16 @@ open class ExternalResourceManagerExImpl : ExternalResourceManagerEx(), Persiste
incModificationCount()
if (Html5SchemaProvider.getHtml5SchemaLocation() == defaultHtmlDoctype) {
this@ExternalResourceManagerExImpl.defaultHtmlDoctype = HTML5_DOCTYPE_ELEMENT
this.defaultHtmlDoctype = HTML5_DOCTYPE_ELEMENT
}
else {
this@ExternalResourceManagerExImpl.defaultHtmlDoctype = defaultHtmlDoctype
this.defaultHtmlDoctype = defaultHtmlDoctype
}
fireExternalResourceChanged()
}
}
internal class Resource(file: String, aClass: Class<*>?, classLoader: ClassLoader?) {
internal class ExternalResource(file: String, aClass: Class<*>?, classLoader: ClassLoader?) {
private val file = file
private val classLoader = classLoader
private val aClass: Class<*>? = aClass
@@ -520,7 +522,7 @@ open class ExternalResourceManagerExImpl : ExternalResourceManagerEx(), Persiste
@Volatile
private var resolvedResourcePath: String? = null
constructor(file: String, baseResource: Resource) : this(file = file, aClass = baseResource.aClass, classLoader = baseResource.classLoader)
constructor(file: String, baseResource: ExternalResource) : this(file = file, aClass = baseResource.aClass, classLoader = baseResource.classLoader)
fun directoryName(): String {
val i = file.lastIndexOf('/')
@@ -529,15 +531,13 @@ open class ExternalResourceManagerExImpl : ExternalResourceManagerEx(), Persiste
@Suppress("LoggingSimilarMessage")
fun getResourceUrl(): String? {
val resolvedResourcePath = resolvedResourcePath
if (resolvedResourcePath != null) {
return resolvedResourcePath
resolvedResourcePath?.let {
return it
}
val resource = if (aClass == null) classLoader!!.getResource(file) else aClass.getResource(file)
if (resource == null) {
val message = "Cannot find standard resource. filename:${this@Resource.file} class=$aClass, classLoader:$classLoader"
val message = "Cannot find standard resource. filename:${this@ExternalResource.file} class=$aClass, classLoader:$classLoader"
if (ApplicationManager.getApplication().isUnitTestMode()) {
LOG.warn(message)
}
@@ -545,14 +545,12 @@ open class ExternalResourceManagerExImpl : ExternalResourceManagerEx(), Persiste
LOG.warn(message)
}
this@Resource.resolvedResourcePath = null
resolvedResourcePath = null
return null
}
var path = FileUtil.unquote(resource.toString())
// this is done by FileUtil for windows
path = path.replace('\\', '/')
this@Resource.resolvedResourcePath = path
val path = URLUtil.unescapePercentSequences(resource.toString().replace('\\', '/'))
resolvedResourcePath = path
return path
}
@@ -560,14 +558,13 @@ open class ExternalResourceManagerExImpl : ExternalResourceManagerEx(), Persiste
if (this === o) return true
if (o == null || javaClass != o.javaClass) return false
val resource = o as Resource
val resource = o as ExternalResource
return classLoader == resource.classLoader && aClass == resource.aClass && file == resource.file
}
override fun hashCode(): Int = this@Resource.file.hashCode()
override fun hashCode(): Int = this@ExternalResource.file.hashCode()
override fun toString(): String = "${this@Resource.file} for $classLoader"
}
override fun toString(): String = "${this@ExternalResource.file} for $classLoader"
}
private fun <T> getMap(resources: Map<String, MutableMap<String, T>>, version: String?): MutableMap<String, T>? {

2
xml/xml-psi-impl/src/com/intellij/javaee/ProjectResources.java
View File

@@ -13,7 +13,7 @@ import java.util.Map;
@State(name = "ProjectResources")
final class ProjectResources extends ExternalResourceManagerExImpl {
@Override
public @NotNull Map<@NotNull String, @NotNull Map<@NotNull String, @NotNull Resource>> computeStdResources$intellij_xml_psi_impl() {
public @NotNull Map<@NotNull String, @NotNull Map<@NotNull String, @NotNull ExternalResource>> computeStdResources$intellij_xml_psi_impl() {
return Collections.emptyMap();
}
}

14
xml/xml-psi-impl/src/com/intellij/javaee/ResourceRegistrarImpl.kt
View File

@@ -6,7 +6,7 @@ import java.util.ArrayList
import java.util.HashMap
class ResourceRegistrarImpl : ResourceRegistrar {
private val resources = HashMap<String, MutableMap<String, ExternalResourceManagerExImpl.Resource>>()
private val resources = HashMap<String, MutableMap<String, ExternalResource>>()
private val ignored = ArrayList<String>()
internal fun getIgnoredResources(): List<String> = ignored
@@ -27,7 +27,7 @@ class ResourceRegistrarImpl : ResourceRegistrar {
classLoader: ClassLoader?
) {
ExternalResourceManagerExImpl.getOrCreateMap(resources, version)
.put(resource, ExternalResourceManagerExImpl.Resource(file = fileName, aClass = aClass, classLoader = classLoader))
.put(resource, ExternalResource(file = fileName, aClass = aClass, classLoader = classLoader))
}
override fun addStdResource(resource: @NonNls String, version: @NonNls String?, fileName: @NonNls String, aClass: Class<*>?) {
@@ -54,14 +54,12 @@ class ResourceRegistrarImpl : ResourceRegistrar {
}
fun addInternalResource(resource: @NonNls String, version: @NonNls String?, fileName: @NonNls String?, classLoader: ClassLoader) {
addStdResource(
resource = resource,
version = version,
fileName = ExternalResourceManagerEx.STANDARD_SCHEMAS.trimStart('/') + fileName,
ExternalResourceManagerExImpl.getOrCreateMap(resources, version = version).put(resource, ExternalResource(
file = ExternalResourceManagerEx.STANDARD_SCHEMAS.trimStart('/') + fileName,
aClass = null,
classLoader = classLoader,
)
))
}
internal fun getResources(): Map<String, MutableMap<String, ExternalResourceManagerExImpl.Resource>> = resources
internal fun getResources(): Map<String, MutableMap<String, ExternalResource>> = resources
}