do not export deps blindly (part 2)

GitOrigin-RevId: 902eb50acfc65c054b5d207bf15950e1da80409e
2026-04-19 13:02:30 +07:00 · 2024-12-18 19:24:15 +01:00
parent aaa5c93bfb
commit f283f90213
32 changed files with 66 additions and 87 deletions
--- 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" />
--- 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>
--- 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" />
--- 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" />
--- 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" />
--- 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" />
--- 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" />
--- 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" />
--- 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" />
--- 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" />
--- 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" />
--- 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
--- 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") {
--- 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" />
--- 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>
--- a/plugins/kotlin/gradle/code-insight-toml/src/org/jetbrains/kotlin/idea/gradle/versionCatalog/toml/KotlinGradleTomlVersionCatalogReferencesSearcher.kt
+++ b/plugins/kotlin/gradle/code-insight-toml/src/org/jetbrains/kotlin/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>) {
--- 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>
--- 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" />
--- 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">
--- 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>
--- 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 @@ import java.util.regex.Pattern;
 */
@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);
--- 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 @@ import java.awt.event.ActionListener;
 /**
 * @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 @@ public class JiraRepositoryEditor extends BaseRepositoryEditor<JiraRepository> {
    }
  }

-  protected void useBearerTokenChanged() {
+  private void useBearerTokenChanged() {
    myRepository.setUseBearerTokenAuthentication(myUseBearerTokenAuthenticationCheckBox.isSelected());
    adjustSettingsForServerProperties();
  }
--- 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 @@ import java.util.Date;
 */
 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 abstract class JiraTask extends Task {
    return myIcon;
  }

-  @Nullable
  @Override
