azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert to block body: adjust line indent

Browse Source 
#KT-22368 Fixed
This commit is contained in:
Toshiaki Kameyama
2020-01-15 12:19:00 +09:00
committed by Ilya Kirillov
parent 1bc72f0b32
commit 30366148bf
4 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyIntention.kt
+5 -1
View File
@@ -23,7 +23,10 @@ import org.jetbrains.kotlin.idea.KotlinBundle
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
import org.jetbrains.kotlin.idea.core.setType import org.jetbrains.kotlin.idea.core.setType
import org.jetbrains.kotlin.idea.formatter.adjustLineIndent
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.endOffset
import org.jetbrains.kotlin.psi.psiUtil.startOffset
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.isError import org.jetbrains.kotlin.types.isError
import org.jetbrains.kotlin.types.typeUtil.isNothing import org.jetbrains.kotlin.types.typeUtil.isNothing
@@ -93,7 +96,8 @@ class ConvertToBlockBodyIntention : SelfTargetingIntention<KtDeclarationWithBody
} }
declaration.equalsToken!!.delete() declaration.equalsToken!!.delete()
body.replace(newBody) val replaced = body.replace(newBody)
declaration.containingKtFile.adjustLineIndent(replaced.startOffset, replaced.endOffset)
return declaration return declaration
} }
idea/testData/intentions/convertToBlockBody/adjustLineIndent.kt
Vendored
+2
View File
@@ -0,0 +1,2 @@
fun foo(x: Int,
y: Int) = <caret>x + y
idea/testData/intentions/convertToBlockBody/adjustLineIndent.kt.after
Vendored
+4
View File
@@ -0,0 +1,4 @@
fun foo(x: Int,
y: Int): Int {
return x + y
}
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
Generated
+5
View File
@@ -6595,6 +6595,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
runTest("idea/testData/intentions/convertToBlockBody/addSpace.kt"); runTest("idea/testData/intentions/convertToBlockBody/addSpace.kt");
} }
@TestMetadata("adjustLineIndent.kt")
public void testAdjustLineIndent() throws Exception {
runTest("idea/testData/intentions/convertToBlockBody/adjustLineIndent.kt");
}
public void testAllFilesPresentInConvertToBlockBody() throws Exception { public void testAllFilesPresentInConvertToBlockBody() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/intentions/convertToBlockBody"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), null, true); KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/intentions/convertToBlockBody"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), null, true);
} }