IJPL-149087 %createJavaFile and %createKotlinFile commands fail due to 'NoClassDefFoundError: com/intellij/openapi/vcs/ex/ProjectLevelVcsManagerEx'

GitOrigin-RevId: ff13594a93fbe0f9f60461f4351430996a5a5ed3
2026-03-22 06:50:54 +07:00 · 2024-05-01 08:35:44 +02:00
parent 9443e180c5
commit 496a09fd92
12 changed files with 36 additions and 29 deletions
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -903,6 +903,7 @@
      <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/core/intellij.performanceTesting.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/core/intellij.performanceTesting.iml" />
      <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml" />
      <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/scripts-ui/intellij.performanceTesting.ui.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" filepath="$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/analysis-impl/intellij.platform.analysis.impl.iml" filepath="$PROJECT_DIR$/platform/analysis-impl/intellij.platform.analysis.impl.iml" />
      <module fileurl="file://$PROJECT_DIR$/platform/intellij.platform.backend.main/intellij.platform.backend.main.iml" filepath="$PROJECT_DIR$/platform/intellij.platform.backend.main/intellij.platform.backend.main.iml" />
--- a/java/performancePlugin/intellij.java.performancePlugin.iml
+++ b/java/performancePlugin/intellij.java.performancePlugin.iml
@@ -19,5 +19,6 @@
    <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
    <orderEntry type="module" module-name="intellij.java.psi" />
    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.performanceTesting.vcs" />
  </component>
 </module>
--- a/java/performancePlugin/src/com/intellij/java/performancePlugin/CreateJavaFileCommand.kt
+++ b/java/performancePlugin/src/com/intellij/java/performancePlugin/CreateJavaFileCommand.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 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.java.performancePlugin

 import com.intellij.core.JavaPsiBundle.message
@@ -11,7 +11,7 @@ import com.intellij.psi.JavaDirectoryService
 import com.intellij.psi.impl.file.PsiJavaDirectoryFactory
 import com.jetbrains.performancePlugin.PerformanceTestSpan
 import com.jetbrains.performancePlugin.commands.PerformanceCommandCoroutineAdapter
-import com.jetbrains.performancePlugin.utils.VcsTestUtil
+import com.intellij.performanceTesting.vcs.VcsTestUtil
 import io.opentelemetry.context.Context
 import org.jetbrains.annotations.Nls

@@ -19,8 +19,7 @@ import org.jetbrains.annotations.Nls
 * Command to add Java file to project
 * Example: %createJavaFile fileName,dstDir,fileType - class, enum, annotation, record, interface
 */
