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

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

Browse Source 
- add tests
- change empty mapping message severity to error

GitOrigin-RevId: eeba7b1f908af68715bcb079439dfae5799aa50a
This commit is contained in:
Konstantin Aleev
2024-07-28 11:48:59 +00:00
committed by intellij-monorepo-bot
parent 86b2c84309
commit 43881d845a
2 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/yaml/editing/src/org/jetbrains/yaml/YAMLUtil.java
+1 -1
View File
@@ -244,7 +244,7 @@ public final class YAMLUtil {
throw e;
}
else {
Logger.getInstance(YAMLUtil.class).warn(YAMLBlockMappingImpl.EMPTY_MAP_MESSAGE);
Logger.getInstance(YAMLUtil.class).error(YAMLBlockMappingImpl.EMPTY_MAP_MESSAGE);
}
}
}
plugins/yaml/src/org/jetbrains/yaml/completion/YamlKeyCompletionInsertHandler.java
+40 -27
View File
@@ -6,6 +6,7 @@ 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.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.EditorModificationUtilEx;
@@ -18,10 +19,7 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.yaml.YAMLBundle;
import org.jetbrains.yaml.YAMLElementGenerator;
import org.jetbrains.yaml.YAMLTokenTypes;
import org.jetbrains.yaml.YAMLUtil;
import org.jetbrains.yaml.*;
import org.jetbrains.yaml.psi.*;
import java.util.List;
@@ -116,29 +114,44 @@ public abstract class YamlKeyCompletionInsertHandler<T extends LookupElement> im
context.setTailOffset(keyValue.getTextRange().getEndOffset());
WriteCommandAction.runWriteCommandAction(context.getProject(),
YAMLBundle.message("YamlKeyCompletionInsertHandler.remove.key"),
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);
keyValue.delete();
}
if (delete) {
parent.delete();
}
else if (substitute != null) {
parent.replace(substitute);
}
});
null, () -> {
PsiElement parent = keyValue.getParent();
PsiElement substitute = null;
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 if (children.length != 0 &&
ContainerUtil.find(children, node -> node.getElementType() == YAMLElementTypes.KEY_VALUE_PAIR) == null) {
String rootKey = "root";
String valueText = parent.getText();
YAMLFile file = YAMLElementGenerator.getInstance(parent.getProject())
.createDummyYamlWithText(rootKey + ":\n " + valueText);
YAMLValue value = file.getDocuments().get(0).getTopLevelValue();
if (value instanceof YAMLMapping mapping) {
YAMLKeyValue root = mapping.getKeyValueByKey(rootKey);
if (root != null) {
substitute = root.getValue();
}
}
if (substitute == null) {
Logger.getInstance(YamlKeyCompletionInsertHandler.class).error("Could not substitute: " + valueText);
}
}
}
else {
YAMLUtil.deleteSurroundingWhitespace(keyValue);
keyValue.delete();
}
if (parent.getNode().getChildren(null).length == 0) {
parent.delete();
}
else if (substitute != null) {
parent.replace(substitute);
}
});
return oldValue;
}