Skip to content

Commit e8d51e2

Browse files
committed
Adapt to changed YAML Psi to find the first KeyValue mapping
1 parent 1eb302b commit e8d51e2

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/util/DoctrineMetadataUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,9 @@ public static String findModelNameInScope(@NotNull PsiElement psiElement) {
316316
if(yamlDocument != null) {
317317
YAMLValue topLevelValue = yamlDocument.getTopLevelValue();
318318
if(topLevelValue instanceof YAMLMapping) {
319-
PsiElement firstChild = topLevelValue.getFirstChild();
320-
if(firstChild instanceof YAMLKeyValue) {
321-
String keyText = ((YAMLKeyValue) firstChild).getKeyText();
319+
YAMLKeyValue firstChild = PsiTreeUtil.findChildOfType(topLevelValue, YAMLKeyValue.class);
320+
if(firstChild != null) {
321+
String keyText = firstChild.getKeyText();
322322
if(StringUtils.isNotBlank(keyText)) {
323323
return keyText;
324324
}

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/DoctrineMetadataUtilTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
1616
import org.jetbrains.yaml.YAMLFileType;
1717

18-
import java.io.File;
1918
import java.util.*;
2019

2120
/**
@@ -236,7 +235,7 @@ public void testYamlFindModelNameInScope() {
236235
}) {
237236
myFixture.configureByText(YAMLFileType.YML, s);
238237
PsiElement psiElement = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
239-
assertEquals("Foo\\Foo", DoctrineMetadataUtil.findModelNameInScope(psiElement));
238+
assertEquals(String.format("Fixture %s", s), "Foo\\Foo", DoctrineMetadataUtil.findModelNameInScope(psiElement));
240239
}
241240
}
242241
}

0 commit comments

Comments
 (0)