From 32b846b82780ac3dd21ed5c905fd2fdc592a3f40 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 4 Feb 2014 13:23:41 +0400 Subject: [PATCH] optimisation --- .../src/com/intellij/psi/util/PsiUtilCore.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java index 288f1e5f3541..0328899aa020 100644 --- a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java +++ b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -349,16 +349,14 @@ public class PsiUtilCore { @Nullable public static VirtualFile getVirtualFile(@Nullable PsiElement element) { - if (element == null || !element.isValid()) { + if (element == null) { return null; } - if (element instanceof PsiFileSystemItem) { - return ((PsiFileSystemItem)element).getVirtualFile(); + return element.isValid() ? ((PsiFileSystemItem)element).getVirtualFile() : null; } - final PsiFile containingFile = element.getContainingFile(); - if (containingFile == null) { + if (containingFile == null || !containingFile.isValid()) { return null; }