do not export deps blindly (part 2)

GitOrigin-RevId: 902eb50acfc65c054b5d207bf15950e1da80409e
thhart · Dec 21, 2024 · f283f90 · f283f90
1 parent aaa5c93
commit f283f90
Show file tree

Hide file tree

Showing 32 changed files with 66 additions and 87 deletions.
diff --git a/java/compiler/intellij.java.compiler.tests.iml b/java/compiler/intellij.java.compiler.tests.iml
@@ -17,6 +17,7 @@
     <orderEntry type="module" module-name="intellij.spellchecker" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />

diff --git a/jps/model-impl/intellij.platform.jps.model.tests.iml b/jps/model-impl/intellij.platform.jps.model.tests.iml
@@ -8,7 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
-    <orderEntry type="module" module-name="intellij.platform.testFramework" exported="" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
   </component>

diff --git a/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml b/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml
@@ -11,6 +11,8 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" scope="RUNTIME" />

diff --git a/json/tests/intellij.json.tests.iml b/json/tests/intellij.json.tests.iml
@@ -17,6 +17,7 @@
     <orderEntry type="module" module-name="intellij.platform.langInjection" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jsonpath" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
+    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.regexp" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />

diff --git a/platform/lang-impl/intellij.platform.lang.tests.iml b/platform/lang-impl/intellij.platform.lang.tests.iml
@@ -18,6 +18,7 @@
     <orderEntry type="library" name="cli-parser" level="project" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" exported="" />
+    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" exported="" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" exported="" />
     <orderEntry type="library" name="Guava" level="project" />

diff --git a/platform/testFramework/extensions/intellij.platform.testExtensions.iml b/platform/testFramework/extensions/intellij.platform.testExtensions.iml
@@ -15,8 +15,8 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
-    <orderEntry type="library" exported="" name="memoryfilesystem" level="project" />
-    <orderEntry type="library" exported="" name="assertJ" level="project" />
+    <orderEntry type="library" name="memoryfilesystem" level="project" />
+    <orderEntry type="library" name="assertJ" level="project" />
     <orderEntry type="library" name="snakeyaml" level="project" />
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />

diff --git a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
@@ -58,6 +58,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.rpc" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
+    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.ui" />
     <orderEntry type="library" name="jackson" level="project" />
     <orderEntry type="library" name="jackson-databind" level="project" />

diff --git a/plugins/configuration-script/intellij.configurationScript.iml b/plugins/configuration-script/intellij.configurationScript.iml
@@ -15,6 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
+    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.json" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />

diff --git a/plugins/copyright/intellij.copyright.iml b/plugins/copyright/intellij.copyright.iml
@@ -21,6 +21,7 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.configurationStore.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem" />
+    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />

diff --git a/plugins/gradle/java/intellij.gradle.java.iml b/plugins/gradle/java/intellij.gradle.java.iml
@@ -20,6 +20,7 @@
     <orderEntry type="module" module-name="intellij.java.compiler" />
     <orderEntry type="module" module-name="intellij.groovy" />
     <orderEntry type="module" module-name="intellij.toml" />
+    <orderEntry type="module" module-name="intellij.toml.core" />
     <orderEntry type="module" module-name="intellij.java.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.java" />

diff --git a/plugins/gradle/java/intellij.gradle.java.tests.iml b/plugins/gradle/java/intellij.gradle.java.tests.iml
@@ -31,6 +31,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.properties.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.toml" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.toml.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.gradle.analysis" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />

diff --git a/plugins/gradle/java/src/service/toml/GradleVersionCatalogTomlAwareGotoDeclarationHandler.kt b/plugins/gradle/java/src/service/toml/GradleVersionCatalogTomlAwareGotoDeclarationHandler.kt
@@ -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 org.jetbrains.plugins.gradle.service.toml
 
 import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler
@@ -15,8 +15,7 @@ import org.jetbrains.plugins.gradle.util.isInVersionCatalogAccessor
 import org.jetbrains.plugins.groovy.lang.psi.GrReferenceElement
 import org.jetbrains.plugins.groovy.lang.resolve.api.GroovyPropertyBase
 