-class CreateJavaFileCommand(text: String, line: Int) : PerformanceCommandCoroutineAdapter(text, line) {
-
+internal class CreateJavaFileCommand(text: String, line: Int) : PerformanceCommandCoroutineAdapter(text, line) {
  companion object {
    const val NAME: String = "createJavaFile"
    const val PREFIX: String = CMD_PREFIX + NAME
@@ -58,5 +57,4 @@ class CreateJavaFileCommand(text: String, line: Int) : PerformanceCommandCorouti
  }

  override fun getName(): String = NAME
-
 }
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt
@@ -221,15 +221,8 @@ object CommunityRepositoryModules {
      spec.withModuleLibrary("intellij.remoterobot.robot.server.core", spec.mainModule, "")
      spec.withProjectLibrary("okhttp")
    },
-    pluginAuto(
-      listOf(
-        "intellij.performanceTesting",
-        "intellij.performanceTesting.remoteDriver",
-        "intellij.driver.model",
-        "intellij.driver.impl",
-        "intellij.driver.client"
-      )
-    ))
+    pluginAuto(listOf("intellij.performanceTesting", "intellij.driver.model", "intellij.driver.impl", "intellij.driver.client"))
+  )

  val CONTRIB_REPOSITORY_PLUGINS: List<PluginLayout> = java.util.List.of(
    pluginAuto("intellij.errorProne") { spec ->
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
@@ -41,7 +41,6 @@ private val PLATFORM_API_MODULES = java.util.List.of(
  "intellij.platform.remoteServers",
  "intellij.platform.usageView",
  "intellij.platform.execution",
-  "intellij.xml.analysis",
  "intellij.xml",
  "intellij.xml.psi",
  "intellij.xml.structureView",
--- a/plugins/kotlin/kotlin.performanceExtendedPlugin/kotlin.performanceExtendedPlugin.iml
+++ b/plugins/kotlin/kotlin.performanceExtendedPlugin/kotlin.performanceExtendedPlugin.iml
@@ -31,5 +31,6 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="kotlin.base.compiler-configuration" />
+    <orderEntry type="module" module-name="intellij.performanceTesting.vcs" />
  </component>
 </module>
--- a/plugins/kotlin/kotlin.performanceExtendedPlugin/src/com/intellij/performance/performancePlugin/commands/CreateKotlinFileCommand.kt
+++ b/plugins/kotlin/kotlin.performanceExtendedPlugin/src/com/intellij/performance/performancePlugin/commands/CreateKotlinFileCommand.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 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.performance.performancePlugin.commands

 import com.intellij.ide.fileTemplates.FileTemplateManager
@@ -13,7 +13,7 @@ import com.intellij.psi.impl.PsiManagerImpl
 import com.intellij.psi.impl.file.PsiDirectoryImpl
 import com.jetbrains.performancePlugin.PerformanceTestSpan
 import com.jetbrains.performancePlugin.commands.PerformanceCommandCoroutineAdapter
-import com.jetbrains.performancePlugin.utils.VcsTestUtil
+import com.intellij.performanceTesting.vcs.VcsTestUtil
 import io.opentelemetry.context.Context
 import org.jetbrains.kotlin.idea.actions.createKotlinFileFromTemplate

--- a/plugins/performanceTesting/core/intellij.performanceTesting.iml
+++ b/plugins/performanceTesting/core/intellij.performanceTesting.iml
@@ -23,10 +23,10 @@
    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
    <orderEntry type="module-library">
      <library name="github.oshi.core" type="repository">
-        <properties maven-id="com.github.oshi:oshi-core:6.4.4">
+        <properties maven-id="com.github.oshi:oshi-core:6.6.0">
          <verification>
-            <artifact url="file://$MAVEN_REPOSITORY$/com/github/oshi/oshi-core/6.4.4/oshi-core-6.4.4.jar">
-              <sha256sum>423ef4cd72207b73a9197bd5c3514c3b336a706e44f2dfbd1e9da14f75135dce</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/com/github/oshi/oshi-core/6.6.0/oshi-core-6.6.0.jar">
+              <sha256sum>706b5582246d534f427a57141d9fe4a9a7ac1aae37aac857769ec9abacf0de82</sha256sum>
            </artifact>
          </verification>
          <exclude>
@@ -36,11 +36,11 @@
          </exclude>
        </properties>
        <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/com/github/oshi/oshi-core/6.4.4/oshi-core-6.4.4.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/com/github/oshi/oshi-core/6.6.0/oshi-core-6.6.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
-          <root url="jar://$MAVEN_REPOSITORY$/com/github/oshi/oshi-core/6.4.4/oshi-core-6.4.4-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/com/github/oshi/oshi-core/6.6.0/oshi-core-6.6.0-sources.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
@@ -48,9 +48,6 @@
    <orderEntry type="library" name="opentelemetry-semconv" level="project" />
    <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
    <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
-    <orderEntry type="module" module-name="intellij.platform.vcs.log.impl" />
-    <orderEntry type="module" module-name="intellij.platform.vcs.log" />
-    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
    <orderEntry type="library" name="fastutil-min" level="project" />
    <orderEntry type="module" module-name="intellij.platform.debugger" />
--- a/plugins/performanceTesting/core/resources/META-INF/plugin.xml
+++ b/plugins/performanceTesting/core/resources/META-INF/plugin.xml
@@ -12,6 +12,7 @@

  <content>
    <module name="intellij.performanceTesting.remoteDriver"/>
+    <module name="intellij.performanceTesting.vcs"/>
  </content>

  <dependencies>
--- a/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml
+++ b/plugins/performanceTesting/vcs/intellij.performanceTesting.vcs.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
+  </component>
+</module>
--- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/VcsTestUtil.kt
+++ b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/utils/VcsTestUtil.kt
@@ -1,4 +1,4 @@
-package com.jetbrains.performancePlugin.utils
+package com.intellij.performanceTesting.vcs

 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vcs.VcsConfiguration
@@ -6,11 +6,9 @@ import com.intellij.openapi.vcs.VcsShowConfirmationOption
 import com.intellij.openapi.vcs.ex.ProjectLevelVcsManagerEx

 object VcsTestUtil {
-
  /**
   * This function modifies 'Preferences->Version Control->Confirmation->When files are created' option
   */
-  @JvmStatic
  fun provisionVcsAddFileConfirmation(project: Project, fileConfirmation: VcsAddFileConfirmation) {
    val addFileConfirmationSetting = ProjectLevelVcsManagerEx
      .getInstanceEx(project)
@@ -28,5 +26,4 @@ object VcsTestUtil {
    DO_NOTHING,
    DO_SILENTLY
  }
-
 }
--- a/plugins/performanceTesting/vcs/src/intellij.performanceTesting.vcs.xml
+++ b/plugins/performanceTesting/vcs/src/intellij.performanceTesting.vcs.xml
@@ -0,0 +1,6 @@
+<idea-plugin package="com.intellij.performanceTesting.vcs">
+  <dependencies>
+    <module name="intellij.platform.vcs.impl"/>
+    <module name="intellij.platform.vcs.log.impl"/>
+  </dependencies>
+</idea-plugin>