initial working on extracting xml api

Author: VISTALL

jam-api/src/main/java/com/intellij/jam/model/common/CommonModelElement.java

@@ -22,8 +22,8 @@
 import consulo.language.psi.PsiManager;
 import consulo.language.util.ModuleUtilCore;
 import consulo.module.Module;
-import consulo.xml.psi.xml.XmlTag;
 
+import consulo.xml.language.psi.XmlTag;
 import org.jspecify.annotations.Nullable;
 
 public interface CommonModelElement {

jam-api/src/main/java/com/intellij/jam/model/common/ManualModelMergerUtil.java

@@ -29,7 +29,7 @@
 import consulo.language.util.ModuleUtilCore;
 import consulo.module.Module;
 import consulo.util.collection.ContainerUtil;
-import consulo.xml.psi.xml.XmlTag;
+import consulo.xml.language.psi.XmlTag;
 import consulo.xml.util.xml.DomElement;
 import consulo.xml.util.xml.DomUtil;
 import consulo.xml.util.xml.GenericValue;

jam-api/src/main/java/com/intellij/jam/model/util/JamCommonUtil.java

@@ -63,10 +63,10 @@
 import consulo.util.lang.StringUtil;
 import consulo.util.lang.reflect.ReflectionUtil;
 import consulo.virtualFileSystem.VirtualFile;
-import consulo.xml.psi.xml.XmlAttribute;
-import consulo.xml.psi.xml.XmlAttributeValue;
-import consulo.xml.psi.xml.XmlFile;
-import consulo.xml.psi.xml.XmlTag;
+import consulo.xml.language.psi.XmlAttribute;
+import consulo.xml.language.psi.XmlAttributeValue;
+import consulo.xml.language.psi.XmlFile;
+import consulo.xml.language.psi.XmlTag;
 import consulo.xml.util.xml.*;
 import org.jspecify.annotations.Nullable;
 

jam-api/src/main/java/com/intellij/jam/view/ui/SelectElementsDialog.java

@@ -34,7 +34,7 @@
 import consulo.ui.ex.awt.util.TableUtil;
 import consulo.util.lang.Comparing;
 import consulo.util.lang.StringUtil;
-import consulo.xml.psi.xml.XmlTag;
+import consulo.xml.language.psi.XmlTag;
 import org.jspecify.annotations.Nullable;
 
 import javax.swing.*;

jam-impl/src/main/java/consulo/java/jam/impl/JamCommonServiceImpl.java

@@ -24,7 +24,7 @@
 import consulo.java.jam.util.JamCommonService;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
-import consulo.xml.psi.xml.XmlFile;
+import consulo.xml.language.psi.XmlFile;
 import jakarta.inject.Singleton;
 
 /**

java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/find/findUsages/JavaFindUsagesHelper.java

@@ -51,7 +51,7 @@
 import consulo.util.collection.ContainerUtil;
 import consulo.util.lang.Comparing;
 import consulo.util.lang.function.ThrowableSupplier;
-import consulo.xml.psi.xml.XmlAttributeValue;
+import consulo.xml.language.psi.XmlAttributeValue;
 import org.jspecify.annotations.Nullable;
 
 import java.util.*;

java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/psi/util/PsiMatchers.java

@@ -26,8 +26,7 @@
 import consulo.language.psi.PsiNamedElement;
 import consulo.language.psi.util.PsiMatcherExpression;
 import consulo.util.collection.ArrayUtil;
-import consulo.xml.psi.xml.XmlTag;
-
+import consulo.xml.language.psi.XmlTag;
 
 public class PsiMatchers {
 

java-properties-impl/src/main/java/consulo/java/properties/impl/psi/JSTLXmlUtil.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2013-2026 consulo.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package consulo.java.properties.impl.psi;
+
+/**
+ * @author VISTALL
+ * @since 2026-04-07
+ */
+public class JSTLXmlUtil {
+    public static final String JSTL_FORMAT_URI = "http://java.sun.com/jsp/jstl/fmt";
+    public static final String JSTL_FORMAT_URI2 = "http://java.sun.com/jstl/fmt";
+    private static final String JSTL_FORMAT_URI3 = "http://java.sun.com/jstl/fmt_rt";
+
+    public static final String[] JSTL_FORMAT_URIS = {
+        JSTL_FORMAT_URI,
+        JSTL_FORMAT_URI2,
+        JSTL_FORMAT_URI3
+    };
+}

java-properties-impl/src/main/java/consulo/java/properties/impl/psi/PrefixBasedPropertyReference.java

@@ -18,13 +18,12 @@
 import com.intellij.lang.properties.IProperty;
 import com.intellij.lang.properties.PropertiesBundle;
 import com.intellij.lang.properties.references.PropertyReference;
-import com.intellij.xml.util.XmlUtil;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.IncorrectOperationException;
-import consulo.xml.psi.xml.XmlAttributeValue;
-import consulo.xml.psi.xml.XmlTag;
 
+import consulo.xml.language.psi.XmlAttributeValue;
+import consulo.xml.language.psi.XmlTag;
 import org.jspecify.annotations.Nullable;
 import java.util.Arrays;
 import java.util.Set;
@@ -85,7 +84,7 @@ private String getKeyPrefix() {
         final XmlTag curParentTag = (XmlTag) curParent;
 
         if ("bundle".equals(curParentTag.getLocalName()) &&
-            Arrays.binarySearch(XmlUtil.JSTL_FORMAT_URIS, curParentTag.getNamespace()) >= 0) {
+            Arrays.binarySearch(JSTLXmlUtil.JSTL_FORMAT_URIS, curParentTag.getNamespace()) >= 0) {
           final String attributeValue = curParentTag.getAttributeValue(PREFIX_ATTR_NAME);
 
           if (attributeValue != null && attributeValue.length() > 0) {

java-properties-impl/src/main/java/consulo/java/properties/impl/psi/PropertiesReferenceProvider.java

@@ -22,15 +22,14 @@
 import com.intellij.java.language.psi.PsiLiteralExpression;
 import com.intellij.lang.properties.IProperty;
 import com.intellij.lang.properties.references.PropertyReference;
-import com.intellij.xml.util.XmlUtil;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.java.analysis.impl.util.JavaI18nUtil;
 import consulo.language.psi.*;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.util.ProcessingContext;
-import consulo.xml.psi.xml.XmlAttribute;
-import consulo.xml.psi.xml.XmlAttributeValue;
-import consulo.xml.psi.xml.XmlTag;
+import consulo.xml.language.psi.XmlAttribute;
+import consulo.xml.language.psi.XmlAttributeValue;
+import consulo.xml.language.psi.XmlTag;
 import jakarta.inject.Inject;
 
 import java.util.Arrays;
@@ -94,7 +93,7 @@ else if (element instanceof XmlAttributeValue && isNonDynamicAttribute(element))
       final XmlAttribute attribute = (XmlAttribute)element.getParent();
       if ("key".equals(attribute.getName())) {
         final XmlTag parent = attribute.getParent();
-        if ("message".equals(parent.getLocalName()) && Arrays.binarySearch(XmlUtil.JSTL_FORMAT_URIS, parent.getNamespace()) >= 0) {
+        if ("message".equals(parent.getLocalName()) && Arrays.binarySearch(JSTLXmlUtil.JSTL_FORMAT_URIS, parent.getNamespace()) >= 0) {
           propertyRefWithPrefix = true;
         }
       }