From bf8d0d520b8631abbf78f8f6681b307a5edfedba Mon Sep 17 00:00:00 2001 From: Alexandr Suhinin Date: Wed, 28 Dec 2022 11:57:51 +0200 Subject: [PATCH] [extract method] IDEA-306846 CR-100378: test qualified field usage GitOrigin-RevId: 357b69f3e94cb1d2cda2bead8d749b1de7df6a4d --- .../MakeStaticWithQualifiedThis.java | 8 ++++++++ .../MakeStaticWithQualifiedThis_after.java | 12 ++++++++++++ .../ExtractMethodAndDuplicatesInplaceTest.kt | 5 +++++ 3 files changed, 25 insertions(+) create mode 100644 java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticWithQualifiedThis.java create mode 100644 java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticWithQualifiedThis_after.java diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticWithQualifiedThis.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticWithQualifiedThis.java new file mode 100644 index 000000000000..06239a5fe48a --- /dev/null +++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticWithQualifiedThis.java @@ -0,0 +1,8 @@ +public class Test { + + int x; + + public void run() { + System.out.println(this.x); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticWithQualifiedThis_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticWithQualifiedThis_after.java new file mode 100644 index 000000000000..e0e9fd7ad947 --- /dev/null +++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticWithQualifiedThis_after.java @@ -0,0 +1,12 @@ +public class Test { + + int x; + + public void run() { + extracted(this.x); + } + + private static void extracted(int x) { + System.out.println(x); + } +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodAndDuplicatesInplaceTest.kt b/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodAndDuplicatesInplaceTest.kt index 1a499a238792..889b18d137c4 100644 --- a/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodAndDuplicatesInplaceTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodAndDuplicatesInplaceTest.kt @@ -244,6 +244,11 @@ class ExtractMethodAndDuplicatesInplaceTest: LightJavaCodeInsightTestCase() { } } + fun testMakeStaticWithQualifiedThis(){ + JavaRefactoringSettings.getInstance().EXTRACT_STATIC_METHOD_AND_PASS_FIELDS = true + doTest() + } + fun testMakeStaticWithStaticMembers(){ runAndRevertSettings { JavaRefactoringSettings.getInstance().EXTRACT_STATIC_METHOD_AND_PASS_FIELDS = true