diff --git a/src/main/kotlin/org/rust/ide/settings/RsCodeInsightSettings.kt b/src/main/kotlin/org/rust/ide/settings/RsCodeInsightSettings.kt index d912d2bf248..1f4915f7f17 100644 --- a/src/main/kotlin/org/rust/ide/settings/RsCodeInsightSettings.kt +++ b/src/main/kotlin/org/rust/ide/settings/RsCodeInsightSettings.kt @@ -18,7 +18,7 @@ class RsCodeInsightSettings : PersistentStateComponent { var importOutOfScopeItems: Boolean = true var suggestOutOfScopeItems: Boolean = true var addUnambiguousImportsOnTheFly: Boolean = false - var importOnPaste: Boolean = true + var importOnPaste: Boolean = false override fun getState(): RsCodeInsightSettings = this diff --git a/src/test/kotlin/org/rust/ide/typing/paste/RsAddImportOnCopyPasteTest.kt b/src/test/kotlin/org/rust/ide/typing/paste/RsAddImportOnCopyPasteTest.kt index 9f6e5368799..c0c3c55eedc 100644 --- a/src/test/kotlin/org/rust/ide/typing/paste/RsAddImportOnCopyPasteTest.kt +++ b/src/test/kotlin/org/rust/ide/typing/paste/RsAddImportOnCopyPasteTest.kt @@ -9,6 +9,7 @@ import com.intellij.openapi.actionSystem.IdeActions import org.intellij.lang.annotations.Language import org.rust.RsTestBase import org.rust.fileTreeFromText +import org.rust.ide.settings.RsCodeInsightSettings class RsAddImportOnCopyPasteTest : RsTestBase() { fun `test type reference`() = doCopyPasteTest(""" @@ -612,7 +613,7 @@ class RsAddImportOnCopyPasteTest : RsTestBase() { private fun doCopyPasteTest( @Language("Rust") before: String, @Language("Rust") after: String - ) { + ) = withImportOnPaste { val testProject = fileTreeFromText(before).create() myFixture.configureFromTempProjectFile(testProject.fileWithSelection) myFixture.performEditorAction(IdeActions.ACTION_COPY) @@ -622,4 +623,15 @@ class RsAddImportOnCopyPasteTest : RsTestBase() { fileTreeFromText(after).assertEquals(myFixture.findFileInTempDir(".")) } + + private fun withImportOnPaste(action: () -> Unit) { + val settings = RsCodeInsightSettings.getInstance() + val oldValue = settings.importOnPaste + settings.importOnPaste = true + try { + action() + } finally { + settings.importOnPaste = oldValue + } + } }