MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-218803 IJ-MR-179029 IJ-MR-175479 cleanup

Browse Source 
GitOrigin-RevId: 5735629b9d7f0c545ac0553cc95bc71c2bd8735d
This commit is contained in:
Vladimir Krivosheev
2025-11-18 20:07:12 +00:00
committed by intellij-monorepo-bot
parent 38833dc85f
commit a2191e553c
15 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereMlContributorReplacement.kt
+1 -1
View File
@@ -13,7 +13,7 @@ interface SearchEverywhereMlContributorReplacement {
val EP_NAME: ExtensionPointName<SearchEverywhereMlContributorReplacement> = ExtensionPointName.create(
"com.intellij.searchEverywhereMlContributorReplacement")
var initEvent = WeakReference<AnActionEvent>(null)
var initEvent: WeakReference<AnActionEvent> = WeakReference<AnActionEvent>(null)
private set
@JvmStatic
plugins/kotlin/maven/BUILD.bazel
+1
View File
@@ -37,6 +37,7 @@ jvm_library(
"//plugins/kotlin/base/analysis",
"//plugins/kotlin/base/code-insight",
"//plugins/kotlin/base/statistics",
"//xml/xml-analysis-api:analysis",
"//plugins/kotlin/code-insight/descriptions",
"//plugins/kotlin/project-configuration",
"//plugins/kotlin/formatter",
plugins/kotlin/maven/intellij.kotlin.maven.iml
+1
View File
@@ -31,6 +31,7 @@
<orderEntry type="module" module-name="intellij.kotlin.base.analysis" />
<orderEntry type="module" module-name="intellij.kotlin.base.codeInsight" />
<orderEntry type="module" module-name="intellij.kotlin.base.statistics" />
<orderEntry type="module" module-name="intellij.xml.analysis" />
<orderEntry type="module" module-name="intellij.kotlin.codeInsight.descriptions" />
<orderEntry type="module" module-name="intellij.kotlin.projectConfiguration" />
<orderEntry type="module" module-name="intellij.kotlin.formatter" />
plugins/maven/BUILD.bazel
-1
View File
@@ -117,7 +117,6 @@ jvm_library(
exports = [
"//java/openapi:java",
"//plugins/maven-server-api:maven-server",
"//xml/impl",
"//xml/dom-openapi:dom",
"//xml/dom-impl",
"//java/compiler/openapi:java-compiler",
plugins/maven/intellij.maven.iml
+1 -1
View File
@@ -28,7 +28,7 @@
<orderEntry type="module" module-name="intellij.platform.projectModel" />
<orderEntry type="module" module-name="intellij.platform.ide.concurrency" />
<orderEntry type="module" module-name="intellij.platform.refactoring" />
<orderEntry type="module" module-name="intellij.xml.impl" exported="" />
<orderEntry type="module" module-name="intellij.xml.impl" />
<orderEntry type="module" module-name="intellij.platform.util.progress" />
<orderEntry type="module" module-name="intellij.platform.usageView" />
<orderEntry type="module" module-name="intellij.xml.dom" exported="" />
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenNoRootDefinedInspection.kt
+1 -1
View File
@@ -45,7 +45,7 @@ class MavenNoRootDefinedInspection : BasicDomElementsInspection<MavenDomProjectM
val rootElement = model.rootElement ?: return null
val psiToShowError = model.rootTag?.children?.takeWhile { it !is XmlTag && it !is XmlText } ?: return null
if (rootMavenProject.file.parent.toNioPath().resolve(".mvn").isDirectory()) return null;
if (rootMavenProject.file.parent.toNioPath().resolve(".mvn").isDirectory()) return null
if (rootElement.modelVersion.stringValue == MODEL_VERSION_4_0_0) return null
if (model.rootTag?.getAttributeValue("root")?.toBoolean() == true) {
return null
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenRedundantVersionInspection.kt
+2 -3
View File
@@ -5,11 +5,10 @@ import com.intellij.openapi.project.Project
import com.intellij.psi.xml.XmlFile
import com.intellij.psi.xml.XmlTag
import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel
import org.jetbrains.idea.maven.server.MavenDistribution
class MavenRedundantVersionInspection : AbstractMavenRedundantParentInspection() {
override val elementName: String = "version"
override val elementName: String
get() = "version"
override fun getShortName(): String = "MavenRedundantVersion"
plugins/maven/src/test/BUILD.bazel
+3
View File
@@ -27,6 +27,7 @@ jvm_library(
"//platform/core-api:core",
"//platform/core-ui",
"//platform/editor-ui-api:editor-ui",
"//xml/xml-analysis-api:analysis",
"//platform/execution-impl",
"//platform/external-system-impl:externalSystem-impl",
"//jps/model-api:model",
@@ -79,6 +80,8 @@ jvm_library(
"//libraries/hamcrest",
"//platform/testFramework/eelJava",
"//platform/eel-provider",
"//xml/xml-psi-impl:psi-impl",
"//xml/xml-ui-common:ui-common",
]
)
### auto-generated section `build intellij.maven.tests` end
plugins/maven/src/test/intellij.maven.tests.iml
+3
View File
@@ -15,6 +15,7 @@
<orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
<orderEntry type="module" module-name="intellij.xml.analysis" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
@@ -61,5 +62,7 @@
<orderEntry type="module" module-name="intellij.libraries.hamcrest" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.testFramework.eelJava" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.eel.provider" scope="TEST" />
<orderEntry type="module" module-name="intellij.xml.psi.impl" scope="TEST" />
<orderEntry type="module" module-name="intellij.xml.ui.common" scope="TEST" />
</component>
</module>
plugins/maven/testFramework/BUILD.bazel
+1
View File
@@ -36,6 +36,7 @@ jvm_library(
"//platform/testFramework/eelJava",
"//platform/eel-provider",
"//platform/util/progress",
"//xml/xml-analysis-impl:analysis-impl",
]
)
### auto-generated section `build intellij.maven.testFramework` end
plugins/maven/testFramework/intellij.maven.testFramework.iml
+1
View File
@@ -53,5 +53,6 @@
<orderEntry type="module" module-name="intellij.platform.testFramework.eelJava" />
<orderEntry type="module" module-name="intellij.platform.eel.provider" />
<orderEntry type="module" module-name="intellij.platform.util.progress" />
<orderEntry type="module" module-name="intellij.xml.analysis.impl" />
</component>
</module>
xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java
+1 -4
View File
@@ -24,10 +24,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
import java.util.Comparator;
/**
* @author Maxim.Mossienko
*/
public class XmlParameterInfoHandler implements ParameterInfoHandler<XmlTag,XmlElementDescriptor> {
public final class XmlParameterInfoHandler implements ParameterInfoHandler<XmlTag,XmlElementDescriptor> {
private static final Comparator<XmlAttributeDescriptor> COMPARATOR = Comparator.comparing(PsiMetaData::getName);
public static XmlAttributeDescriptor[] getSortedDescriptors(final XmlElementDescriptor p) {
xml/impl/src/com/intellij/lang/xml/XmlWordCompletionFilter.java
+2 -3
View File
@@ -11,9 +11,8 @@ import com.intellij.psi.tree.TokenSet;
import com.intellij.psi.xml.XmlElementType;
import com.intellij.psi.xml.XmlTokenType;
public class XmlWordCompletionFilter extends DefaultWordCompletionFilter {
private static final TokenSet ENABLED_TOKENS = TokenSet.create(XmlElementType.XML_CDATA,
XmlTokenType.XML_DATA_CHARACTERS);
final class XmlWordCompletionFilter extends DefaultWordCompletionFilter {
private static final TokenSet ENABLED_TOKENS = TokenSet.create(XmlElementType.XML_CDATA, XmlTokenType.XML_DATA_CHARACTERS);
@Override
public boolean isWordCompletionEnabledIn(final IElementType element) {
return super.isWordCompletionEnabledIn(element) || ENABLED_TOKENS.contains(element);
xml/xml-analysis-api/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java
+1 -2
View File
@@ -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;
import com.intellij.openapi.project.Project;
@@ -135,7 +134,7 @@ public abstract class XmlSuppressableInspectionTool extends LocalInspectionTool
}
}
public static class SuppressAllForFile extends SuppressForFile {
public static final class SuppressAllForFile extends SuppressForFile {
public SuppressAllForFile(XmlSuppressionProvider provider) {
super(ALL, provider);
}
xml/xml-ui-common/src/com/intellij/psi/formatter/MarkupLineWrapPositionStrategy.java
+1 -2
View File
@@ -28,8 +28,7 @@ import org.jetbrains.annotations.Nullable;
/**
* {@link LineWrapPositionStrategy} for markup languages like XML, HTML etc.
*/
public class MarkupLineWrapPositionStrategy extends PsiAwareDefaultLineWrapPositionStrategy {
public final class MarkupLineWrapPositionStrategy extends PsiAwareDefaultLineWrapPositionStrategy {
private static final IElementType[] TEXT_TOKENS = IElementType.enumerate(
t -> t == XmlElementType.XML_TEXT ||
t == XmlTokenType.XML_COMMENT_CHARACTERS ||