MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] move statements: take care of error elements

Browse Source 
^KTIJ-31312 fixed

GitOrigin-RevId: 1de2219e328f0c7ac38816a1f468556a061cd932
This commit is contained in:
Anna Kozlova
2024-09-17 12:02:34 +00:00
committed by intellij-monorepo-bot
parent d67c2fc0a3
commit 5d2db4e7e8
5 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinExpressionMover.kt
+4
View File
@@ -504,6 +504,10 @@ class KotlinExpressionMover : AbstractKotlinUpDownMover() {
return element
}
if (element is PsiErrorElement) {
return element
}
if (getParentFileAnnotationEntry(element) != null) return null
val movableElement = element.getParentOfTypesAndPredicate(
plugins/kotlin/code-insight/kotlin.code-insight.k2/test/org/jetbrains/kotlin/idea/k2/moveUpDown/KotlinFirMoveStatementTestGenerated.java
+5
View File
@@ -1385,6 +1385,11 @@ public abstract class KotlinFirMoveStatementTestGenerated extends AbstractKotlin
KotlinTestUtils.runTest(this::doTestLine, this, testDataFilePath);
}
@TestMetadata("additionalClosingBrace.kt")
public void testAdditionalClosingBrace() throws Exception {
runTest("../../idea/tests/testData/codeInsight/moveUpDown/line/additionalClosingBrace.kt");
}
@TestMetadata("fileAnnotation.kt")
public void testFileAnnotation() throws Exception {
runTest("../../idea/tests/testData/codeInsight/moveUpDown/line/fileAnnotation.kt");
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/MoveStatementTestGenerated.java
+5
View File
@@ -1385,6 +1385,11 @@ public abstract class MoveStatementTestGenerated extends AbstractMoveStatementTe
KotlinTestUtils.runTest(this::doTestLine, this, testDataFilePath);
}
@TestMetadata("additionalClosingBrace.kt")
public void testAdditionalClosingBrace() throws Exception {
runTest("testData/codeInsight/moveUpDown/line/additionalClosingBrace.kt");
}
@TestMetadata("fileAnnotation.kt")
public void testFileAnnotation() throws Exception {
runTest("testData/codeInsight/moveUpDown/line/fileAnnotation.kt");
plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/line/additionalClosingBrace.kt
+8
View File
@@ -0,0 +1,8 @@
// MOVE: up
fun dispose(editor: Editor) {
val disposable = editor.getUserData(AIDiffKeys.AI_DIFF_VIEWER) as AIInEditorDiffViewer?
if (disposable != null) {
}
Disposer.dispose(disposable))<caret>
}
plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/line/additionalClosingBrace.kt.after
+8
View File
@@ -0,0 +1,8 @@
// MOVE: up
fun dispose(editor: Editor) {
val disposable = editor.getUserData(AIDiffKeys.AI_DIFF_VIEWER) as AIInEditorDiffViewer?
if (disposable != null) {
Disposer.dispose(disposable))<selection><caret></selection>
}
}