[threading] IJPL-149765: Rename writeAction to edtWriteAction #2

GitOrigin-RevId: 82c9ed8b1b21bcb3ad0c4dc84debd3b51f083a80
2026-03-22 15:19:59 +07:00 · 2025-02-18 22:04:52 +01:00
parent 65c9899af5
commit 69ca01169a
19 changed files with 53 additions and 53 deletions
--- a/grid/core-impl/src/datagrid/DocumentUpdaterWithComputeOnBG.kt
+++ b/grid/core-impl/src/datagrid/DocumentUpdaterWithComputeOnBG.kt
@@ -5,7 +5,7 @@ import com.intellij.database.connection.throwable.info.SimpleErrorInfo
 import com.intellij.database.datagrid.DocumentDataHookUp.UpdateSession
 import com.intellij.database.run.ui.grid.LongActionRequestPlace
 import com.intellij.openapi.application.EDT
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.command.executeCommand
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.vfs.ReadonlyStatusHandler
@@ -58,7 +58,7 @@ class DocumentUpdaterWithComputeOnBG {
      action.prepareData()
    }

-    writeAction {
+    edtWriteAction {
      executeCommand(hookUp.project, DataGridBundle.message("command.name.update.values"), null) {
        try {
          documentListener.muteChangeEvents()
--- a/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskProviderBase.kt
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskProviderBase.kt
@@ -11,7 +11,7 @@ import com.intellij.ide.DataManager
 import com.intellij.java.workspace.entities.ArtifactEntity
 import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.compiler.JavaCompilerBundle
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
@@ -46,7 +46,7 @@ private class ArtifactListenerService(
    cs.launch {
      (project.workspaceModel as WorkspaceModelInternal).flowOfDiff(query).collect {
        if (it.removed.any()) {
-          writeAction {
+          edtWriteAction {
            it.removed.forEach { artifactEntity ->
              removeByName(project, providerId, artifactEntity.name)
            }
--- a/java/java-impl/src/com/intellij/ide/FileNotInSourceRootChecker.kt
+++ b/java/java-impl/src/com/intellij/ide/FileNotInSourceRootChecker.kt
@@ -12,7 +12,7 @@ import com.intellij.java.JavaBundle
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.readAction
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.serviceAsync
 import com.intellij.openapi.editor.Editor
@@ -78,10 +78,10 @@ private class FileNotInSourceRootService(
      }

      if (infoAndFile != null) {
-        writeAction {
-          if (!fileEditor.isValid) return@writeAction
+        edtWriteAction {
+          if (!fileEditor.isValid) return@edtWriteAction
          val psiFile = infoAndFile.second
-          if (!psiFile.isValid) return@writeAction
+          if (!psiFile.isValid) return@edtWriteAction
          val listener = object : VirtualFileListener {
            override fun fileMoved(event: VirtualFileMoveEvent) {
              val file = event.file
--- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/ExistingJdkConfigurationActivity.kt
+++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/ExistingJdkConfigurationActivity.kt
@@ -1,7 +1,7 @@
 // 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.openapi.projectRoots.impl

-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.components.serviceAsync
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.projectRoots.JavaSdk
@@ -44,7 +44,7 @@ private class ExistingJdkConfigurationActivity : ProjectActivity {

    val priorityPaths = JavaHomeFinder.getFinder(project).findInJavaHome()

-    writeAction {
+    edtWriteAction {
      // Register collected JDKs
      for (path in jdkPathsToAdd) {
        addedJdks.add(SdkConfigurationUtil.createAndAddSDK(path, javaSdk))
--- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/ExternalJavaConfigurationService.kt
+++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/ExternalJavaConfigurationService.kt
@@ -8,7 +8,7 @@ import com.intellij.notification.NotificationType
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.EDT
 import com.intellij.openapi.application.readAction
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.logger
@@ -130,7 +130,7 @@ class ExternalJavaConfigurationService(val project: Project, private val scope:
  private fun <T> configure(jdk: Sdk, fileName: String, candidate: T) {
    scope.launch(Dispatchers.EDT) {
      val rootManager = ProjectRootManager.getInstance(project)
-      writeAction { rootManager.projectSdk = jdk }
+      edtWriteAction { rootManager.projectSdk = jdk }
      LOG.info("[$fileName] $candidate - JDK registered: ${jdk.versionString}")

      NotificationGroupManager.getInstance()
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/CopyPathProviderTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/CopyPathProviderTest.kt
@@ -4,7 +4,7 @@ package com.intellij.java.codeInsight
 import com.intellij.ide.actions.CopyContentRootPathProvider
 import com.intellij.ide.actions.CopySourceRootPathProvider
 import com.intellij.openapi.application.readAction
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.roots.ModuleRootModificationUtil
 import com.intellij.openapi.vfs.VirtualFile
@@ -29,7 +29,7 @@ class CopyPathProviderTest {

  @BeforeEach
  fun setUp() = runBlocking {
-    writeAction {
+    edtWriteAction {
      rootDir = projectModel.baseProjectDir.newVirtualDirectory("root")
      module = projectModel.createModule()
    }
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/CopyReferenceActionFilesTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/CopyReferenceActionFilesTest.kt
@@ -17,7 +17,7 @@ package com.intellij.java.codeInsight

 import com.intellij.ide.actions.CopyReferenceAction
 import com.intellij.openapi.application.readAction
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.module.JavaModuleType
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.vfs.VirtualFile
@@ -46,7 +46,7 @@ class CopyReferenceActionFilesTest {
  
  @BeforeEach
  fun setUp() = runBlocking {
-    writeAction {
+    edtWriteAction {
      rootDir = projectModel.baseProjectDir.newVirtualDirectory("root")
      module = projectModel.createModule()
      module.setModuleType(JavaModuleType.getModuleType().id)
@@ -59,7 +59,7 @@ class CopyReferenceActionFilesTest {
    lateinit var dir: VirtualFile
    lateinit var dirSubFile: VirtualFile
    lateinit var file: VirtualFile
-    writeAction {
+    edtWriteAction {
      dir = rootDir.createChildDirectory(this, "dir")
      dirSubFile = dir.createChildData(this, "dir_subfile.txt")
      file = rootDir.createChildData(this, "file.txt")
@@ -77,7 +77,7 @@ class CopyReferenceActionFilesTest {
  @Test
  fun `reference to file under non-java source root must include path from content root`() = runBlocking {
    lateinit var file: VirtualFile
-    writeAction {
+    edtWriteAction {
      module.setModuleType(WEB_MODULE_ENTITY_TYPE_ID_NAME)
      val sourceRoot = rootDir.createChildDirectory(this, "src")
      PsiTestUtil.addContentRoot(module, rootDir)
@@ -95,7 +95,7 @@ class CopyReferenceActionFilesTest {
    lateinit var dir: VirtualFile
    lateinit var dirSubFile: VirtualFile
    lateinit var file: VirtualFile
-    writeAction {
+    edtWriteAction {
      dir = rootDir.createChildDirectory(this, "dir")
      dirSubFile = dir.createChildData(this, "dir_subfile.txt")
      file = rootDir.createChildData(this, "file.txt")
@@ -115,7 +115,7 @@ class CopyReferenceActionFilesTest {
    lateinit var dir: VirtualFile
    lateinit var dirDir: VirtualFile
    lateinit var dirDirFile: VirtualFile
-    writeAction {
+    edtWriteAction {
      dir = rootDir.createChildDirectory(this, "dir")
      dirDir = dir.createChildDirectory(this, "dir_dir")
      dirDirFile = dirDir.createChildData(this, "file.txt")
@@ -135,7 +135,7 @@ class CopyReferenceActionFilesTest {
    lateinit var dir: VirtualFile
    lateinit var dirDir: VirtualFile
    lateinit var dirDirFile: VirtualFile
-    writeAction {
+    edtWriteAction {
      dir = rootDir.createChildDirectory(this, "dir")
      dirDir = dir.createChildDirectory(this, "dir_dir")
      dirDirFile = dirDir.createChildData(this, "file.txt")
--- a/json/src/com/jetbrains/jsonSchema/impl/fixes/AddOptionalPropertiesIntention.kt
+++ b/json/src/com/jetbrains/jsonSchema/impl/fixes/AddOptionalPropertiesIntention.kt
@@ -8,7 +8,7 @@ import com.intellij.json.JsonBundle
 import com.intellij.json.psi.JsonObject
 import com.intellij.openapi.application.EDT
 import com.intellij.openapi.application.readAction
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.command.executeCommand
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
@@ -55,7 +55,7 @@ open class AddOptionalPropertiesIntention : IntentionAction {
        containingObject to missingProperties
      } ?: return@runWithModalProgressBlocking

-      writeAction {
+      edtWriteAction {
        executeCommand {
          AddMissingPropertyFix(missingProperties, getSyntaxAdapter(project)).performFix(objectPointer.dereference())
        }
--- a/plugins/coverage/testSrc/com/intellij/coverage/view/CoverageGutterTest.kt
+++ b/plugins/coverage/testSrc/com/intellij/coverage/view/CoverageGutterTest.kt
@@ -5,7 +5,7 @@ import com.intellij.coverage.CoverageEditorAnnotatorImpl
 import com.intellij.coverage.CoverageIntegrationBaseTest
 import com.intellij.openapi.application.EDT
 import com.intellij.openapi.application.readAction
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.application.writeIntentReadAction
 import com.intellij.openapi.editor.colors.CodeInsightColors
 import com.intellij.openapi.editor.impl.EditorImpl
@@ -204,7 +204,7 @@ private fun findEditor(psiClass: PsiClass): EditorImpl {

 internal suspend fun openClass(project: Project, className: String) {
  val psiClass = getPsiClass(project, className)
-  writeAction { psiClass.navigate(true) }
+  edtWriteAction { psiClass.navigate(true) }
 }

 private suspend fun getPsiClass(project: Project, className: String) = readAction {
--- a/plugins/gradle/java/src/service/sources/GradleLibrarySourcesDownloader.kt
+++ b/plugins/gradle/java/src/service/sources/GradleLibrarySourcesDownloader.kt
@@ -4,7 +4,7 @@ package org.jetbrains.plugins.gradle.service.sources
 import com.intellij.ide.highlighter.JavaClassFileType
 import com.intellij.jarFinder.InternetAttachSourceProvider.attachSourceJar
 import com.intellij.openapi.application.readAction
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.externalSystem.model.project.LibraryPathType
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
 import com.intellij.openapi.fileTypes.FileTypeRegistry
@@ -78,7 +78,7 @@ object GradleLibrarySourcesDownloader {
  }

  private suspend fun attachSources(sourcesJar: Path, orderEntries: List<LibraryOrderEntry>) {
-    writeAction {
+    edtWriteAction {
      val libraries = HashSet<Library>()
      orderEntries.forEach {
        ContainerUtil.addIfNotNull(libraries, it.library)
--- a/plugins/gradle/java/testSources/compiler/GradleRelativeConfigCalculatingTest.kt
+++ b/plugins/gradle/java/testSources/compiler/GradleRelativeConfigCalculatingTest.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.gradle.compiler

-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.testFramework.useProjectAsync
 import com.intellij.testFramework.utils.vfs.createFile
 import com.intellij.testFramework.withProjectAsync
@@ -27,7 +27,7 @@ class GradleRelativeConfigCalculatingTest : GradleRelativeConfigCalculatingTestC
      initProject(projectInfo1)
      initProject(projectInfo2)

-      writeAction {
+      edtWriteAction {
        testRoot.createFile("project1/project/src/main/resources/dir/file-main.properties")
        testRoot.createFile("project1/project/src/test/resources/dir/file-test.properties")
        testRoot.createFile("project2/project/src/main/resources/dir/file-main.properties")
--- a/plugins/gradle/java/testSources/quarantine/setup/GradleOpenProjectTest.kt
+++ b/plugins/gradle/java/testSources/quarantine/setup/GradleOpenProjectTest.kt
@@ -2,7 +2,7 @@
 package org.jetbrains.plugins.gradle.quarantine.setup

 import com.intellij.codeHighlighting.HighlightDisplayLevel
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.project.modules
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.use
@@ -127,7 +127,7 @@ class GradleOpenProjectTest : GradleOpenProjectTestCase() {
      initProject(projectInfo)
      initProject(linkedProjectInfo)

-      writeAction {
+      edtWriteAction {
        testRoot.createFile("linked_project/pom.xml")
          .writeText("""
            <?xml version="1.0"?>
@@ -167,7 +167,7 @@ class GradleOpenProjectTest : GradleOpenProjectTestCase() {
      val projectInfo = getSimpleProjectInfo("project")
      initProject(projectInfo)

-      writeAction {
+      edtWriteAction {
        testRoot.createFile("project/.idea/compiler.xml")
          .writeText("""
            |<?xml version="1.0" encoding="UTF-8"?>
@@ -193,7 +193,7 @@ class GradleOpenProjectTest : GradleOpenProjectTestCase() {
      val projectInfo = getSimpleProjectInfo("project")
      initProject(projectInfo)

-      writeAction {
+      edtWriteAction {
        testRoot.createFile("project/.idea/compiler.xml")
          .writeText("""
            |<?xml version="1.0" encoding="UTF-8"?>
@@ -231,7 +231,7 @@ class GradleOpenProjectTest : GradleOpenProjectTestCase() {
      val projectInfo = getSimpleProjectInfo("project")
      initProject(projectInfo)

-      writeAction {
+      edtWriteAction {
        testRoot.createFile("project/project.iml")
          .writeText("""
            |<?xml version="1.0" encoding="UTF-8"?>
@@ -260,7 +260,7 @@ class GradleOpenProjectTest : GradleOpenProjectTestCase() {
        .useProjectAsync { project ->
          assertModules(project, "project")
          awaitProjectConfiguration(project) {
-            writeAction {
+            edtWriteAction {
              testRoot.createFile("project/.idea/gradle.xml")
                .writeText("""
                  |<?xml version="1.0" encoding="UTF-8"?>
@@ -296,7 +296,7 @@ class GradleOpenProjectTest : GradleOpenProjectTestCase() {
      val projectInfo = getSimpleProjectInfo("project")
      initProject(projectInfo)

-      writeAction {
+      edtWriteAction {
        testRoot.createFile("project/.idea/inspectionProfiles/myInspections.xml")
          .writeText("""
            |<component name="InspectionProjectProfileManager">
--- a/plugins/gradle/java/testSources/testFramework/fixture/GradleExecutionTestFixtureImpl.kt
+++ b/plugins/gradle/java/testSources/testFramework/fixture/GradleExecutionTestFixtureImpl.kt
@@ -10,7 +10,7 @@ import com.intellij.execution.runners.ExecutionEnvironment
 import com.intellij.execution.runners.ProgramRunner
 import com.intellij.execution.testframework.AbstractTestProxy
 import com.intellij.openapi.application.runWriteActionAndWait
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.externalSystem.util.ExternalSystemConstants
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
@@ -112,7 +112,7 @@ class GradleExecutionTestFixtureImpl(

  override suspend fun executeAsync(environment: ExecutionEnvironment) {
    awaitAnyGradleTaskExecution {
-      writeAction {
+      edtWriteAction {
        environment.runner.execute(environment)
      }
    }
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testFramework/fixtures/impl/FileTestFixtureImpl.kt
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testFramework/fixtures/impl/FileTestFixtureImpl.kt
@@ -4,7 +4,7 @@ package org.jetbrains.plugins.gradle.testFramework.fixtures.impl
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.PathManager
 import com.intellij.openapi.application.runWriteActionAndWait
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.externalSystem.autoimport.changes.vfs.VirtualFileChangesListener
 import com.intellij.openapi.externalSystem.autoimport.changes.vfs.VirtualFileChangesListener.Companion.installBulkVirtualFileListener
 import com.intellij.openapi.externalSystem.util.runReadAction
@@ -117,7 +117,7 @@ internal class FileTestFixtureImpl(
  }

  private suspend fun invalidateFixtureCaches() {
-    writeAction {
+    edtWriteAction {
      root.deleteChildrenRecursively { it != fixtureStateFile }
    }
  }
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testFramework/util/FileTestFixtureUtil.kt
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testFramework/util/FileTestFixtureUtil.kt
@@ -2,14 +2,14 @@
 package org.jetbrains.plugins.gradle.testFramework.util

 import com.intellij.openapi.application.EDT
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.vfs.VirtualFile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext


 suspend fun VirtualFile.refreshAndAwait() {
-  writeAction {
+  edtWriteAction {
    refresh(false, true)
  }
  withContext(Dispatchers.EDT) {
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.kt
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.kt
@@ -4,7 +4,7 @@ package org.jetbrains.idea.maven.importing
 import com.intellij.maven.testFramework.MavenMultiVersionImportingTestCase
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.WriteAction
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.roots.*
 import com.intellij.openapi.roots.libraries.Library
 import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar
@@ -2499,7 +2499,7 @@ class DependenciesImportingTest : MavenMultiVersionImportingTestCase() {
                         """.trimIndent())
      importProjectAsync()

-      writeAction {
+      edtWriteAction {
        val modifiableModel = ModuleRootManager.getInstance(getModule("project")).getModifiableModel()
        modifiableModel.addInvalidLibrary("SomeLibrary", LibraryTablesRegistrar.PROJECT_LEVEL)
        modifiableModel.addInvalidLibrary("Maven: AnotherLibrary", LibraryTablesRegistrar.PROJECT_LEVEL)
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/EncodingImportingTest.kt
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/EncodingImportingTest.kt
@@ -2,7 +2,7 @@
 package org.jetbrains.idea.maven.importing

 import com.intellij.maven.testFramework.MavenMultiVersionImportingTestCase
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.vfs.VfsUtil
 import kotlinx.coroutines.runBlocking
 import org.junit.Test
@@ -14,7 +14,7 @@ class EncodingImportingTest : MavenMultiVersionImportingTestCase() {
    val text = byteArrayOf(-12, -59, -53, -45, -44) // Russian text in koi8-r encoding.

    val file = createProjectSubFile("src/main/resources/A.txt")
-    writeAction {
+    edtWriteAction {
      file.setBinaryContent(text)
    }

@@ -39,7 +39,7 @@ class EncodingImportingTest : MavenMultiVersionImportingTestCase() {
    val text = byteArrayOf(-12, -59, -53, 45, -44) // Russian text in koi8-r encoding.

    val file = createProjectSubFile("src/main/resources/A.txt")
-    writeAction {
+    edtWriteAction {
      file.setBinaryContent(text)
    }

--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.kt
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.kt
@@ -18,7 +18,7 @@ package org.jetbrains.idea.maven.importing
 import com.intellij.execution.CommonProgramRunConfigurationParameters
 import com.intellij.execution.util.ProgramParametersUtil
 import com.intellij.maven.testFramework.MavenMultiVersionImportingTestCase
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.openapi.externalSystem.service.project.ProjectDataManager
 import com.intellij.openapi.module.ModuleManager.Companion.getInstance
 import com.intellij.openapi.project.Project
@@ -116,7 +116,7 @@ class FoldersImportingTest : MavenMultiVersionImportingTestCase() {
                    <artifactId>project</artifactId>
                    <version>1</version>
                    """.trimIndent())
-    writeAction {
+    edtWriteAction {
      val adapter = MavenRootModelAdapter(MavenRootModelAdapterLegacyImpl(
        projectsTree.findProject(projectPom)!!,
        getModule("project"),
@@ -1578,7 +1578,7 @@ class FoldersImportingTest : MavenMultiVersionImportingTestCase() {
                  "src/main/java",
                  "target/generated-sources/baz")
    assertDefaultResources("project")
-    writeAction {
+    edtWriteAction {
      try {
        subDir.delete(this)
      }
@@ -1647,7 +1647,7 @@ class FoldersImportingTest : MavenMultiVersionImportingTestCase() {
      assertDefaultTestResources("project")
    }
    testAssertions.accept(true)
-    writeAction {
+    edtWriteAction {
      try {
        target.delete(this)
      }
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/actions/AddFileAsMavenProjectActionTest.kt
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/actions/AddFileAsMavenProjectActionTest.kt
@@ -5,7 +5,7 @@ import com.intellij.maven.testFramework.MavenMultiVersionImportingTestCase
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.application.EDT
 import com.intellij.openapi.application.readAction
-import com.intellij.openapi.application.writeAction
+import com.intellij.openapi.application.edtWriteAction
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiManager
 import com.intellij.testFramework.MapDataContext
@@ -29,7 +29,7 @@ class AddFileAsMavenProjectActionTest : MavenMultiVersionImportingTestCase() {
    }

    // make a change but do not save
-    writeAction {
+    edtWriteAction {
      document.setText(createPomXml("<groupId>test</groupId>" +
                                    "<artifactId>project-new</artifactId>" +
                                    "<version>1</version>"))