MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[yaml] IDEA-210113 key completion insert handler: fix removing lookup if it is the only mapping key

Browse Source 
GitOrigin-RevId: de90d7777ffe47981a36483189f134493bb5f47d
This commit is contained in:
Konstantin Aleev
2024-07-16 11:39:43 +02:00
committed by intellij-monorepo-bot
parent 22e6dcbe7f
commit cae2cda86f
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/yaml/src/org/jetbrains/yaml/completion/YamlKeyCompletionInsertHandler.java
View File

@@ -4,6 +4,7 @@ package org.jetbrains.yaml.completion;
import com.intellij.codeInsight.completion.InsertHandler;
import com.intellij.codeInsight.completion.InsertionContext;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
@@ -12,6 +13,7 @@ import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.impl.source.tree.LeafPsiElement;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
@@ -117,9 +119,14 @@ public abstract class YamlKeyCompletionInsertHandler<T extends LookupElement> im
null,
() -> {
PsiElement parent = keyValue.getParent();
PsiElement substitute = null;
boolean delete = parent.getNode().getChildren(null).length == 1;
if (parent instanceof YAMLMapping parentMapping) {
parentMapping.deleteKeyValue(keyValue);
ASTNode[] children = parent.getNode().getChildren(null);
if (children.length == 1 && children[0] instanceof LeafPsiElement) {
substitute = children[0].getPsi();
}
}
else {
YAMLUtil.deleteSurroundingWhitespace(keyValue);
@@ -128,6 +135,9 @@ public abstract class YamlKeyCompletionInsertHandler<T extends LookupElement> im
if (delete) {
parent.delete();
}
else if (substitute != null) {
parent.replace(substitute);
}
});
return oldValue;
}