From e0f3cb0c6cf96b33079a8ea1441348385ebf9045 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Sun, 4 Aug 2024 20:36:41 +0200
Subject: [PATCH] IJPL-159596 refactor ResourceRegistrar

GitOrigin-RevId: 5a11d285d69adffe92c0ff82d5d56ecdda782f23
---
 xml/xml-psi-api/intellij.xml.psi.iml            |  1 +
 .../com/intellij/javaee/ResourceRegistrar.kt    | 17 +++++++++--------
 .../intellij/javaee/ResourceRegistrarImpl.kt    |  4 ++++
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/xml/xml-psi-api/intellij.xml.psi.iml b/xml/xml-psi-api/intellij.xml.psi.iml
index 3266e8f1a0ec..bf8e980f6df6 100644
--- a/xml/xml-psi-api/intellij.xml.psi.iml
+++ b/xml/xml-psi-api/intellij.xml.psi.iml
@@ -13,5 +13,6 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.editor" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/xml/xml-psi-api/src/com/intellij/javaee/ResourceRegistrar.kt b/xml/xml-psi-api/src/com/intellij/javaee/ResourceRegistrar.kt
index e3bc5bbef4bd..6776a27a394a 100644
--- a/xml/xml-psi-api/src/com/intellij/javaee/ResourceRegistrar.kt
+++ b/xml/xml-psi-api/src/com/intellij/javaee/ResourceRegistrar.kt
@@ -1,18 +1,19 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.javaee;
+package com.intellij.javaee
 
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.NonNls
 
 /**
  * @see StandardResourceProvider
  */
-public interface ResourceRegistrar {
-  void addStdResource(@NotNull @NonNls String resource, @NonNls String fileName);
+interface ResourceRegistrar {
+  fun addStdResource(resource: @NonNls String, fileName: @NonNls String)
 
-  void addStdResource(@NotNull @NonNls String resource, @NonNls String fileName, Class<?> klass);
+  fun addStdResource(resource: @NonNls String, fileName: @NonNls String, classLoader: ClassLoader)
 
-  void addStdResource(@NotNull @NonNls String resource, @NonNls String version, @NonNls String fileName, Class<?> klass);
+  fun addStdResource(resource: @NonNls String, fileName: @NonNls String, klass: Class<*>?)
 
-  void addIgnoredResource(@NotNull @NonNls String url);
+  fun addStdResource(resource: @NonNls String, version: @NonNls String?, fileName: @NonNls String, aClass: Class<*>?)
+
+  fun addIgnoredResource(url: @NonNls String)
 }
diff --git a/xml/xml-psi-impl/src/com/intellij/javaee/ResourceRegistrarImpl.kt b/xml/xml-psi-impl/src/com/intellij/javaee/ResourceRegistrarImpl.kt
index 7a7907aafbaa..9bb7c5f2f356 100644
--- a/xml/xml-psi-impl/src/com/intellij/javaee/ResourceRegistrarImpl.kt
+++ b/xml/xml-psi-impl/src/com/intellij/javaee/ResourceRegistrarImpl.kt
@@ -34,6 +34,10 @@ class ResourceRegistrarImpl : ResourceRegistrar {
     addStdResource(resource = resource, version = version, fileName = fileName, aClass = aClass, classLoader = null)
   }
 
+  override fun addStdResource(resource: @NonNls String, fileName: @NonNls String, classLoader: ClassLoader) {
+    addStdResource(resource = resource, version = null, fileName = fileName, aClass = null, classLoader = classLoader)
+  }
+
   override fun addIgnoredResource(url: @NonNls String) {
     ignored.add(url)
   }