azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor, refactor TargetPlatformDetector.getPlatform

Browse Source 
Inline dangerous getPlatform(PsiFile) method to prevent it from being
called accidentally instead of getPlatform(KtFile)
This commit is contained in:
Alexander Udalov
2017-04-10 15:51:53 +03:00
parent 5f0e896843
commit 3430059b3a
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java
+7 -19
View File
@@ -54,32 +54,20 @@ public class TargetPlatformDetector {
return contextFile instanceof KtFile ? getPlatform((KtFile) contextFile) : JvmPlatform.INSTANCE; 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(); VirtualFile virtualFile = file.getOriginalFile().getVirtualFile();
if (virtualFile == null) { if (virtualFile != null) {
return getDefaultPlatform(file); Module moduleForFile = ProjectFileIndex.SERVICE.getInstance(file.getProject()).getModuleForFile(virtualFile);
if (moduleForFile != null) {
return getPlatform(moduleForFile);
}
} }
Module moduleForFile = ProjectFileIndex.SERVICE.getInstance(file.getProject()).getModuleForFile(virtualFile); LOG.info("Using default platform for file: " + file.getName());
if (moduleForFile == null) { return JvmPlatform.INSTANCE;
return getDefaultPlatform(file);
}
return getPlatform(moduleForFile);
} }
@NotNull @NotNull
public static TargetPlatform getPlatform(@NotNull Module module) { public static TargetPlatform getPlatform(@NotNull Module module) {
return ProjectStructureUtil.getCachedPlatformForModule(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;
}
} }