diff --git a/plugins/yaml/src/org/jetbrains/yaml/formatter/YAMLCopyPasteProcessor.java b/plugins/yaml/src/org/jetbrains/yaml/formatter/YAMLCopyPasteProcessor.java index 4b0900759a7f..a0799b523993 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/formatter/YAMLCopyPasteProcessor.java +++ b/plugins/yaml/src/org/jetbrains/yaml/formatter/YAMLCopyPasteProcessor.java @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.List; public class YAMLCopyPasteProcessor implements CopyPastePreProcessor { - private final static String CONFIG_KEY_SEQUENCE_PATTERN = "([^\\s{}\\[\\]][^\\s]*\\.)+[^\\s{}\\[\\].][^\\s.]*:?\\s*"; + private final static String CONFIG_KEY_SEQUENCE_PATTERN = "([^\\s{}\\[\\].][^\\s.]*\\.)+[^\\s{}\\[\\].][^\\s.]*:?\\s*"; @Nullable @Override diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLKeyPasteTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLKeyPasteTest.java index 83e3e6d14b4b..6afc5012e076 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLKeyPasteTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/paste/YAMLKeyPasteTest.java @@ -78,6 +78,11 @@ public class YAMLKeyPasteTest extends LightPlatformCodeInsightFixtureTestCase { doTest("some. strange. text"); } + // Ambiguity in dot splitting + public void testDoNotPasteKeysWithBadPattern3() { + doTest("some.strange..text"); + } + public void testDoNotPasteArrayAsKeys() { doTest("[x.y]"); } diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/paste/data/doNotPasteKeysWithBadPattern3.after.yml b/plugins/yaml/testSrc/org/jetbrains/yaml/paste/data/doNotPasteKeysWithBadPattern3.after.yml new file mode 100644 index 000000000000..19be654c7269 --- /dev/null +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/paste/data/doNotPasteKeysWithBadPattern3.after.yml @@ -0,0 +1,4 @@ +top: + next: value1 + key: + some.strange..text diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/paste/data/doNotPasteKeysWithBadPattern3.before.yml b/plugins/yaml/testSrc/org/jetbrains/yaml/paste/data/doNotPasteKeysWithBadPattern3.before.yml new file mode 100644 index 000000000000..ccb4a1b088e1 --- /dev/null +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/paste/data/doNotPasteKeysWithBadPattern3.before.yml @@ -0,0 +1,4 @@ +top: + next: value1 + key: +