From 9d6f4d77700775775474ec51a41ab40cb2399a36 Mon Sep 17 00:00:00 2001
From: Alexey Andreev <Alexey.Andreev@jetbrains.com>
Date: Mon, 6 Feb 2017 12:48:24 +0300
Subject: [PATCH] JS: don't treat library without JS metadata as error, report
 warning and continue instead. See KT-16158

---
 .../src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java  |  2 +-
 compiler/testData/cli/js/notValidLibraryDir.out        | 10 ++++++++--
 .../kotlin/js/config/LibrarySourcesConfig.java         |  4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java
index ed298228f3d..a54af4ee3e9 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java
@@ -146,7 +146,7 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
 
             @Override
             public void warning(@NotNull String message) {
-                messageCollector.report(CompilerMessageSeverity.WARNING, message, CompilerMessageLocation.NO_LOCATION);
+                messageCollector.report(CompilerMessageSeverity.STRONG_WARNING, message, CompilerMessageLocation.NO_LOCATION);
             }
         })) {
             return COMPILATION_ERROR;
diff --git a/compiler/testData/cli/js/notValidLibraryDir.out b/compiler/testData/cli/js/notValidLibraryDir.out
index 29476d29214..a6ee07778a5 100644
--- a/compiler/testData/cli/js/notValidLibraryDir.out
+++ b/compiler/testData/cli/js/notValidLibraryDir.out
@@ -1,2 +1,8 @@
-error: 'compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib' is not a valid Kotlin Javascript library
-COMPILATION_ERROR
+warning: 'compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib' is not a valid Kotlin Javascript library
+compiler/testData/cli/js/withLib.kt:2:8: error: unresolved reference: library
+import library.sample.*
+       ^
+compiler/testData/cli/js/withLib.kt:6:13: error: unresolved reference: pairAdd
+    val x = pairAdd(p)
+            ^
+COMPILATION_ERROR
\ No newline at end of file
diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java
index a9adc6097b7..275fe45ad38 100644
--- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java
+++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java
@@ -146,8 +146,8 @@ public class LibrarySourcesConfig extends JsConfig {
             else {
                 List<KotlinJavascriptMetadata> metadataList = KotlinJavascriptMetadataUtils.loadMetadata(filePath);
                 if (metadataList.isEmpty()) {
-                    report.error("'" + path + "' is not a valid Kotlin Javascript library");
-                    return true;
+                    report.warning("'" + path + "' is not a valid Kotlin Javascript library");
+                    continue;
                 }
 
                 for (KotlinJavascriptMetadata metadata : metadataList) {