-class GradleVersionCatalogTomlAwareGotoDeclarationHandler : GotoDeclarationHandler {
-
+internal class GradleVersionCatalogTomlAwareGotoDeclarationHandler : GotoDeclarationHandler {
   override fun getGotoDeclarationTargets(sourceElement: PsiElement?, offset: Int, editor: Editor?): Array<PsiElement>? {
     if (!Registry.`is`(CommonGradleProjectResolverExtension.GRADLE_VERSION_CATALOGS_DYNAMIC_SUPPORT, false)) {
       return null

diff --git a/plugins/gradle/java/src/toml/navigation/VersionCatalogRenameInputValidator.kt b/plugins/gradle/java/src/toml/navigation/VersionCatalogRenameInputValidator.kt
@@ -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 org.jetbrains.plugins.gradle.toml.navigation
 
 import com.intellij.patterns.ElementPattern
@@ -10,8 +10,7 @@ import com.intellij.util.ProcessingContext
 import org.jetbrains.plugins.gradle.service.resolve.getVersionCatalogFiles
 import org.toml.lang.psi.TomlKeySegment
 
-class VersionCatalogRenameInputValidator : RenameInputValidator {
-
+private class VersionCatalogRenameInputValidator : RenameInputValidator {
   override fun getPattern(): ElementPattern<out PsiElement> {
     return psiElement(TomlKeySegment::class.java)
       .with(object : PatternCondition<TomlKeySegment>("version ref descriptor") {

diff --git a/plugins/jsonpath/intellij.jsonpath.iml b/plugins/jsonpath/intellij.jsonpath.iml
@@ -17,6 +17,7 @@
     <orderEntry type="module" module-name="intellij.json" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.spellchecker" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />

diff --git a/plugins/kotlin/gradle/code-insight-toml/kotlin.gradle.code-insight-toml.iml b/plugins/kotlin/gradle/code-insight-toml/kotlin.gradle.code-insight-toml.iml
@@ -18,5 +18,6 @@
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.gradle.java" />
     <orderEntry type="module" module-name="intellij.toml" />
+    <orderEntry type="module" module-name="intellij.toml.core" />
   </component>
 </module>
diff --git a/...otlin/idea/gradle/versionCatalog/toml/KotlinGradleTomlVersionCatalogReferencesSearcher.kt b/...otlin/idea/gradle/versionCatalog/toml/KotlinGradleTomlVersionCatalogReferencesSearcher.kt
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.toml.lang.psi.TomlKeySegment
 import org.toml.lang.psi.TomlKeyValue
 
-class KotlinGradleTomlVersionCatalogReferencesSearcher :
+internal class KotlinGradleTomlVersionCatalogReferencesSearcher :
     QueryExecutorBase<PsiReference, ReferencesSearch.SearchParameters>(false) {
 
     override fun processQuery(queryParameters: ReferencesSearch.SearchParameters, consumer: Processor<in PsiReference>) {

diff --git a/plugins/markdown/test/intellij.markdown.tests.iml b/plugins/markdown/test/intellij.markdown.tests.iml
@@ -33,6 +33,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="library" name="jetbrains.markdown" level="project" />
     <orderEntry type="module" module-name="intellij.toml" />
+    <orderEntry type="module" module-name="intellij.toml.core" />
     <orderEntry type="module" module-name="intellij.yaml" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
   </component>

diff --git a/plugins/maven/jps-plugin/intellij.maven.jps.iml b/plugins/maven/jps-plugin/intellij.maven.jps.iml
@@ -28,7 +28,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
     <orderEntry type="module" module-name="intellij.platform.util" />
-    <orderEntry type="module" module-name="intellij.platform.testFramework" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.build" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="library" name="plexus-utils" level="project" />

diff --git a/plugins/tasks/tasks-core/intellij.tasks.core.iml b/plugins/tasks/tasks-core/intellij.tasks.core.iml
@@ -9,9 +9,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.tasks" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.ide" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.ide.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.tasks" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
@@ -28,15 +28,15 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="XmlRPC" level="project" />
-    <orderEntry type="library" exported="" name="gson" level="project" />
-    <orderEntry type="module" module-name="intellij.xml.impl" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.core" exported="" />
+    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="module" module-name="intellij.xml.impl" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.regexp" />
     <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
     <orderEntry type="library" name="http-client" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.tasks.impl" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.tasks" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.tasks.impl" />
+    <orderEntry type="module" module-name="intellij.platform.tasks" />
     <orderEntry type="module" module-name="intellij.tasks.compatibility" />
     <orderEntry type="module-library">
       <library name="commons-discovery" type="repository">

diff --git a/plugins/tasks/tasks-core/jira/intellij.tasks.jira.iml b/plugins/tasks/tasks-core/jira/intellij.tasks.jira.iml
@@ -12,7 +12,10 @@
     <orderEntry type="module" module-name="intellij.tasks.compatibility" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.tasks.impl" />
+    <orderEntry type="module" module-name="intellij.tasks" />
     <orderEntry type="library" name="XmlRPC" level="project" />
+    <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
   </component>

diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepository.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepository.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2020 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 com.intellij.tasks.jira;
 
 import com.google.gson.Gson;
@@ -42,7 +42,7 @@
  */
 @SuppressWarnings("UseOfObsoleteCollectionType")
 @Tag("JIRA")
-public class JiraRepository extends BaseRepositoryImpl {
+public final class JiraRepository extends BaseRepositoryImpl {
 
   public static final Gson GSON = TaskGsonUtil.createDefaultBuilder().create();
   private final static Logger LOG = Logger.getInstance(JiraRepository.class);

diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepositoryEditor.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepositoryEditor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2013 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-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.tasks.jira;
 
 import com.intellij.openapi.project.Project;
@@ -35,7 +21,7 @@
 /**
  * @author Mikhail Golubev
  */
-public class JiraRepositoryEditor extends BaseRepositoryEditor<JiraRepository> {
+public final class JiraRepositoryEditor extends BaseRepositoryEditor<JiraRepository> {
   private EditorTextField mySearchQueryField;
   private JBLabel mySearchLabel;
   private JBLabel myNoteLabel;
@@ -126,7 +112,7 @@ else if (myUseBearerTokenAuthenticationCheckBox.isSelected()) {
     }
   }
 
-  protected void useBearerTokenChanged() {
+  private void useBearerTokenChanged() {
     myRepository.setUseBearerTokenAuthentication(myUseBearerTokenAuthenticationCheckBox.isSelected());
     adjustSettingsForServerProperties();
   }

diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraTask.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraTask.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2019 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 com.intellij.tasks.jira;
 
 import com.intellij.icons.AllIcons;
@@ -21,7 +21,7 @@
  */
 public abstract class JiraTask extends Task {
   protected final TaskRepository myRepository;
-  // Deferred icon must be stored as a field because otherwise it's going to initiate repainting 
+  // Deferred icon must be stored as a field because otherwise it's going to initiate repainting
   // of the containing component and will be re-built anew indefinitely.
   // It can be accessed not only in EDT, e.g. to get completion items for tasks.
   private volatile Icon myIcon;
@@ -83,9 +83,8 @@ public final Icon getIcon() {
     return myIcon;
   }
 
-  @Nullable
   @Override
-  public final TaskRepository getRepository() {
+  public final @NotNull TaskRepository getRepository() {
     return myRepository;
   }
 
@@ -100,7 +99,7 @@ public final boolean isIssue() {
   }
 
   /**
-   * Pick appropriate issue type's icon by its URL, contained in JIRA's responses.
+   * Pick the appropriate issue type's icon by its URL, contained in JIRA's responses.
    * Icons will be lazily fetched using {@link CachedIconLoader}.
    *
    * @param iconUrl unique icon URL as returned from {@link #getIconUrl()}

diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlParser.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlParser.java
@@ -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 com.intellij.tasks.jira.jql;
 
 import com.intellij.lang.ASTNode;
@@ -12,7 +13,7 @@
 /**
  * @author Mikhail Golubev
  */
-public class JqlParser implements PsiParser {
+public final class JqlParser implements PsiParser {
   private static final Logger LOG = Logger.getInstance(JqlParser.class);
 
   @NotNull