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

Don't detect library as js standard library if it can be detected as java runtime

Browse Source
This commit is contained in:
Nikolay Krasko
2013-03-18 14:59:52 +04:00
parent be6320ab1f
commit 1fdc9908dc
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdPresentationProvider.java
+5
View File
@@ -46,6 +46,11 @@ public class JSLibraryStdPresentationProvider extends CachingLibraryPresentation
@Nullable @Nullable
@Override @Override
public LibraryVersionProperties detect(@NotNull List<VirtualFile> classesRoots) { public LibraryVersionProperties detect(@NotNull List<VirtualFile> classesRoots) {
if (JavaRuntimePresentationProvider.getInstance().detect(classesRoots) != null) {
// Prevent clashing with java runtime, in case when library collects all roots.
return null;
}
if (classesRoots.isEmpty()) { if (classesRoots.isEmpty()) {
// TODO: Deprecated - remove after some iterations // TODO: Deprecated - remove after some iterations
return new LibraryVersionProperties(null); return new LibraryVersionProperties(null);