diff --git a/java/java-tests/BUILD.bazel b/java/java-tests/BUILD.bazel index dd356a01f0f6..65320a6f559a 100644 --- a/java/java-tests/BUILD.bazel +++ b/java/java-tests/BUILD.bazel @@ -89,6 +89,7 @@ jvm_library( "//platform/platform-impl/internal", "//libraries/mockito", "@lib//:assert_j", + "//xml/xml-analysis-api:analysis", "//xml/xml-analysis-impl:analysis-impl", "//xml/xml-psi-api:psi", "//xml/xml-psi-impl:psi-impl", diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml index 3545570dd422..08118a0efe27 100644 --- a/java/java-tests/intellij.java.tests.iml +++ b/java/java-tests/intellij.java.tests.iml @@ -70,6 +70,7 @@ + diff --git a/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.kt b/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.kt index 9d8fe83fb0c7..9b0dad08a1c9 100644 --- a/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.kt +++ b/platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.kt @@ -38,13 +38,17 @@ open class HighlightDisplayLevel(val severity: HighlightSeverity) { companion object { private val LEVEL_MAP = HashMap() - private fun createHighlightDisplayLevel(severity: HighlightSeverity, - key: TextAttributesKey, - icon: Icon, - outlineIcon: Icon): HighlightDisplayLevel { - return HighlightDisplayLevel(severity = severity, - icon = HighlightDisplayLevelColorizedIcon(key = key, baseIcon = icon), - outlineIcon = HighlightDisplayLevelColorizedIcon(key = key, baseIcon = outlineIcon)) + private fun createHighlightDisplayLevel( + severity: HighlightSeverity, + key: TextAttributesKey, + icon: Icon, + outlineIcon: Icon, + ): HighlightDisplayLevel { + return HighlightDisplayLevel( + severity = severity, + icon = HighlightDisplayLevelColorizedIcon(key = key, baseIcon = icon), + outlineIcon = HighlightDisplayLevelColorizedIcon(key = key, baseIcon = outlineIcon), + ) } @JvmField diff --git a/platform/analysis-api/src/com/intellij/codeInspection/LocalQuickFix.java b/platform/analysis-api/src/com/intellij/codeInspection/LocalQuickFix.java index 88506f9cb4b7..2e66e24a5aed 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/LocalQuickFix.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/LocalQuickFix.java @@ -36,8 +36,7 @@ import static com.intellij.codeInsight.intention.CustomizableIntentionAction.Ran * {@link com.intellij.codeInsight.intention.LowPriorityAction LowPriorityAction} to change ordering. *

* To learn how to implement preview correctly, read Intention Action Preview (IntelliJ Platform Docs). - * - * @author max + * * @see ProblemDescriptor * @see com.intellij.openapi.util.Iconable */ diff --git a/platform/analysis-impl/api-dump-unreviewed.txt b/platform/analysis-impl/api-dump-unreviewed.txt index 392bb3dc6329..5851591ba56c 100644 --- a/platform/analysis-impl/api-dump-unreviewed.txt +++ b/platform/analysis-impl/api-dump-unreviewed.txt @@ -96,74 +96,6 @@ a:com.intellij.codeInsight.AutoPopupController - s:getInstance(com.intellij.openapi.project.Project):com.intellij.codeInsight.AutoPopupController - a:scheduleAutoPopup(com.intellij.openapi.editor.Editor,com.intellij.codeInsight.completion.CompletionType,com.intellij.openapi.util.Condition):V - a:waitForDelayedActions(J,java.util.concurrent.TimeUnit):V -c:com.intellij.codeInsight.CodeInsightSettings -- com.intellij.openapi.components.PersistentStateComponent -- java.lang.Cloneable -- ADD_IMPORTS_ON_PASTE:I -- ADD_MEMBER_IMPORTS_ON_THE_FLY:Z -- ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY:Z -- sf:ALL:I -- sf:ASK:I -- AUTOCOMPLETE_ON_CODE_COMPLETION:Z -- AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION:Z -- AUTOINSERT_PAIR_BRACKET:Z -- AUTOINSERT_PAIR_QUOTE:Z -- AUTO_POPUP_COMPLETION_LOOKUP:Z -- AUTO_POPUP_JAVADOC_INFO:Z -- AUTO_POPUP_PARAMETER_INFO:Z -- CLOSE_COMMENT_ON_ENTER:Z -- COMPLETION_CASE_SENSITIVE:I -- ENABLE_SECOND_REFORMAT:Z -- EXCLUDED_PACKAGES:java.lang.String[] -- sf:FIRST_LETTER:I -- HIGHLIGHT_BRACES:Z -- HIGHLIGHT_IDENTIFIER_UNDER_CARET:Z -- HIGHLIGHT_SCOPE:Z -- sf:INDENT_BLOCK:I -- sf:INDENT_EACH_LINE:I -- INDENT_TO_CARET_ON_PASTE:Z -- INSERT_BRACE_ON_ENTER:Z -- INSERT_SCRIPTLET_END_ON_ENTER:Z -- JAVADOC_GENERATE_CLOSING_TAG:Z -- JAVADOC_INFO_DELAY:I -- sf:JAVADOC_INFO_DELAY_RANGE:com.intellij.ide.ui.UINumericRange -- JAVADOC_STUB_ON_ENTER:Z -- JSP_ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY:Z -- sf:NO:I -- sf:NONE:I -- sf:NO_REFORMAT:I -- OPTIMIZE_IMPORTS_ON_THE_FLY:Z -- PARAMETER_INFO_DELAY:I -- sf:PARAMETER_INFO_DELAY_RANGE:com.intellij.ide.ui.UINumericRange -- sf:REFORMAT_BLOCK:I -- REFORMAT_BLOCK_ON_RBRACE:Z -- REFORMAT_ON_PASTE:I -- SELECT_AUTOPOPUP_SUGGESTIONS_BY_CHARS:Z -- SHOW_FULL_SIGNATURES_IN_PARAMETER_INFO:Z -- SHOW_PARAMETER_NAME_HINTS_ON_COMPLETION:Z -- SMART_END_ACTION:Z -- SMART_INDENT_ON_ENTER:Z -- SURROUND_SELECTION_ON_QUOTE_TYPED:Z -- TAB_EXITS_BRACKETS_AND_QUOTES:Z -- USE_ACCESSORS_IN_EQUALS_HASHCODE:Z -- USE_INSTANCEOF_ON_EQUALS_PARAMETER:Z -- sf:YES:I -- ():V -- addPropertyChangeListener(java.beans.PropertyChangeListener,com.intellij.openapi.Disposable):V -- clone():com.intellij.codeInsight.CodeInsightSettings -- equals(java.lang.Object):Z -- getBackspaceMode():com.intellij.codeInsight.editorActions.SmartBackspaceMode -- getCompletionCaseSensitive():I -- s:getInstance():com.intellij.codeInsight.CodeInsightSettings -- getState():org.jdom.Element -- isSelectAutopopupSuggestionsByChars():Z -- loadState(org.jdom.Element):V -- noStateLoaded():V -- s:runWithTemporarySettings(com.intellij.util.ThrowableConvertor):java.lang.Object -- setBackspaceMode(com.intellij.codeInsight.editorActions.SmartBackspaceMode):V -- setCompletionCaseSensitive(I):V -- setSelectAutopopupSuggestionsByChars(Z):V -- writeExternal(org.jdom.Element):V a:com.intellij.codeInsight.TargetElementEvaluatorEx2 - com.intellij.codeInsight.TargetElementEvaluator - ():V diff --git a/platform/analysis-impl/api-dump.txt b/platform/analysis-impl/api-dump.txt index 51640620d777..83404835a7e6 100644 --- a/platform/analysis-impl/api-dump.txt +++ b/platform/analysis-impl/api-dump.txt @@ -12,6 +12,74 @@ com.intellij.codeHighlighting.TextEditorHighlightingPassFactoryRegistrar a:com.intellij.codeInsight.AutoPopupController - f:scheduleAutoPopup(com.intellij.openapi.editor.Editor):V - f:scheduleAutoPopup(com.intellij.openapi.editor.Editor,com.intellij.openapi.util.Condition):V +f:com.intellij.codeInsight.CodeInsightSettings +- com.intellij.openapi.components.PersistentStateComponent +- java.lang.Cloneable +- ADD_IMPORTS_ON_PASTE:I +- ADD_MEMBER_IMPORTS_ON_THE_FLY:Z +- ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY:Z +- sf:ALL:I +- sf:ASK:I +- AUTOCOMPLETE_ON_CODE_COMPLETION:Z +- AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION:Z +- AUTOINSERT_PAIR_BRACKET:Z +- AUTOINSERT_PAIR_QUOTE:Z +- AUTO_POPUP_COMPLETION_LOOKUP:Z +- AUTO_POPUP_JAVADOC_INFO:Z +- AUTO_POPUP_PARAMETER_INFO:Z +- CLOSE_COMMENT_ON_ENTER:Z +- COMPLETION_CASE_SENSITIVE:I +- ENABLE_SECOND_REFORMAT:Z +- EXCLUDED_PACKAGES:java.lang.String[] +- sf:FIRST_LETTER:I +- HIGHLIGHT_BRACES:Z +- HIGHLIGHT_IDENTIFIER_UNDER_CARET:Z +- HIGHLIGHT_SCOPE:Z +- sf:INDENT_BLOCK:I +- sf:INDENT_EACH_LINE:I +- INDENT_TO_CARET_ON_PASTE:Z +- INSERT_BRACE_ON_ENTER:Z +- INSERT_SCRIPTLET_END_ON_ENTER:Z +- JAVADOC_GENERATE_CLOSING_TAG:Z +- JAVADOC_INFO_DELAY:I +- sf:JAVADOC_INFO_DELAY_RANGE:com.intellij.ide.ui.UINumericRange +- JAVADOC_STUB_ON_ENTER:Z +- JSP_ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY:Z +- sf:NO:I +- sf:NONE:I +- sf:NO_REFORMAT:I +- OPTIMIZE_IMPORTS_ON_THE_FLY:Z +- PARAMETER_INFO_DELAY:I +- sf:PARAMETER_INFO_DELAY_RANGE:com.intellij.ide.ui.UINumericRange +- sf:REFORMAT_BLOCK:I +- REFORMAT_BLOCK_ON_RBRACE:Z +- REFORMAT_ON_PASTE:I +- SELECT_AUTOPOPUP_SUGGESTIONS_BY_CHARS:Z +- SHOW_FULL_SIGNATURES_IN_PARAMETER_INFO:Z +- SHOW_PARAMETER_NAME_HINTS_ON_COMPLETION:Z +- SMART_END_ACTION:Z +- SMART_INDENT_ON_ENTER:Z +- SURROUND_SELECTION_ON_QUOTE_TYPED:Z +- TAB_EXITS_BRACKETS_AND_QUOTES:Z +- USE_ACCESSORS_IN_EQUALS_HASHCODE:Z +- USE_INSTANCEOF_ON_EQUALS_PARAMETER:Z +- sf:YES:I +- ():V +- addPropertyChangeListener(java.beans.PropertyChangeListener,com.intellij.openapi.Disposable):V +- clone():com.intellij.codeInsight.CodeInsightSettings +- equals(java.lang.Object):Z +- getBackspaceMode():com.intellij.codeInsight.editorActions.SmartBackspaceMode +- getCompletionCaseSensitive():I +- s:getInstance():com.intellij.codeInsight.CodeInsightSettings +- getState():org.jdom.Element +- isSelectAutopopupSuggestionsByChars():Z +- loadState(org.jdom.Element):V +- noStateLoaded():V +- s:runWithTemporarySettings(com.intellij.util.ThrowableConvertor):java.lang.Object +- setBackspaceMode(com.intellij.codeInsight.editorActions.SmartBackspaceMode):V +- setCompletionCaseSensitive(I):V +- setSelectAutopopupSuggestionsByChars(Z):V +- writeExternal(org.jdom.Element):V com.intellij.codeInsight.TargetElementEvaluatorEx - com.intellij.codeInsight.TargetElementEvaluator - a:isIdentifierPart(com.intellij.psi.PsiFile,java.lang.CharSequence,I):Z diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/CodeInsightSettings.java b/platform/analysis-impl/src/com/intellij/codeInsight/CodeInsightSettings.java index 4693d2ddf22a..424a98dc9f25 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/CodeInsightSettings.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/CodeInsightSettings.java @@ -34,7 +34,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @State(name = "CodeInsightSettings", storages = @Storage("editor.xml"), category = SettingsCategory.CODE, perClient = true) -public class CodeInsightSettings implements PersistentStateComponent, Cloneable { +public final class CodeInsightSettings implements PersistentStateComponent, Cloneable { private static final Logger LOG = Logger.getInstance(CodeInsightSettings.class); private final List myListeners = new CopyOnWriteArrayList<>(); diff --git a/plugins/ant/BUILD.bazel b/plugins/ant/BUILD.bazel index e5c1270ab587..4e63b558ed6a 100644 --- a/plugins/ant/BUILD.bazel +++ b/plugins/ant/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "//java/openapi:java", "@lib//ant/lib:ant-antlr", "//platform/analysis-api:analysis", + "//xml/xml-analysis-api:analysis", "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/ide-core-impl", @@ -69,6 +70,7 @@ jvm_library( "@lib//:junit4", "@lib//ant/lib:ant-antlr", "//platform/analysis-api:analysis", + "//xml/xml-analysis-api:analysis", "//platform/core-api:core", "//platform/editor-ui-api:editor-ui", "//platform/ide-core-impl", diff --git a/plugins/ant/intellij.ant.iml b/plugins/ant/intellij.ant.iml index 7f037b86a215..25fd4db44f8e 100644 --- a/plugins/ant/intellij.ant.iml +++ b/plugins/ant/intellij.ant.iml @@ -14,6 +14,7 @@ + diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntResolveInspection.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntResolveInspection.java index 6dace49ef5fa..25464ee53c7c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/AntResolveInspection.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntResolveInspection.java @@ -29,7 +29,6 @@ import org.jetbrains.annotations.Nullable; import java.util.*; public final class AntResolveInspection extends AntInspection { - public static final String SHORT_NAME = "AntResolveInspection"; @Override @@ -40,7 +39,7 @@ public final class AntResolveInspection extends AntInspection { @Override protected void checkDomElement(@NotNull DomElement element, @NotNull DomElementAnnotationHolder holder, @NotNull DomHighlightingHelper helper) { if (element instanceof GenericDomValue) { - final XmlElement valueElement = DomUtil.getValueElement(((GenericDomValue)element)); + final XmlElement valueElement = DomUtil.getValueElement(((GenericDomValue)element)); if (valueElement != null) { checkReferences(valueElement, holder, element); } diff --git a/plugins/devkit/devkit-core/BUILD.bazel b/plugins/devkit/devkit-core/BUILD.bazel index c675dae692f6..e92198b06450 100644 --- a/plugins/devkit/devkit-core/BUILD.bazel +++ b/plugins/devkit/devkit-core/BUILD.bazel @@ -35,6 +35,7 @@ jvm_library( "//jps/model-api:model", "//jps/model-serialization", "//platform/lang-core", + "//xml/xml-analysis-api:analysis", "//platform/projectModel-api:projectModel", "//platform/refactoring", "//platform/structure-view-impl:structureView-impl", diff --git a/plugins/devkit/devkit-core/intellij.devkit.core.iml b/plugins/devkit/devkit-core/intellij.devkit.core.iml index a3887f7a0297..0c0e2ebe0339 100644 --- a/plugins/devkit/devkit-core/intellij.devkit.core.iml +++ b/plugins/devkit/devkit-core/intellij.devkit.core.iml @@ -41,6 +41,7 @@ + diff --git a/plugins/devkit/devkit-java-tests/BUILD.bazel b/plugins/devkit/devkit-java-tests/BUILD.bazel index 2484f5d7a0c0..7ed6d4fe3ff8 100644 --- a/plugins/devkit/devkit-java-tests/BUILD.bazel +++ b/plugins/devkit/devkit-java-tests/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//platform/structure-view-impl:structureView-impl", "//xml/xml-psi-api:psi", "//xml/xml-psi-impl:psi-impl", + "//xml/xml-analysis-api:analysis", "//spellchecker", "//spellchecker:spellchecker_test_lib", "//xml/xml-analysis-impl:analysis-impl", diff --git a/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml b/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml index e21aa938edad..6ea05558c9a2 100644 --- a/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml +++ b/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml @@ -20,6 +20,7 @@ + diff --git a/plugins/devkit/devkit-tests/BUILD.bazel b/plugins/devkit/devkit-tests/BUILD.bazel index 4d49ae2fa474..91a2d1c976d5 100644 --- a/plugins/devkit/devkit-tests/BUILD.bazel +++ b/plugins/devkit/devkit-tests/BUILD.bazel @@ -31,6 +31,7 @@ jvm_library( "//xml/dom-impl", "//java/compiler/openapi:java-compiler", "//jvm/jvm-analysis-api:analysis", + "//xml/xml-analysis-api:analysis", "//xml/xml-analysis-impl:analysis-impl", "//xml/xml-psi-api:psi", "//spellchecker", diff --git a/plugins/devkit/devkit-tests/intellij.devkit.testFramework.iml b/plugins/devkit/devkit-tests/intellij.devkit.testFramework.iml index 391e92b2f4ac..be8ebe50e952 100644 --- a/plugins/devkit/devkit-tests/intellij.devkit.testFramework.iml +++ b/plugins/devkit/devkit-tests/intellij.devkit.testFramework.iml @@ -23,6 +23,7 @@ + diff --git a/plugins/htmltools/BUILD.bazel b/plugins/htmltools/BUILD.bazel index 9d0d6b4bc1d3..260c5a0fab7b 100644 --- a/plugins/htmltools/BUILD.bazel +++ b/plugins/htmltools/BUILD.bazel @@ -29,6 +29,7 @@ jvm_library( "//platform/indexing-impl", "//xml/xml-psi-api:psi", "//platform/core-ui", + "//xml/xml-analysis-api:analysis", ] ) ### auto-generated section `build intellij.html.tools` end @@ -68,6 +69,7 @@ jvm_library( "//xml/xml-parser:parser", "//platform/refactoring", "//platform/core-impl", + "//xml/xml-analysis-api:analysis", ] ) ### auto-generated section `build intellij.html.tools.tests` end diff --git a/plugins/htmltools/intellij.html.tools.iml b/plugins/htmltools/intellij.html.tools.iml index 43230cdf5136..b1412f6fdc5c 100644 --- a/plugins/htmltools/intellij.html.tools.iml +++ b/plugins/htmltools/intellij.html.tools.iml @@ -23,6 +23,7 @@ + diff --git a/plugins/htmltools/intellij.html.tools.tests.iml b/plugins/htmltools/intellij.html.tools.tests.iml index a10d8f244890..afbca641324b 100644 --- a/plugins/htmltools/intellij.html.tools.tests.iml +++ b/plugins/htmltools/intellij.html.tools.tests.iml @@ -26,5 +26,6 @@ + \ No newline at end of file diff --git a/plugins/javaFX/BUILD.bazel b/plugins/javaFX/BUILD.bazel index 37b0b7c915af..246f37e2d23e 100644 --- a/plugins/javaFX/BUILD.bazel +++ b/plugins/javaFX/BUILD.bazel @@ -49,6 +49,7 @@ jvm_library( "//java/java-impl-refactorings:impl-refactorings", "//xml/xml-psi-api:psi", "//platform/util/jdom", + "//xml/xml-analysis-api:analysis", ] ) @@ -100,6 +101,7 @@ jvm_library( "//java/java-impl-refactorings:impl-refactorings", "//xml/xml-psi-api:psi", "//platform/util/jdom", + "//xml/xml-analysis-api:analysis", ] ) ### auto-generated section `build intellij.javaFX` end diff --git a/plugins/javaFX/community/BUILD.bazel b/plugins/javaFX/community/BUILD.bazel index 5d3ebbd16bbc..73303492a7f1 100644 --- a/plugins/javaFX/community/BUILD.bazel +++ b/plugins/javaFX/community/BUILD.bazel @@ -37,6 +37,7 @@ jvm_library( "//java/testFramework", "//jps/model-api:model", "//platform/projectModel-api:projectModel", + "//xml/xml-analysis-api:analysis", "//platform/refactoring", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", diff --git a/plugins/javaFX/community/intellij.javaFX.community.iml b/plugins/javaFX/community/intellij.javaFX.community.iml index 9a6df61963d8..c6d5e7220334 100644 --- a/plugins/javaFX/community/intellij.javaFX.community.iml +++ b/plugins/javaFX/community/intellij.javaFX.community.iml @@ -18,6 +18,7 @@ + diff --git a/plugins/javaFX/intellij.javaFX.iml b/plugins/javaFX/intellij.javaFX.iml index 8d4b80903f67..d975e1f6e6a0 100644 --- a/plugins/javaFX/intellij.javaFX.iml +++ b/plugins/javaFX/intellij.javaFX.iml @@ -47,5 +47,6 @@ + \ No newline at end of file diff --git a/plugins/maven/BUILD.bazel b/plugins/maven/BUILD.bazel index a99df9e645dc..2d34b5cdd99b 100644 --- a/plugins/maven/BUILD.bazel +++ b/plugins/maven/BUILD.bazel @@ -109,6 +109,7 @@ jvm_library( "@lib//:opentelemetry", "//java/debugger/shared", "//xml/xml-psi-api:psi", + "//xml/xml-analysis-api:analysis", "//platform/xdebugger-impl:debugger-impl", "//libraries/http-client", ":platform_java-guiForms-rt_provided", diff --git a/plugins/maven/intellij.maven.iml b/plugins/maven/intellij.maven.iml index 50a2171569b3..6813ce2dfa7b 100644 --- a/plugins/maven/intellij.maven.iml +++ b/plugins/maven/intellij.maven.iml @@ -129,6 +129,7 @@ + diff --git a/plugins/maven/testFramework/BUILD.bazel b/plugins/maven/testFramework/BUILD.bazel index 7586cc66752d..f6c58612a414 100644 --- a/plugins/maven/testFramework/BUILD.bazel +++ b/plugins/maven/testFramework/BUILD.bazel @@ -36,6 +36,7 @@ jvm_library( "//platform/testFramework/eelJava", "//platform/eel-provider", "//platform/util/progress", + "//xml/xml-analysis-api:analysis", "//xml/xml-analysis-impl:analysis-impl", ] ) diff --git a/plugins/maven/testFramework/intellij.maven.testFramework.iml b/plugins/maven/testFramework/intellij.maven.testFramework.iml index dcf8f288b360..919368baec6b 100644 --- a/plugins/maven/testFramework/intellij.maven.testFramework.iml +++ b/plugins/maven/testFramework/intellij.maven.testFramework.iml @@ -53,6 +53,7 @@ + \ No newline at end of file diff --git a/plugins/repository-search/src/main/kotlin/org/jetbrains/idea/packagesearch/PackageSearchProviderFactory.kt b/plugins/repository-search/src/main/kotlin/org/jetbrains/idea/packagesearch/PackageSearchProviderFactory.kt index 963b05fe8d43..85e679867df9 100644 --- a/plugins/repository-search/src/main/kotlin/org/jetbrains/idea/packagesearch/PackageSearchProviderFactory.kt +++ b/plugins/repository-search/src/main/kotlin/org/jetbrains/idea/packagesearch/PackageSearchProviderFactory.kt @@ -23,7 +23,7 @@ import org.jetbrains.idea.packagesearch.api.PackageSearchApiClientService import org.jetbrains.idea.reposearch.DependencySearchProvider import org.jetbrains.idea.reposearch.DependencySearchProvidersFactory -internal class PackageSearchProviderFactory : DependencySearchProvidersFactory { +private class PackageSearchProviderFactory : DependencySearchProvidersFactory { override fun getProviders(project: Project): Collection { return when { !RegistryManager.getInstance().`is`("maven.packagesearch.enabled") -> emptyList() diff --git a/plugins/testng/BUILD.bazel b/plugins/testng/BUILD.bazel index a4dc77fdfb92..740c7f064c6d 100644 --- a/plugins/testng/BUILD.bazel +++ b/plugins/testng/BUILD.bazel @@ -79,6 +79,7 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/execution-impl", "//platform/platform-impl:ide-impl", + "//xml/xml-analysis-api:analysis", "//java/debugger/impl", "//java/debugger/impl:impl_test_lib", "//platform/indexing-api:indexing", diff --git a/plugins/testng/intellij.testng.iml b/plugins/testng/intellij.testng.iml index 935efa724036..5a34a5323836 100644 --- a/plugins/testng/intellij.testng.iml +++ b/plugins/testng/intellij.testng.iml @@ -19,6 +19,7 @@ + diff --git a/plugins/xpath/BUILD.bazel b/plugins/xpath/BUILD.bazel index f44511b64202..8709d8d649a5 100644 --- a/plugins/xpath/BUILD.bazel +++ b/plugins/xpath/BUILD.bazel @@ -67,6 +67,7 @@ jvm_library( "//platform/core-impl", "//platform/editor-ui-api:editor-ui", "//platform/indexing-api:indexing", + "//xml/xml-analysis-api:analysis", "//jps/model-api:model", "//platform/lang-core", "//platform/projectModel-api:projectModel", diff --git a/plugins/xpath/intellij.xpath.iml b/plugins/xpath/intellij.xpath.iml index 1bb3a1318845..2424cd478737 100644 --- a/plugins/xpath/intellij.xpath.iml +++ b/plugins/xpath/intellij.xpath.iml @@ -18,6 +18,7 @@ + diff --git a/xml/dom-impl/BUILD.bazel b/xml/dom-impl/BUILD.bazel index 1cab3f719615..00b61a09261e 100644 --- a/xml/dom-impl/BUILD.bazel +++ b/xml/dom-impl/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "//platform/structure-view-impl:structureView-impl", "//platform/usageView-impl", "//xml/dom-openapi:dom", + "//xml/xml-analysis-api:analysis", "//xml/impl", "//platform/util", "//platform/platform-api:ide", diff --git a/xml/dom-impl/intellij.xml.dom.impl.iml b/xml/dom-impl/intellij.xml.dom.impl.iml index 9724751987a4..c810cc83c8c1 100644 --- a/xml/dom-impl/intellij.xml.dom.impl.iml +++ b/xml/dom-impl/intellij.xml.dom.impl.iml @@ -17,6 +17,7 @@ + diff --git a/xml/dom-tests/BUILD.bazel b/xml/dom-tests/BUILD.bazel index 6a6f40696b0c..97d3d33f86e2 100644 --- a/xml/dom-tests/BUILD.bazel +++ b/xml/dom-tests/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//xml/xml-psi-api:psi", "//platform/libraries/cglib", + "//xml/xml-analysis-api:analysis", ] ) ### auto-generated section `build intellij.xml.dom.tests` end diff --git a/xml/dom-tests/intellij.xml.dom.tests.iml b/xml/dom-tests/intellij.xml.dom.tests.iml index 1f8f4cc7dd07..7cc8cc419fe3 100644 --- a/xml/dom-tests/intellij.xml.dom.tests.iml +++ b/xml/dom-tests/intellij.xml.dom.tests.iml @@ -24,6 +24,7 @@ + diff --git a/xml/impl/BUILD.bazel b/xml/impl/BUILD.bazel index c3e675a7bc86..68eb1c3fe4cd 100644 --- a/xml/impl/BUILD.bazel +++ b/xml/impl/BUILD.bazel @@ -55,6 +55,7 @@ jvm_library( "//platform/polySymbols/backend", "//libraries/xerces", "//xml/xml-syntax:syntax", + "//xml/xml-analysis-api:analysis", ], exports = [ "//xml/xml-psi-impl:psi-impl", diff --git a/xml/impl/intellij.xml.impl.iml b/xml/impl/intellij.xml.impl.iml index bcefe72dc3bb..47e18b92b954 100644 --- a/xml/impl/intellij.xml.impl.iml +++ b/xml/impl/intellij.xml.impl.iml @@ -50,6 +50,7 @@ + diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspection.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspection.java index 47d3c89a675a..8a6a8edcf8d2 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspection.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspection.java @@ -1,5 +1,4 @@ // 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.htmlInspections; import com.intellij.codeInspection.options.OptPane; diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownBooleanAttributeInspection.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownBooleanAttributeInspection.java index be9f41ebc5b6..ceeffd65d46d 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownBooleanAttributeInspection.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownBooleanAttributeInspection.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; import static com.intellij.codeInspection.options.OptPane.*; -public class HtmlUnknownBooleanAttributeInspection extends HtmlUnknownBooleanAttributeInspectionBase { +public final class HtmlUnknownBooleanAttributeInspection extends HtmlUnknownBooleanAttributeInspectionBase { @Override public @NotNull OptPane getOptionsPane() { return pane( diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspection.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspection.java index 07f61dd478c6..9b2b459c5896 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspection.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspection.java @@ -1,5 +1,4 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. - package com.intellij.codeInspection.htmlInspections; import com.intellij.codeInspection.LocalQuickFix; @@ -24,8 +23,7 @@ import org.jetbrains.annotations.Nullable; import static com.intellij.codeInspection.options.OptPane.*; -public class HtmlUnknownTagInspection extends HtmlUnknownTagInspectionBase { - +public final class HtmlUnknownTagInspection extends HtmlUnknownTagInspectionBase { public HtmlUnknownTagInspection() { super(); } diff --git a/xml/impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspection.java b/xml/impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspection.java index 0e49e3e5137d..195af19b0320 100644 --- a/xml/impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspection.java +++ b/xml/impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspection.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; import static com.intellij.codeInspection.options.OptPane.expandableString; import static com.intellij.codeInspection.options.OptPane.pane; -public class RequiredAttributesInspection extends RequiredAttributesInspectionBase { +public final class RequiredAttributesInspection extends RequiredAttributesInspectionBase { @Override public @NotNull OptPane getOptionsPane() { return pane( diff --git a/xml/relaxng/BUILD.bazel b/xml/relaxng/BUILD.bazel index 52513a30f179..56f9bd5c88db 100644 --- a/xml/relaxng/BUILD.bazel +++ b/xml/relaxng/BUILD.bazel @@ -38,6 +38,7 @@ jvm_library( "//xml/xml-psi-api:psi", "//platform/util/jdom", "//platform/core-impl", + "//xml/xml-analysis-api:analysis", ], runtime_deps = ["//platform/backend"] ) @@ -74,6 +75,7 @@ jvm_library( "//xml/xml-psi-api:psi", "//platform/util/jdom", "//platform/core-impl", + "//xml/xml-analysis-api:analysis", ] ) ### auto-generated section `build intellij.relaxng` end diff --git a/xml/relaxng/intellij.relaxng.iml b/xml/relaxng/intellij.relaxng.iml index 8fe317c0c29e..395adbcb025b 100644 --- a/xml/relaxng/intellij.relaxng.iml +++ b/xml/relaxng/intellij.relaxng.iml @@ -85,5 +85,6 @@ + \ No newline at end of file diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/inspections/BaseInspection.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/inspections/BaseInspection.java index 7b3eb6536ef6..4f0d2deee430 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/inspections/BaseInspection.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/inspections/BaseInspection.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.intellij.plugins.relaxNG.inspections; import com.intellij.codeInspection.ProblemDescriptor; @@ -41,7 +40,6 @@ import org.jetbrains.annotations.Nullable; import java.util.Collections; public abstract class BaseInspection extends XmlSuppressableInspectionTool { - @Override public boolean isSuppressedFor(@NotNull PsiElement element) { if (element.getContainingFile() instanceof RncFile) { diff --git a/xml/tests/BUILD.bazel b/xml/tests/BUILD.bazel index ef2a9043f194..7b998e085b8c 100644 --- a/xml/tests/BUILD.bazel +++ b/xml/tests/BUILD.bazel @@ -65,6 +65,7 @@ jvm_library( "//platform/syntax/syntax-scripts:scripts", "//xml/xml-syntax:syntax", "//java/java-runtime:rt", + "//xml/xml-analysis-api:analysis", ], runtime_deps = ["//xml/langInjection"] ) diff --git a/xml/tests/intellij.xml.tests.iml b/xml/tests/intellij.xml.tests.iml index bb9ac84cf452..fab61ef27c86 100644 --- a/xml/tests/intellij.xml.tests.iml +++ b/xml/tests/intellij.xml.tests.iml @@ -49,6 +49,7 @@ + diff --git a/xml/xml-analysis-impl/BUILD.bazel b/xml/xml-analysis-impl/BUILD.bazel index 9ecf4b6dbce2..113d66dea221 100644 --- a/xml/xml-analysis-impl/BUILD.bazel +++ b/xml/xml-analysis-impl/BUILD.bazel @@ -35,7 +35,6 @@ jvm_library( "//libraries/xerces", "//platform/polySymbols", ], - exports = ["//xml/xml-analysis-api:analysis"], runtime_deps = ["//platform/backend"] ) ### auto-generated section `build intellij.xml.analysis.impl` end \ No newline at end of file diff --git a/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml b/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml index 19bf84a8327e..7afd9548160c 100644 --- a/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml +++ b/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml @@ -16,7 +16,7 @@ - + diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HtmlUnknownAnchorTargetInspection.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HtmlUnknownAnchorTargetInspection.java index f3e2d1e9995e..be522218f521 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HtmlUnknownAnchorTargetInspection.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HtmlUnknownAnchorTargetInspection.java @@ -5,7 +5,7 @@ import com.intellij.psi.PsiReference; import com.intellij.xml.util.AnchorReference; import org.jetbrains.annotations.NotNull; -public class HtmlUnknownAnchorTargetInspection extends XmlPathReferenceInspection { +public final class HtmlUnknownAnchorTargetInspection extends XmlPathReferenceInspection { @Override public @NotNull String getShortName() { return "HtmlUnknownAnchorTarget"; diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HtmlUnknownTargetInspection.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HtmlUnknownTargetInspection.java index 55a32c622122..8d659c22acc0 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HtmlUnknownTargetInspection.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HtmlUnknownTargetInspection.java @@ -8,7 +8,7 @@ import com.intellij.xml.util.AnchorReference; import com.intellij.xml.util.HtmlUtil; import org.jetbrains.annotations.NotNull; -public class HtmlUnknownTargetInspection extends XmlPathReferenceInspection { +public final class HtmlUnknownTargetInspection extends XmlPathReferenceInspection { @Override public @NotNull String getShortName() { return "HtmlUnknownTarget"; diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlDeprecatedElementInspection.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlDeprecatedElementInspection.java index cffca9faf7d1..e71fa62a2639 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlDeprecatedElementInspection.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlDeprecatedElementInspection.java @@ -28,8 +28,7 @@ import java.util.regex.Pattern; import static com.intellij.codeInspection.options.OptPane.pane; import static com.intellij.codeInspection.options.OptPane.string; -public class XmlDeprecatedElementInspection extends XmlSuppressableInspectionTool { - +public final class XmlDeprecatedElementInspection extends XmlSuppressableInspectionTool { @Language("RegExp") public String regexp = "(?i)deprecated.*"; diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlPathReferenceInspection.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlPathReferenceInspection.java index 28760521e1dd..92e5c41e8276 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlPathReferenceInspection.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlPathReferenceInspection.java @@ -7,7 +7,6 @@ import com.intellij.psi.PsiReference; * @author Dmitry Avdeev */ public class XmlPathReferenceInspection extends XmlReferenceInspectionBase { - @Override protected boolean needToCheckRef(PsiReference reference) { return XmlHighlightVisitor.isUrlReference(reference); diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnboundNsPrefixInspection.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnboundNsPrefixInspection.java index e22a20285e5c..d31215f94e8e 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnboundNsPrefixInspection.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnboundNsPrefixInspection.java @@ -22,8 +22,7 @@ import org.jetbrains.annotations.NotNull; /** * @author Dmitry Avdeev */ -public class XmlUnboundNsPrefixInspection extends XmlSuppressableInspectionTool { - +public final class XmlUnboundNsPrefixInspection extends XmlSuppressableInspectionTool { private static final @NonNls String XML = "xml"; @Override diff --git a/xml/xml-analysis-impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java b/xml/xml-analysis-impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java index 3ed394b181e8..8a414126028e 100644 --- a/xml/xml-analysis-impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java +++ b/xml/xml-analysis-impl/src/com/intellij/xml/util/CheckDtdReferencesInspection.java @@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull; /** * @author Maxim Mossienko */ -public class CheckDtdReferencesInspection extends XmlSuppressableInspectionTool { +public final class CheckDtdReferencesInspection extends XmlSuppressableInspectionTool { @Override public boolean isEnabledByDefault() { return true;