mirror of
https://gitflic.ru/project/openide/openide.git
synced 2025-12-16 14:23:28 +07:00
[kotlin] K2 move: fix incorrectly passed configuration flags
Search references and search in text were passed vice versa from model to descriptor. KTIJ-32999 IJ-CR-168118 GitOrigin-RevId: 3602dc351e7687787a0d8ca035349e76d74aa5a4
This commit is contained in:
committed by
intellij-monorepo-bot
parent
37931c9f5c
commit
06049534e2
@@ -269,6 +269,16 @@ public abstract class MoveTestGenerated extends AbstractMoveTest {
|
||||
runTest("testData/refactoring/moveFile/kotlin/packageWithQuotation/packageWithQuotation.test");
|
||||
}
|
||||
|
||||
@TestMetadata("kotlin/searchReferencesAndPackageUpdates/searchReferencesDisabled/searchReferencesDisabled.test")
|
||||
public void testKotlin_searchReferencesAndPackageUpdates_searchReferencesDisabled_SearchReferencesDisabled() throws Exception {
|
||||
runTest("testData/refactoring/moveFile/kotlin/searchReferencesAndPackageUpdates/searchReferencesDisabled/searchReferencesDisabled.test");
|
||||
}
|
||||
|
||||
@TestMetadata("kotlin/searchReferencesAndPackageUpdates/searchStringsDisabled/searchStringsDisabled.test")
|
||||
public void testKotlin_searchReferencesAndPackageUpdates_searchStringsDisabled_SearchStringsDisabled() throws Exception {
|
||||
runTest("testData/refactoring/moveFile/kotlin/searchReferencesAndPackageUpdates/searchStringsDisabled/searchStringsDisabled.test");
|
||||
}
|
||||
|
||||
@TestMetadata("kotlin/selfReferenceInImport/selfReferenceInImport.test")
|
||||
public void testKotlin_selfReferenceInImport_SelfReferenceInImport() throws Exception {
|
||||
runTest("testData/refactoring/moveFile/kotlin/selfReferenceInImport/selfReferenceInImport.test");
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
package source
|
||||
|
||||
fun foo() {
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
package source
|
||||
|
||||
fun foo() {
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"mainFile": "source/Foo.kt",
|
||||
"type": "MOVE_FILES",
|
||||
"targetPackage": "target",
|
||||
"searchReferences": false,
|
||||
"enabledInK1": "false",
|
||||
"enabledInK2": "true"
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
package target
|
||||
|
||||
fun foo() {
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
package source
|
||||
|
||||
fun foo() {
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"mainFile": "source/Foo.kt",
|
||||
"type": "MOVE_FILES",
|
||||
"targetPackage": "target",
|
||||
"searchInCommentsAndStrings": false,
|
||||
"enabledInK1": "false",
|
||||
"enabledInK2": "true"
|
||||
}
|
||||
@@ -171,13 +171,13 @@ sealed class K2MoveModel {
|
||||
targetDescr
|
||||
)
|
||||
val operationDescriptor = K2MoveOperationDescriptor.Files(
|
||||
project,
|
||||
listOf(moveDescriptor),
|
||||
searchForText.state,
|
||||
searchReferences,
|
||||
searchInComments.state,
|
||||
project = project,
|
||||
moveDescriptors = listOf(moveDescriptor),
|
||||
searchForText = searchForText.state,
|
||||
searchReferences = searchReferences,
|
||||
searchInComments = searchInComments.state,
|
||||
dirStructureMatchesPkg = true,
|
||||
moveCallBack
|
||||
moveCallBack = moveCallBack,
|
||||
)
|
||||
return operationDescriptor
|
||||
}
|
||||
@@ -247,8 +247,8 @@ sealed class K2MoveModel {
|
||||
project = project,
|
||||
moveDescriptors = descriptors,
|
||||
searchForText = searchForText,
|
||||
searchInComments = searchForReferences,
|
||||
searchReferences = searchInComments,
|
||||
searchInComments = searchInComments,
|
||||
searchReferences = searchForReferences,
|
||||
dirStructureMatchesPkg = true,
|
||||
moveCallBack = moveCallBack
|
||||
)
|
||||
|
||||
@@ -78,10 +78,10 @@ internal object K2MoveFileOrDirectoriesRefactoringAction : KotlinMoveRefactoring
|
||||
targetDescriptor
|
||||
)
|
||||
val moveOperationDescriptor = K2MoveOperationDescriptor.Files(
|
||||
project,
|
||||
listOf(moveDescriptor),
|
||||
shouldUpdateReferences(config, sourceDescriptor.elements.first(), targetDescriptor.baseDirectory),
|
||||
config.searchReferences(),
|
||||
project = project,
|
||||
moveDescriptors = listOf(moveDescriptor),
|
||||
searchForText = shouldUpdateReferences(config, sourceDescriptor.elements.first(), targetDescriptor.baseDirectory),
|
||||
searchInComments = config.searchInComments(),
|
||||
dirStructureMatchesPkg = true,
|
||||
searchReferences = config.searchReferences(),
|
||||
)
|
||||
|
||||
@@ -165,6 +165,16 @@ public class K2MoveFileOrDirectoriesTestGenerated extends AbstractK2MoveFileOrDi
|
||||
runTest("../../idea/tests/testData/refactoring/moveFile/kotlin/packageWithQuotation/packageWithQuotation.test");
|
||||
}
|
||||
|
||||
@TestMetadata("kotlin/searchReferencesAndPackageUpdates/searchReferencesDisabled/searchReferencesDisabled.test")
|
||||
public void testKotlin_searchReferencesAndPackageUpdates_searchReferencesDisabled_SearchReferencesDisabled() throws Exception {
|
||||
runTest("../../idea/tests/testData/refactoring/moveFile/kotlin/searchReferencesAndPackageUpdates/searchReferencesDisabled/searchReferencesDisabled.test");
|
||||
}
|
||||
|
||||
@TestMetadata("kotlin/searchReferencesAndPackageUpdates/searchStringsDisabled/searchStringsDisabled.test")
|
||||
public void testKotlin_searchReferencesAndPackageUpdates_searchStringsDisabled_SearchStringsDisabled() throws Exception {
|
||||
runTest("../../idea/tests/testData/refactoring/moveFile/kotlin/searchReferencesAndPackageUpdates/searchStringsDisabled/searchStringsDisabled.test");
|
||||
}
|
||||
|
||||
@TestMetadata("kotlin/selfReferenceInImport/selfReferenceInImport.test")
|
||||
public void testKotlin_selfReferenceInImport_SelfReferenceInImport() throws Exception {
|
||||
runTest("../../idea/tests/testData/refactoring/moveFile/kotlin/selfReferenceInImport/selfReferenceInImport.test");
|
||||
|
||||
Reference in New Issue
Block a user