From 1fdc9908dc3c9c6b635dea00fdd8f362f799bdac Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 18 Mar 2013 14:59:52 +0400 Subject: [PATCH] Don't detect library as js standard library if it can be detected as java runtime --- .../plugin/framework/JSLibraryStdPresentationProvider.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdPresentationProvider.java b/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdPresentationProvider.java index 8c32a8273d8..0c5bdcf89ac 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdPresentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdPresentationProvider.java @@ -46,6 +46,11 @@ public class JSLibraryStdPresentationProvider extends CachingLibraryPresentation @Nullable @Override public LibraryVersionProperties detect(@NotNull List classesRoots) { + if (JavaRuntimePresentationProvider.getInstance().detect(classesRoots) != null) { + // Prevent clashing with java runtime, in case when library collects all roots. + return null; + } + if (classesRoots.isEmpty()) { // TODO: Deprecated - remove after some iterations return new LibraryVersionProperties(null);