From 29880fc79dba86ef78f7035d90283a3559ebf96d Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 18 Mar 2013 15:03:42 +0400 Subject: [PATCH] Make old js project compilable without modifications --- .../framework/JSLibraryStdPresentationProvider.java | 8 ++++++-- .../framework/JsHeaderLibraryPresentationProvider.java | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdPresentationProvider.java b/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdPresentationProvider.java index 0c5bdcf89ac..9cc9b9d0262 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdPresentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdPresentationProvider.java @@ -51,8 +51,7 @@ public class JSLibraryStdPresentationProvider extends CachingLibraryPresentation return null; } - if (classesRoots.isEmpty()) { - // TODO: Deprecated - remove after some iterations + if (isOldJSStandardLibrary(classesRoots)) { return new LibraryVersionProperties(null); } @@ -65,4 +64,9 @@ public class JSLibraryStdPresentationProvider extends CachingLibraryPresentation return null; } + + // TODO: Deprecated - remove after some iterations + static boolean isOldJSStandardLibrary(@NotNull List classesRoots) { + return classesRoots.isEmpty(); + } } diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryPresentationProvider.java b/idea/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryPresentationProvider.java index 43766550229..49f7e794ec8 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryPresentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryPresentationProvider.java @@ -55,6 +55,10 @@ public class JsHeaderLibraryPresentationProvider extends CachingLibraryPresentat return null; } + if (JSLibraryStdPresentationProvider.isOldJSStandardLibrary(classesRoots)) { + return new LibraryVersionProperties(null); + } + for (VirtualFile file : classesRoots) { CommonProcessors.FindFirstProcessor findKTProcessor = new CommonProcessors.FindFirstProcessor() { @Override