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

do not export deps blindly (part 3)

Browse Source 
GitOrigin-RevId: 63cc056df570011dd65422f212f7ff7c33111e06
This commit is contained in:
Vladimir Krivosheev
2024-12-21 22:49:44 +00:00
committed by intellij-monorepo-bot
parent 25f9bbb040
commit edcd74ca8e
24 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-terminal/intellij.java.terminal.tests.iml
+1
View File
@@ -11,6 +11,7 @@
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.terminal" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.execution.impl" scope="TEST" />
<orderEntry type="module" module-name="intellij.terminal" scope="TEST" />
</component>
</module>
java/java-tests/intellij.java.tests.iml
+1
View File
@@ -18,6 +18,7 @@
<orderEntry type="module" module-name="intellij.platform.editor.ex" />
<orderEntry type="module" module-name="intellij.idea.community.customization" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.execution.impl" />
<orderEntry type="module" module-name="intellij.java.debugger.impl" />
<orderEntry type="module" module-name="intellij.platform.ide" />
<orderEntry type="module" module-name="intellij.java.i18n" exported="" />
<orderEntry type="module" module-name="intellij.java.compiler.impl" />
java/testFramework/intellij.java.testFramework.iml
+2 -2
View File
@@ -16,13 +16,13 @@
<orderEntry type="module" module-name="intellij.java.compiler.impl" />
<orderEntry type="module" module-name="intellij.java.impl" exported="" />
<orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
<orderEntry type="module" module-name="intellij.java.execution.impl" exported="" />
<orderEntry type="module" module-name="intellij.java.execution.impl" />
<orderEntry type="module" module-name="intellij.java.plugin" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.platform.editor.ex" />
<orderEntry type="module" module-name="intellij.platform.testFramework" exported="" />
<orderEntry type="module" module-name="intellij.relaxng" exported="" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.ui" exported="" />
<orderEntry type="module" module-name="intellij.java.debugger.impl" exported="" />
<orderEntry type="module" module-name="intellij.java.debugger.impl" />
<orderEntry type="module" module-name="intellij.java.execution" exported="" />
<orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.platform.jps.build" />
jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml
+2 -1
View File
@@ -11,6 +11,7 @@
<orderEntry type="module" module-name="intellij.jvm.analysis.testFramework" exported="" />
<orderEntry type="module" module-name="intellij.java.impl.refactorings" exported="" />
<orderEntry type="module" module-name="intellij.platform.smRunner" />
<orderEntry type="module" module-name="intellij.java.testFramework" exported="" />
<orderEntry type="module" module-name="intellij.java.execution.impl" />
<orderEntry type="module" module-name="intellij.java.testFramework" />
</component>
</module>
platform/remote-servers/target-integration-tests/intellij.platform.remoteServers.targetsIntegrationTests.iml
+2
View File
@@ -13,6 +13,8 @@
<orderEntry type="library" name="kotlin-stdlib" level="project" />
<orderEntry type="library" scope="TEST" name="testcontainers" level="project" />
<orderEntry type="module" module-name="intellij.java.execution.impl" />
<orderEntry type="module" module-name="intellij.java.debugger" />
<orderEntry type="module" module-name="intellij.java.debugger.impl" />
<orderEntry type="module" module-name="intellij.java.testFramework" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.platform.smRunner" scope="TEST" />
plugins/devkit/devkit-core/src/testAssistant/NavigateToTestDataAction.java
+6 -12
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2021 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-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.testAssistant;
import com.intellij.codeInsight.AnnotationUtil;
@@ -26,9 +26,7 @@ import org.jetbrains.uast.*;
import java.util.Collections;
import java.util.List;
public class NavigateToTestDataAction extends AnAction implements TestTreeViewAction {
public final class NavigateToTestDataAction extends AnAction implements TestTreeViewAction {
@Override
public @NotNull ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.BGT;
@@ -58,8 +56,7 @@ public class NavigateToTestDataAction extends AnAction implements TestTreeViewAc
}
}
@NotNull
static List<TestDataFile> findTestDataFiles(@NotNull DataContext dataContext, @NotNull Project project, boolean shouldGuess) {
static @NotNull List<TestDataFile> findTestDataFiles(@NotNull DataContext dataContext, @NotNull Project project, boolean shouldGuess) {
return ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> {
List<TestDataFile> fileNames = tryFindTestDataFiles(dataContext);
if (fileNames.isEmpty() && shouldGuess) {
@@ -73,8 +70,7 @@ public class NavigateToTestDataAction extends AnAction implements TestTreeViewAc
}, DevKitBundle.message("testdata.searching"), true, project);
}
@NotNull
private static List<TestDataFile> tryFindTestDataFiles(@NotNull DataContext context) {
private static @NotNull List<TestDataFile> tryFindTestDataFiles(@NotNull DataContext context) {
final PsiMethod method = ReadAction.compute(() -> findTargetMethod(context));
if (method == null) {
PsiClass parametrizedTestClass = ReadAction.compute(() -> findParametrizedClass(context));
@@ -116,8 +112,7 @@ public class NavigateToTestDataAction extends AnAction implements TestTreeViewAc
e.getPresentation().setEnabledAndVisible(findTargetMethod(e.getDataContext()) != null || findParametrizedClass(e.getDataContext()) != null);
}
@Nullable
static PsiClass findParametrizedClass(@NotNull DataContext context) {
static @Nullable PsiClass findParametrizedClass(@NotNull DataContext context) {
PsiElement element = context.getData(CommonDataKeys.PSI_ELEMENT);
UClass uClass = UastContextKt.getUastParentOfType(element, UClass.class);
if (uClass == null) return null;
@@ -129,8 +124,7 @@ public class NavigateToTestDataAction extends AnAction implements TestTreeViewAc
return type != null && type.equalsToText(TestFrameworkConstants.PARAMETERIZED_ANNOTATION_QUALIFIED_NAME) ? uClass.getJavaPsi() : null;
}
@Nullable
private static PsiMethod findTargetMethod(@NotNull DataContext context) {
private static @Nullable PsiMethod findTargetMethod(@NotNull DataContext context) {
final Location<?> location = Location.DATA_KEY.getData(context);
if (location != null) {
UMethod method = UastContextKt.getUastParentOfType(location.getPsiElement(), UMethod.class, false);
plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
+1
View File
@@ -16,6 +16,7 @@
<orderEntry type="module" module-name="intellij.devkit" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.devkit.testFramework" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.properties" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.properties.psi.impl" />
plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml
+1
View File
@@ -12,6 +12,7 @@
<orderEntry type="module" module-name="intellij.devkit" />
<orderEntry type="module" module-name="intellij.devkit.core" />
<orderEntry type="module" module-name="intellij.devkit.testFramework" />
<orderEntry type="module" module-name="intellij.java.testFramework" />
<orderEntry type="module" module-name="intellij.kotlin.plugin.community.main" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.kotlin.devkit" />
<orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
plugins/devkit/devkit-kotlin-fir-tests/testSrc/org/jetbrains/idea/devkit/k2/codeInsight/KotlinFirPluginXmlFunctionalTest.kt
+2 -3
View File
@@ -1,3 +1,4 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.k2.codeInsight
import com.intellij.codeInspection.LocalInspectionEP
@@ -7,8 +8,6 @@ import com.intellij.openapi.application.PluginPathManager
import com.intellij.openapi.extensions.BaseExtensionPointName
import com.intellij.openapi.options.Configurable
import com.intellij.openapi.options.advanced.AdvancedSettings
import com.intellij.openapi.project.IntelliJProjectUtil
import com.intellij.openapi.util.Iconable
import com.intellij.openapi.util.registry.RegistryManager
import com.intellij.testFramework.IdeaTestUtil
import com.intellij.testFramework.builders.JavaModuleFixtureBuilder
@@ -53,7 +52,7 @@ class KotlinFirPluginXmlFunctionalTest : JavaCodeInsightFixtureTestCase(), Expec
//moduleBuilder.addLibrary("platform-util", PathUtil.getJarPathForClass(Iconable::class.java))
moduleBuilder.addLibrary("platform-analysis", PathUtil.getJarPathForClass(LocalInspectionEP::class.java))
moduleBuilder.addLibrary("platform-resources", Paths.get(PathUtil.getJarPathForClass(LocalInspectionEP::class.java))
.resolveSibling("intellij.platform.resources").toString());
.resolveSibling("intellij.platform.resources").toString())
moduleBuilder.addLibrary("platform-ide-core", PathUtil.getJarPathForClass(Configurable::class.java))
moduleBuilder.addLibrary("platform-ide-core-impl", PathUtil.getJarPathForClass(NotificationGroupEP::class.java))
moduleBuilder.addLibrary("platform-editor", PathUtil.getJarPathForClass(AdvancedSettings::class.java))
plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml
+2
View File
@@ -14,6 +14,8 @@
<orderEntry type="module" module-name="intellij.devkit.java.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.i18n" scope="TEST" />
<orderEntry type="module" module-name="intellij.devkit.themes" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.testRunner" scope="TEST" />
<orderEntry type="module" module-name="intellij.kotlin.devkit" scope="TEST" />
<orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
<orderEntry type="module" module-name="intellij.devkit.core" scope="TEST" />
plugins/devkit/devkit-tests/intellij.devkit.testFramework.iml
+1 -1
View File
@@ -8,7 +8,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.devkit.core" />
<orderEntry type="module" module-name="intellij.java.testFramework" exported="" />
<orderEntry type="module" module-name="intellij.java.testFramework" />
<orderEntry type="library" exported="" scope="TEST" name="assertJ" level="project" />
<orderEntry type="module" module-name="intellij.platform.util" exported="" />
<orderEntry type="module" module-name="intellij.platform.testFramework" exported="" />
plugins/gradle/java/intellij.gradle.java.tests.iml
+2
View File
@@ -19,6 +19,8 @@
<orderEntry type="module" module-name="intellij.gradle.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.gradle.toolingExtension.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.compiler.impl" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.debugger" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.debugger.impl" scope="TEST" />
<orderEntry type="module" module-name="intellij.maven.server" scope="TEST" />
<orderEntry type="library" scope="TEST" name="mockito" level="project" />
<orderEntry type="module" module-name="intellij.java.execution.impl" scope="TEST" />
plugins/junit/java-tests/intellij.junit.java.tests.iml
+1
View File
@@ -12,5 +12,6 @@
<orderEntry type="module" module-name="intellij.properties.psi.impl" scope="TEST" />
<orderEntry type="module" module-name="intellij.junit.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.ide.util.io" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.execution.impl" scope="TEST" />
</component>
</module>
plugins/kotlin/base/code-insight/kotlin.base.code-insight.iml
+1
View File
@@ -52,6 +52,7 @@
<orderEntry type="module" module-name="intellij.java" />
<orderEntry type="module" module-name="intellij.java.impl" />
<orderEntry type="module" module-name="intellij.java.analysis" />
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.backend.workspace" />
<orderEntry type="module" module-name="kotlin.formatter" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
plugins/kotlin/base/test/kotlin.base.test.iml
+1 -1
View File
@@ -16,7 +16,7 @@
<orderEntry type="library" scope="TEST" name="Guava" level="project" />
<orderEntry type="module" module-name="kotlin.base.frontend-agnostic" scope="TEST" />
<orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.testFramework" exported="" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.junit.rt" exported="" scope="TEST" />
<orderEntry type="library" scope="TEST" name="slf4j-api" level="project" />
</component>
plugins/kotlin/code-insight/live-templates-k1/kotlin.code-insight.live-templates.k1.iml
+2
View File
@@ -22,6 +22,8 @@
<orderEntry type="module" module-name="kotlin.code-insight.live-templates.shared" />
<orderEntry type="module" module-name="kotlin.completion.impl.k1" />
<orderEntry type="module" module-name="kotlin.base.test" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.core.impl" />
<orderEntry type="module" module-name="intellij.platform.analysis.impl" />
<orderEntry type="module" module-name="intellij.platform.lang" />
plugins/kotlin/completion/tests-k1/kotlin.completion.tests.k1.iml
+1
View File
@@ -15,6 +15,7 @@
<orderEntry type="library" name="Guava" level="project" />
<orderEntry type="library" name="gson" level="project" />
<orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
<orderEntry type="module" module-name="kotlin.base.test" scope="TEST" />
<orderEntry type="module" module-name="kotlin.base.util" />
<orderEntry type="module" module-name="kotlin.base.analysis" />
<orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
plugins/kotlin/fir/tests/kotlin.fir.tests.iml
+2
View File
@@ -35,6 +35,8 @@
<orderEntry type="module" module-name="kotlin.base.facet" />
<orderEntry type="module" module-name="kotlin.base.plugin" />
<orderEntry type="module" module-name="kotlin.base.project-structure" />
<orderEntry type="module" module-name="intellij.java.debugger" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.debugger.impl" scope="TEST" />
<orderEntry type="module" module-name="kotlin.base.scripting" />
<orderEntry type="module" module-name="kotlin.base.util" />
<orderEntry type="module" module-name="kotlin.code-insight.impl-base" />
plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml
+1
View File
@@ -10,6 +10,7 @@
<orderEntry type="library" name="kotlin-stdlib" level="project" />
<orderEntry type="module" module-name="intellij.gradle.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.execution.impl" scope="TEST" />
<orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
<orderEntry type="library" name="kotlinc.analysis-api" level="project" />
<orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
plugins/kotlin/jvm-debugger/test/compose/kotlin.jvm-debugger.test.compose.k2.iml
+2
View File
@@ -14,8 +14,10 @@
<orderEntry type="module" module-name="kotlin.jvm-debugger.test" scope="TEST" />
<orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
<orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-common" level="project" />
<orderEntry type="module" module-name="intellij.android.compose-ide-plugin" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.debugger.impl" scope="TEST" />
<orderEntry type="library" scope="TEST" name="kotlinc.compose-compiler-plugin" level="project" />
<orderEntry type="module" module-name="intellij.android.streaming" scope="TEST" />
<orderEntry type="module" module-name="kotlin.tests-compose" scope="TEST" />
plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml
+1
View File
@@ -12,6 +12,7 @@
<orderEntry type="library" scope="TEST" name="kotlin-reflect" level="project" />
<orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
<orderEntry type="library" scope="TEST" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.java.execution.impl" scope="TEST" />
<orderEntry type="library" scope="TEST" name="Guava" level="project" />
<orderEntry type="library" scope="TEST" name="jb-jdi" level="project" />
<orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-common" level="project" />
plugins/kotlin/jvm-debugger/test/parcelize/kotlin.jvm-debugger.test.parcelize.k2.iml
+1
View File
@@ -14,6 +14,7 @@
<orderEntry type="module" module-name="kotlin.jvm-debugger.test" scope="TEST" />
<orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
<orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-common" level="project" />
<orderEntry type="module" module-name="intellij.android.streaming" scope="TEST" />
</component>
plugins/tasks/tasks-tests/intellij.tasks.tests.iml
+1
View File
@@ -10,6 +10,7 @@
<orderEntry type="module" module-name="intellij.tasks" />
<orderEntry type="module" module-name="intellij.tasks.core" />
<orderEntry type="module" module-name="intellij.tasks.java" />
<orderEntry type="module" module-name="intellij.java.debugger.impl" scope="TEST" />
<orderEntry type="module" module-name="intellij.tasks.compatibility" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
<orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
xml/tests/src/com/intellij/codeInsight/template/emmet/EmmetAbbreviationTestCase.java
+1 -4
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// 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.codeInsight.template.emmet;
import com.intellij.codeInsight.template.CustomTemplateCallback;
@@ -7,14 +7,11 @@ import com.intellij.codeInsight.template.impl.TemplateImpl;
import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
import com.intellij.codeInsight.template.impl.TemplateSettings;
import com.intellij.codeInsight.template.impl.TemplateState;
import com.intellij.execution.testframework.TestsUIUtil;
import com.intellij.openapi.actionSystem.IdeActions;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.impl.NonBlockingReadActionImpl;
import com.intellij.testFramework.EditorTestUtil;
import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
import com.intellij.testFramework.TestFrameworkUtil;
import com.intellij.util.TestRuntimeUtil;
import com.intellij.util.ui.UIUtil;
import static com.intellij.codeInsight.template.emmet.ZenCodingTemplate.doWrap;