Skip to content

Commit 84ef543

Browse files
authored
Merge pull request #1673 from Haehnchen/feature/1661-nullfix
#1661 fix container nullable in yaml context
2 parents 126c2cf + e66ceeb commit 84ef543

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlHelper.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.intellij.openapi.command.WriteCommandAction;
77
import com.intellij.openapi.util.Pair;
88
import com.intellij.openapi.util.text.StringUtil;
9+
import com.intellij.openapi.vfs.VirtualFile;
910
import com.intellij.patterns.PatternCondition;
1011
import com.intellij.patterns.PlatformPatterns;
1112
import com.intellij.patterns.PsiElementPattern;
@@ -1321,9 +1322,12 @@ public static Collection<PhpClass> getNamespaceResourcesClasses(@NotNull YAMLKey
13211322
PsiFile containingFile = yamlKeyValue.getContainingFile();
13221323
// PhpStorm 2021.1 needs file check
13231324
if (containingFile != null) {
1324-
phpClasses.addAll(ServiceContainerUtil.getPhpClassFromResources(
1325-
yamlKeyValue.getProject(), valueText, containingFile.getVirtualFile(), resource, YamlHelper.getYamlKeyValueStringOrArray(yamlKeyValue, "exclude"))
1326-
);
1325+
VirtualFile virtualFile = containingFile.getVirtualFile();
1326+
if (virtualFile != null) {
1327+
phpClasses.addAll(ServiceContainerUtil.getPhpClassFromResources(
1328+
yamlKeyValue.getProject(), valueText, virtualFile, resource, YamlHelper.getYamlKeyValueStringOrArray(yamlKeyValue, "exclude"))
1329+
);
1330+
}
13271331
}
13281332
}
13291333
}

0 commit comments

Comments
 (0)