From 3430059b3ab8c80c2b91c1190f5361a37eb519cd Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 10 Apr 2017 15:51:53 +0300 Subject: [PATCH] Minor, refactor TargetPlatformDetector.getPlatform Inline dangerous getPlatform(PsiFile) method to prevent it from being called accidentally instead of getPlatform(KtFile) --- .../idea/project/TargetPlatformDetector.java | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java index cb4e4e3eb7b..785beae59b6 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java @@ -54,32 +54,20 @@ public class TargetPlatformDetector { return contextFile instanceof KtFile ? getPlatform((KtFile) contextFile) : JvmPlatform.INSTANCE; } - return getPlatform((PsiFile) file); - } - - public static TargetPlatform getPlatform(@NotNull PsiFile file) { - VirtualFile virtualFile = file.getOriginalFile().getVirtualFile(); - if (virtualFile == null) { - return getDefaultPlatform(file); + if (virtualFile != null) { + Module moduleForFile = ProjectFileIndex.SERVICE.getInstance(file.getProject()).getModuleForFile(virtualFile); + if (moduleForFile != null) { + return getPlatform(moduleForFile); + } } - Module moduleForFile = ProjectFileIndex.SERVICE.getInstance(file.getProject()).getModuleForFile(virtualFile); - if (moduleForFile == null) { - return getDefaultPlatform(file); - } - - return getPlatform(moduleForFile); + LOG.info("Using default platform for file: " + file.getName()); + return JvmPlatform.INSTANCE; } @NotNull public static TargetPlatform getPlatform(@NotNull Module module) { return ProjectStructureUtil.getCachedPlatformForModule(module); } - - @NotNull - private static TargetPlatform getDefaultPlatform(@NotNull PsiFile file) { - LOG.info("Using default platform for file: " + file.getName()); - return JvmPlatform.INSTANCE; - } }