-  public final TaskRepository getRepository() {
+  public final @NotNull TaskRepository getRepository() {
    return myRepository;
  }

@@ -100,7 +99,7 @@ public abstract class JiraTask extends Task {
  }

  /**
-   * 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()}
--- 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 @@ import org.jetbrains.annotations.NotNull;
 /**
 * @author Mikhail Golubev
 */
-public class JqlParser implements PsiParser {
+public final class JqlParser implements PsiParser {
  private static final Logger LOG = Logger.getInstance(JqlParser.class);

  @NotNull
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepository.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepository.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 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.lighthouse;

 import com.intellij.openapi.diagnostic.Logger;
@@ -50,7 +36,7 @@ import java.util.regex.Pattern;
 * @author Dennis.Ushakov
 */
@Tag("Lighthouse")
-public class LighthouseRepository extends BaseRepositoryImpl {
+public final class LighthouseRepository extends BaseRepositoryImpl {
  private static final Logger LOG = Logger.getInstance(LighthouseRepository.class);
  private static final Pattern DATE_PATTERN = Pattern.compile("(\\d\\d\\d\\d\\-\\d\\d\\-\\d\\d).*(\\d\\d:\\d\\d:\\d\\d).*");
  private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -67,9 +53,8 @@ public class LighthouseRepository extends BaseRepositoryImpl {
    super(type);
  }

-  @NotNull
  @Override
-  public BaseRepository clone() {
+  public @NotNull BaseRepository clone() {
    return new LighthouseRepository(this);
  }

@@ -120,8 +105,7 @@ public class LighthouseRepository extends BaseRepositoryImpl {
    return tasks.toArray(Task.EMPTY_ARRAY);
  }

-  @Nullable
-  private Task createIssue(Element element) {
+  private @Nullable Task createIssue(Element element) {
    final String id = element.getChildText("number");
    if (id == null) {
      return null;
@@ -154,15 +138,13 @@ public class LighthouseRepository extends BaseRepositoryImpl {
        return getUrl() + "/projects/" + myProjectId + "/tickets/" + getId() + ".xml";
      }

-      @NotNull
      @Override
-      public String getId() {
+      public @NotNull String getId() {
        return myProjectId + "-" + id;
      }

-      @NotNull
      @Override
-      public String getSummary() {
+      public @NotNull String getSummary() {
        return summary;
      }

@@ -176,15 +158,13 @@ public class LighthouseRepository extends BaseRepositoryImpl {
        return Comment.EMPTY_ARRAY;
      }

-      @NotNull
      @Override
-      public Icon getIcon() {
+      public @NotNull Icon getIcon() {
        return TasksCoreIcons.Lighthouse;
      }

-      @NotNull
      @Override
-      public TaskType getType() {
+      public @NotNull TaskType getType() {
        return TaskType.BUG;
      }

@@ -215,8 +195,7 @@ public class LighthouseRepository extends BaseRepositoryImpl {
    };
  }

-  @Nullable
-  private static Date parseDate(Element element, String name) throws ParseException {
+  private static @Nullable Date parseDate(Element element, String name) throws ParseException {
    final Matcher m = DATE_PATTERN.matcher(element.getChildText(name));
    if (m.find()) {
      return DATE_FORMAT.parse(m.group(1) + " " + m.group(2));
@@ -225,8 +204,7 @@ public class LighthouseRepository extends BaseRepositoryImpl {
  }

  @Override
-  @Nullable
-  public String extractId(@NotNull String taskName) {
+  public @Nullable String extractId(@NotNull String taskName) {
    Matcher matcher = myPattern.matcher(taskName);
    return matcher.find() ? matcher.group(1) : null;
  }
@@ -268,9 +246,8 @@ public class LighthouseRepository extends BaseRepositoryImpl {
    method.addRequestHeader("X-LighthouseToken", getPassword());
  }

-  @Nullable
  @Override
-  public Task findTask(@NotNull String id) throws Exception {
+  public @Nullable Task findTask(@NotNull String id) throws Exception {
    final String[] split = id.split("\\-");
    final String projectId = split[0];
    final String realId = split[1];
--- a/plugins/tasks/tasks-tests/intellij.tasks.tests.iml
+++ b/plugins/tasks/tasks-tests/intellij.tasks.tests.iml
@@ -13,7 +13,7 @@
    <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" />
-    <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.platform.vcs.impl" />
    <orderEntry type="library" name="XmlRPC" level="project" />
    <orderEntry type="module" module-name="intellij.spellchecker" scope="RUNTIME" />
--- a/plugins/textmate/intellij.textmate.iml
+++ b/plugins/textmate/intellij.textmate.iml
@@ -14,9 +14,7 @@
          </stringArguments>
          <arrayArguments>
            <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
-              </args>
+              <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
            </arrayArg>
            <arrayArg name="pluginOptions" />
          </arrayArguments>
@@ -38,7 +36,7 @@
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.spellchecker" />
    <orderEntry type="module" module-name="intellij.platform.diff" />
-    <orderEntry type="module" module-name="intellij.textmate.core" exported="" />
+    <orderEntry type="module" module-name="intellij.textmate.core" />
    <orderEntry type="library" name="fastutil-min" level="project" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="library" name="jackson" level="project" />
--- a/plugins/toml/intellij.toml.iml
+++ b/plugins/toml/intellij.toml.iml
@@ -7,8 +7,8 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.toml.core" exported="" />
-    <orderEntry type="module" module-name="intellij.toml.json" exported="" />
-    <orderEntry type="module" module-name="intellij.toml.grazie" exported="" />
+    <orderEntry type="module" module-name="intellij.toml.core" />
+    <orderEntry type="module" module-name="intellij.toml.json" />
+    <orderEntry type="module" module-name="intellij.toml.grazie" />
  </component>
 </module>
--- a/plugins/toml/tests/intellij.toml.tests.iml
+++ b/plugins/toml/tests/intellij.toml.tests.iml
@@ -9,6 +9,8 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.toml" />
+    <orderEntry type="module" module-name="intellij.toml.core" />
+    <orderEntry type="module" module-name="intellij.toml.json" />
    <orderEntry type="module" module-name="intellij.platform.testFramework" />
    <orderEntry type="module" module-name="intellij.grazie.tests" scope="TEST" />
  </component>
--- a/plugins/ui-designer-core/intellij.uiDesigner.iml
+++ b/plugins/ui-designer-core/intellij.uiDesigner.iml
@@ -14,7 +14,7 @@
    <orderEntry type="module" module-name="intellij.platform.ide" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="module" module-name="intellij.spellchecker" />
-    <orderEntry type="module" module-name="intellij.platform.lang.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="library" name="fastutil-min" level="project" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -79,6 +79,7 @@
    <orderEntry type="library" name="jcef" level="project" />
    <orderEntry type="library" name="jna" level="project" />
    <orderEntry type="module" module-name="intellij.toml" />
+    <orderEntry type="module" module-name="intellij.toml.core" />
    <orderEntry type="module-library">
      <library name="tuweni-toml" type="repository">
        <properties maven-id="org.apache.tuweni:tuweni-toml:2.0.0">
--- a/python/intellij.python.community.tests.iml
+++ b/python/intellij.python.community.tests.iml
@@ -17,6 +17,7 @@
    <orderEntry type="module" module-name="intellij.python.pydev" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.smRunner" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
+    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
    <orderEntry type="library" scope="TEST" name="easymock" level="project" />
    <orderEntry type="library" scope="TEST" name="Objenesis" level="project" />