From 258f392bf23a8533e012e6c191b3387242d5c48f Mon Sep 17 00:00:00 2001 From: Maria Filipanova Date: Thu, 12 Jun 2025 17:57:05 +0200 Subject: [PATCH] IJPL-185506: add intellij.xml.psi to the frontend GitOrigin-RevId: 005ba4903fad88f2b27fccd77694a5e4ec629bcd --- .../src/META-INF/xml-modules.xml | 1 + .../devkit/intellij.devkit.i18n/BUILD.bazel | 2 ++ .../intellij.devkit.i18n.iml | 1 + .../devkit/intellij.kotlin.devkit/BUILD.bazel | 1 + .../intellij.kotlin.devkit.iml | 1 + plugins/javaFX/BUILD.bazel | 1 + plugins/javaFX/intellij.javaFX.properties.iml | 1 + .../resources/intellij.xml.analysis.xml | 14 ++++++++ .../DefaultXmlSuppressionProvider.java | 2 +- .../XmlInspectionSuppressor.java | 18 +++++++++++ .../XmlSuppressableInspectionTool.java | 2 +- .../XmlSuppressionProvider.java | 2 +- .../resources/META-INF/XmlAnalysisImpl.xml | 2 ++ .../xml/XmlChangeLocalityDetector.java | 16 +--------- xml/xml-psi-api/BUILD.bazel | 5 +-- xml/xml-psi-api/intellij.xml.psi.iml | 1 - .../resources/intellij.xml.psi.xml | 7 ---- .../XmlInspectionSuppressor.java | 32 ------------------- .../resources/intellij.xml.psi.impl.xml | 2 -- 19 files changed, 47 insertions(+), 64 deletions(-) create mode 100644 xml/xml-analysis-api/resources/intellij.xml.analysis.xml rename xml/{xml-psi-api => xml-analysis-api}/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java (98%) create mode 100644 xml/xml-analysis-api/src/com/intellij/codeInspection/XmlInspectionSuppressor.java rename xml/{xml-psi-api => xml-analysis-api}/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java (98%) rename xml/{xml-psi-api => xml-analysis-api}/src/com/intellij/codeInspection/XmlSuppressionProvider.java (91%) rename xml/{xml-psi-impl => xml-analysis-impl}/src/com/intellij/xml/XmlChangeLocalityDetector.java (58%) delete mode 100644 xml/xml-psi-api/src/com/intellij/codeInspection/XmlInspectionSuppressor.java diff --git a/platform/platform-resources/src/META-INF/xml-modules.xml b/platform/platform-resources/src/META-INF/xml-modules.xml index c2764cc0ba03..0f6a97a70779 100644 --- a/platform/platform-resources/src/META-INF/xml-modules.xml +++ b/platform/platform-resources/src/META-INF/xml-modules.xml @@ -6,6 +6,7 @@ + \ No newline at end of file diff --git a/plugins/devkit/intellij.devkit.i18n/BUILD.bazel b/plugins/devkit/intellij.devkit.i18n/BUILD.bazel index 962bca154c28..eabf84422e30 100644 --- a/plugins/devkit/intellij.devkit.i18n/BUILD.bazel +++ b/plugins/devkit/intellij.devkit.i18n/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//platform/platform-impl:ide-impl", "//xml/dom-openapi:dom", "//xml/xml-psi-api:psi", + "//xml/xml-analysis-api:analysis", "//xml/xml-psi-impl:psi-impl", "//plugins/devkit/devkit-core:core", "//platform/core-ui", @@ -59,6 +60,7 @@ jvm_library( "//platform/platform-impl:ide-impl_test_lib", "//xml/dom-openapi:dom", "//xml/xml-psi-api:psi", + "//xml/xml-analysis-api:analysis", "//xml/xml-psi-impl:psi-impl", "//plugins/devkit/devkit-core:core", "//platform/testFramework", diff --git a/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.iml b/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.iml index 28412f59d497..d6b906918a48 100644 --- a/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.iml +++ b/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.iml @@ -23,6 +23,7 @@ + diff --git a/plugins/devkit/intellij.kotlin.devkit/BUILD.bazel b/plugins/devkit/intellij.kotlin.devkit/BUILD.bazel index f3b104e1bd95..0e42f5c2bc8d 100644 --- a/plugins/devkit/intellij.kotlin.devkit/BUILD.bazel +++ b/plugins/devkit/intellij.kotlin.devkit/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "//java/java-psi-api:psi", "//xml/dom-openapi:dom", "//xml/xml-psi-api:psi", + "//xml/xml-analysis-api:analysis", "//java/java-analysis-api:analysis", "//plugins/kotlin/code-insight/intentions-shared:kotlin-code-insight-intentions-shared", "//plugins/kotlin/code-insight/utils", diff --git a/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml b/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml index 22267d4b74ac..5424d1acc308 100644 --- a/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml +++ b/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml @@ -35,6 +35,7 @@ + diff --git a/plugins/javaFX/BUILD.bazel b/plugins/javaFX/BUILD.bazel index 15e6acc091ff..f2dfb90b07f5 100644 --- a/plugins/javaFX/BUILD.bazel +++ b/plugins/javaFX/BUILD.bazel @@ -120,6 +120,7 @@ jvm_library( deps = [ "//platform/platform-impl:ide-impl", "//xml/xml-psi-api:psi", + "//xml/xml-analysis-api:analysis", "//xml/xml-psi-impl:psi-impl", "//plugins/properties/properties-psi-impl:backend-psi", "//plugins/javaFX", diff --git a/plugins/javaFX/intellij.javaFX.properties.iml b/plugins/javaFX/intellij.javaFX.properties.iml index db68502ea114..46e87ab295c7 100644 --- a/plugins/javaFX/intellij.javaFX.properties.iml +++ b/plugins/javaFX/intellij.javaFX.properties.iml @@ -10,6 +10,7 @@ + diff --git a/xml/xml-analysis-api/resources/intellij.xml.analysis.xml b/xml/xml-analysis-api/resources/intellij.xml.analysis.xml new file mode 100644 index 000000000000..6e71bd7d917a --- /dev/null +++ b/xml/xml-analysis-api/resources/intellij.xml.analysis.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xml/xml-psi-api/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java b/xml/xml-analysis-api/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java similarity index 98% rename from xml/xml-psi-api/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java rename to xml/xml-analysis-api/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java index 14e9c79c50d5..4ab9489aa5de 100644 --- a/xml/xml-psi-api/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java +++ b/xml/xml-analysis-api/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInspection; diff --git a/xml/xml-analysis-api/src/com/intellij/codeInspection/XmlInspectionSuppressor.java b/xml/xml-analysis-api/src/com/intellij/codeInspection/XmlInspectionSuppressor.java new file mode 100644 index 000000000000..e19cd316cd65 --- /dev/null +++ b/xml/xml-analysis-api/src/com/intellij/codeInspection/XmlInspectionSuppressor.java @@ -0,0 +1,18 @@ +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.codeInspection; + +import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +public class XmlInspectionSuppressor implements InspectionSuppressor{ + @Override + public boolean isSuppressedFor(@NotNull PsiElement element, @NotNull String toolId) { + return XmlSuppressionProvider.isSuppressed(element, toolId); + } + + @Override + public SuppressQuickFix @NotNull [] getSuppressActions(@Nullable PsiElement element, @NotNull String toolId) { + return XmlSuppressableInspectionTool.getSuppressFixes(toolId); + } +} diff --git a/xml/xml-psi-api/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java b/xml/xml-analysis-api/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java similarity index 98% rename from xml/xml-psi-api/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java rename to xml/xml-analysis-api/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java index b1491d3eeada..e46da3b7c3c1 100644 --- a/xml/xml-psi-api/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java +++ b/xml/xml-analysis-api/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInspection; diff --git a/xml/xml-psi-api/src/com/intellij/codeInspection/XmlSuppressionProvider.java b/xml/xml-analysis-api/src/com/intellij/codeInspection/XmlSuppressionProvider.java similarity index 91% rename from xml/xml-psi-api/src/com/intellij/codeInspection/XmlSuppressionProvider.java rename to xml/xml-analysis-api/src/com/intellij/codeInspection/XmlSuppressionProvider.java index 99f8236f87c2..dea5586d088f 100644 --- a/xml/xml-psi-api/src/com/intellij/codeInspection/XmlSuppressionProvider.java +++ b/xml/xml-analysis-api/src/com/intellij/codeInspection/XmlSuppressionProvider.java @@ -1,4 +1,4 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInspection; diff --git a/xml/xml-analysis-impl/resources/META-INF/XmlAnalysisImpl.xml b/xml/xml-analysis-impl/resources/META-INF/XmlAnalysisImpl.xml index 04698f12e57c..452f348820c7 100644 --- a/xml/xml-analysis-impl/resources/META-INF/XmlAnalysisImpl.xml +++ b/xml/xml-analysis-impl/resources/META-INF/XmlAnalysisImpl.xml @@ -146,5 +146,7 @@ + + \ No newline at end of file diff --git a/xml/xml-psi-impl/src/com/intellij/xml/XmlChangeLocalityDetector.java b/xml/xml-analysis-impl/src/com/intellij/xml/XmlChangeLocalityDetector.java similarity index 58% rename from xml/xml-psi-impl/src/com/intellij/xml/XmlChangeLocalityDetector.java rename to xml/xml-analysis-impl/src/com/intellij/xml/XmlChangeLocalityDetector.java index db3bba7f1ed1..25ded22f5ead 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/XmlChangeLocalityDetector.java +++ b/xml/xml-analysis-impl/src/com/intellij/xml/XmlChangeLocalityDetector.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2014 JetBrains s.r.o. - * - * 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. - */ +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.xml; import com.intellij.codeInsight.daemon.ChangeLocalityDetector; diff --git a/xml/xml-psi-api/BUILD.bazel b/xml/xml-psi-api/BUILD.bazel index f1158c7e8d56..aedc2555269c 100644 --- a/xml/xml-psi-api/BUILD.bazel +++ b/xml/xml-psi-api/BUILD.bazel @@ -21,9 +21,6 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "@lib//:kotlin-stdlib", ], - runtime_deps = [ - ":psi_resources", - "//platform/backend", - ] + runtime_deps = [":psi_resources"] ) ### auto-generated section `build intellij.xml.psi` end \ No newline at end of file diff --git a/xml/xml-psi-api/intellij.xml.psi.iml b/xml/xml-psi-api/intellij.xml.psi.iml index eff88fddb130..3ccb5f1c3a38 100644 --- a/xml/xml-psi-api/intellij.xml.psi.iml +++ b/xml/xml-psi-api/intellij.xml.psi.iml @@ -15,6 +15,5 @@ - \ No newline at end of file diff --git a/xml/xml-psi-api/resources/intellij.xml.psi.xml b/xml/xml-psi-api/resources/intellij.xml.psi.xml index 2040a983f30d..9fc32926eddf 100644 --- a/xml/xml-psi-api/resources/intellij.xml.psi.xml +++ b/xml/xml-psi-api/resources/intellij.xml.psi.xml @@ -1,14 +1,9 @@ - - - - - - - diff --git a/xml/xml-psi-api/src/com/intellij/codeInspection/XmlInspectionSuppressor.java b/xml/xml-psi-api/src/com/intellij/codeInspection/XmlInspectionSuppressor.java deleted file mode 100644 index 3da880fd64f8..000000000000 --- a/xml/xml-psi-api/src/com/intellij/codeInspection/XmlInspectionSuppressor.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2000-2014 JetBrains s.r.o. - * - * 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 com.intellij.codeInspection; - -import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public class XmlInspectionSuppressor implements InspectionSuppressor{ - @Override - public boolean isSuppressedFor(@NotNull PsiElement element, @NotNull String toolId) { - return XmlSuppressionProvider.isSuppressed(element, toolId); - } - - @Override - public SuppressQuickFix @NotNull [] getSuppressActions(@Nullable PsiElement element, @NotNull String toolId) { - return XmlSuppressableInspectionTool.getSuppressFixes(toolId); - } -} diff --git a/xml/xml-psi-impl/resources/intellij.xml.psi.impl.xml b/xml/xml-psi-impl/resources/intellij.xml.psi.impl.xml index 9ba33e5c2294..d19c344bfdaa 100644 --- a/xml/xml-psi-impl/resources/intellij.xml.psi.impl.xml +++ b/xml/xml-psi-impl/resources/intellij.xml.psi.impl.xml @@ -84,8 +84,6 @@ - -