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 - sort modifiers

Browse Source 
GitOrigin-RevId: a6c2e662d3a185b13847b586612bbc674ad2c3a7
This commit is contained in:
Vladimir Krivosheev
2024-08-04 15:30:12 +02:00
committed by intellij-monorepo-bot
parent ddd74095aa
commit 6039af1e68
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ExternalResourceReference.java
View File

@@ -63,7 +63,7 @@ final class ExternalResourceReference implements PsiReference, LocalQuickFixProv
@Override
public @Nullable PsiElement resolve() {
String value = attribute.getValue();
String resourceLocation = resourceManager.getResourceLocation(value, attribute.getProject());
String resourceLocation = value == null ? null : resourceManager.getResourceLocation(value, attribute.getProject());
if (Objects.equals(resourceLocation, value)) {
return null;
}

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

@@ -57,7 +57,6 @@ private val XSD_1_1 = ExternalResourceManagerExImpl.Resource(
private const val HTML5_DOCTYPE_ELEMENT = "HTML5"
private const val RESOURCE_ELEMENT: @NonNls String = "resource"
private const val URL_ATTR: @NonNls String = "url"
private const val LOCATION_ATTR: @NonNls String = "location"
private const val IGNORED_RESOURCE_ELEMENT: @NonNls String = "ignored-resource"
private const val HTML_DEFAULT_DOCTYPE_ELEMENT: @NonNls String = "default-html-doctype"
@@ -149,10 +148,9 @@ open class ExternalResourceManagerExImpl : ExternalResourceManagerEx(), Persiste
return parent != null && parent.getName() == "standardSchemas"
}
override fun isUserResource(file: VirtualFile): Boolean {
return resourceLocations.contains(file.getUrl())
}
override fun isUserResource(file: VirtualFile): Boolean = resourceLocations.contains(file.url)
@Suppress("OVERRIDE_DEPRECATION")
override fun getResourceLocation(url: String): String = getResourceLocation(url, DEFAULT_VERSION)
override fun getResourceLocation(url: @NonNls String, version: String?): String {
@@ -178,9 +176,7 @@ open class ExternalResourceManagerExImpl : ExternalResourceManagerEx(), Persiste
}
override fun getStdResource(url: String, version: String?): String? {
val map = getMap(standardResources.value, version) ?: return null
val resource = map.get(url)
return if (resource == null) null else resource.getResourceUrl()
return getMap(standardResources.value, version)?.get(url)?.getResourceUrl()
}
private fun getUserResource(url: String, version: String?): String? = getMap<String>(resources, version)?.get(url)
@@ -367,23 +363,17 @@ open class ExternalResourceManagerExImpl : ExternalResourceManagerEx(), Persiste
return ArrayUtilRt.toStringArray(set)
}
override fun getModificationCount(project: Project): Long {
return getProjectResources(project).getModificationCount()
}
override fun getModificationCount(project: Project): Long = getProjectResources(project).modificationCount
override fun getState(): Element? {
val element = Element("state")
val urls: MutableSet<String?> = TreeSet<String?>()
val urls = TreeSet<String>()
for (map in resources.values) {
urls.addAll(map.keys)
}
for (url in urls) {
if (url == null) {
continue
}
val location = getResourceLocation(url)
val e = Element(RESOURCE_ELEMENT)
e.setAttribute(URL_ATTR, url)
@@ -453,7 +443,7 @@ open class ExternalResourceManagerExImpl : ExternalResourceManagerEx(), Persiste
}
val catalogElement = state.getChild(CATALOG_PROPERTIES_ELEMENT)
if (catalogElement != null) {
myCatalogPropertiesFile = catalogElement.getTextTrim()
myCatalogPropertiesFile = catalogElement.textTrim
}
}
@@ -537,6 +527,7 @@ open class ExternalResourceManagerExImpl : ExternalResourceManagerEx(), Persiste
return if (i > 0) file.substring(0, i) else file
}
@Suppress("LoggingSimilarMessage")
fun getResourceUrl(): String? {
val resolvedResourcePath = resolvedResourcePath
if (resolvedResourcePath != null) {