From 5715c322164e7a06da158ae5f9c6e1d7296661a3 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Mon, 22 Apr 2019 19:28:32 +0300
Subject: [PATCH] [IDE-NI-MIGRATE] [OK] Enable only OI on some IDEA tests that
 unrelevant in NI

---
 idea/testData/diagnosticMessage/conflictingSubstitutions.kt      | 1 +
 .../diagnosticMessage/expectedNothingDueToProjections.kt         | 1 +
 idea/testData/diagnosticMessage/functionPlaceholder.kt           | 1 +
 .../diagnosticMessage/noneApplicableCallableReference.kt         | 1 +
 idea/testData/diagnosticMessage/noneApplicableGeneric.kt         | 1 +
 idea/testData/diagnosticMessage/numberValueTypes.kt              | 1 +
 .../diagnosticMessage/typeInferenceCannotCaptureTypes.kt         | 1 +
 .../diagnosticMessage/typeInferenceExpectedTypeMismatch.kt       | 1 +
 idea/testData/diagnosticMessage/typeMismatchDueToProjections.kt  | 1 +
 .../testData/diagnosticMessage/typeMismatchDueToProjectionsIn.kt | 1 +
 .../diagnosticMessage/typeMismatchDueToProjectionsTxt.kt         | 1 +
 idea/testData/diagnosticMessage/typeMismatchWithNothing.kt       | 1 +
 idea/testData/diagnosticMessage/upperBoundViolated.kt            | 1 +
 .../upperBoundViolatedInTypeAliasConstructorCall.kt              | 1 +
 14 files changed, 14 insertions(+)

diff --git a/idea/testData/diagnosticMessage/conflictingSubstitutions.kt b/idea/testData/diagnosticMessage/conflictingSubstitutions.kt
index 62000750f45..d2ee073fa1a 100644
--- a/idea/testData/diagnosticMessage/conflictingSubstitutions.kt
+++ b/idea/testData/diagnosticMessage/conflictingSubstitutions.kt
@@ -1,5 +1,6 @@
 // !DIAGNOSTICS_NUMBER: 2
 // !DIAGNOSTICS: TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS
+// !LANGUAGE: -NewInference
 // see DiagnosticMessageTest
 
 import java.io.Closeable
diff --git a/idea/testData/diagnosticMessage/expectedNothingDueToProjections.kt b/idea/testData/diagnosticMessage/expectedNothingDueToProjections.kt
index e62270da9d3..863ddb9ec1e 100644
--- a/idea/testData/diagnosticMessage/expectedNothingDueToProjections.kt
+++ b/idea/testData/diagnosticMessage/expectedNothingDueToProjections.kt
@@ -1,5 +1,6 @@
 // !DIAGNOSTICS_NUMBER: 1
 // !DIAGNOSTICS: MEMBER_PROJECTED_OUT
+// !LANGUAGE: -NewInference
 
 fun foo(x: MutableCollection<out CharSequence>) {
     x.add("")
diff --git a/idea/testData/diagnosticMessage/functionPlaceholder.kt b/idea/testData/diagnosticMessage/functionPlaceholder.kt
index 01642366b71..0eba02f207a 100644
--- a/idea/testData/diagnosticMessage/functionPlaceholder.kt
+++ b/idea/testData/diagnosticMessage/functionPlaceholder.kt
@@ -1,5 +1,6 @@
 // !DIAGNOSTICS_NUMBER: 3
 // !DIAGNOSTICS: TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR
+// !LANGUAGE: -NewInference
 
 class A<T, R>
 fun <T, R> foo(a: A<T, R>) = a
diff --git a/idea/testData/diagnosticMessage/noneApplicableCallableReference.kt b/idea/testData/diagnosticMessage/noneApplicableCallableReference.kt
index e52eab6e1a9..50ba4e4d5b6 100644
--- a/idea/testData/diagnosticMessage/noneApplicableCallableReference.kt
+++ b/idea/testData/diagnosticMessage/noneApplicableCallableReference.kt
@@ -1,5 +1,6 @@
 // !DIAGNOSTICS_NUMBER: 1
 // !DIAGNOSTICS: NONE_APPLICABLE
+// !LANGUAGE: -NewInference
 
 fun filterChars(chars: List<Char>, str: String) =
         chars.filter(str::contains)
diff --git a/idea/testData/diagnosticMessage/noneApplicableGeneric.kt b/idea/testData/diagnosticMessage/noneApplicableGeneric.kt
index 8e83f23d270..d0463f370d3 100644
--- a/idea/testData/diagnosticMessage/noneApplicableGeneric.kt
+++ b/idea/testData/diagnosticMessage/noneApplicableGeneric.kt
@@ -1,6 +1,7 @@
 // !DIAGNOSTICS_NUMBER: 1
 // !DIAGNOSTICS: NONE_APPLICABLE
 // !MESSAGE_TYPE: HTML
+// !LANGUAGE: -NewInference
 
 package p
 
diff --git a/idea/testData/diagnosticMessage/numberValueTypes.kt b/idea/testData/diagnosticMessage/numberValueTypes.kt
index 2eaac514059..b2ebb0b7441 100644
--- a/idea/testData/diagnosticMessage/numberValueTypes.kt
+++ b/idea/testData/diagnosticMessage/numberValueTypes.kt
@@ -1,5 +1,6 @@
 // !DIAGNOSTICS_NUMBER: 4
 // !DIAGNOSTICS: TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS
+// !LANGUAGE: -NewInference
 
 package a
 
diff --git a/idea/testData/diagnosticMessage/typeInferenceCannotCaptureTypes.kt b/idea/testData/diagnosticMessage/typeInferenceCannotCaptureTypes.kt
index ab300538f96..ad324862271 100644
--- a/idea/testData/diagnosticMessage/typeInferenceCannotCaptureTypes.kt
+++ b/idea/testData/diagnosticMessage/typeInferenceCannotCaptureTypes.kt
@@ -1,5 +1,6 @@
 // !DIAGNOSTICS_NUMBER: 1
 // !DIAGNOSTICS: TYPE_INFERENCE_CANNOT_CAPTURE_TYPES
+// !LANGUAGE: -NewInference
 
 fun <R : Any> bar(a: Array<R>): Array<R?> =  null!!
 
diff --git a/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch.kt b/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch.kt
index 6a98de49ace..2e1171ed5b6 100644
--- a/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch.kt
+++ b/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch.kt
@@ -1,5 +1,6 @@
 // !DIAGNOSTICS_NUMBER: 3
 // !DIAGNOSTICS: TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH
+// !LANGUAGE: -NewInference
 
 package s
 
diff --git a/idea/testData/diagnosticMessage/typeMismatchDueToProjections.kt b/idea/testData/diagnosticMessage/typeMismatchDueToProjections.kt
index ac21e954fa2..af7406ef662 100644
--- a/idea/testData/diagnosticMessage/typeMismatchDueToProjections.kt
+++ b/idea/testData/diagnosticMessage/typeMismatchDueToProjections.kt
@@ -1,5 +1,6 @@
 // !DIAGNOSTICS_NUMBER: 1
 // !DIAGNOSTICS: TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS
+// !LANGUAGE: -NewInference
 
 fun foo(x: MutableCollection<out CharSequence>, y: MutableCollection<CharSequence>) {
     x.addAll(y)
diff --git a/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsIn.kt b/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsIn.kt
index 05a49515eb6..a178d2d1621 100644
--- a/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsIn.kt
+++ b/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsIn.kt
@@ -1,5 +1,6 @@
 // !DIAGNOSTICS_NUMBER: 1
 // !DIAGNOSTICS: TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS
+// !LANGUAGE: -NewInference
 
 interface A<T>
 interface B<E> {
diff --git a/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsTxt.kt b/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsTxt.kt
index 0a40d6fe677..9bfdf183c4a 100644
--- a/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsTxt.kt
+++ b/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsTxt.kt
@@ -1,6 +1,7 @@
 // !DIAGNOSTICS_NUMBER: 1
 // !DIAGNOSTICS: TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS
 // !MESSAGE_TYPE: TEXT
+// !LANGUAGE: -NewInference
 
 fun foo(x: MutableCollection<out CharSequence>, y: MutableCollection<CharSequence>) {
     x.addAll(y)
diff --git a/idea/testData/diagnosticMessage/typeMismatchWithNothing.kt b/idea/testData/diagnosticMessage/typeMismatchWithNothing.kt
index f6dc03ca339..1a6031b7cf1 100644
--- a/idea/testData/diagnosticMessage/typeMismatchWithNothing.kt
+++ b/idea/testData/diagnosticMessage/typeMismatchWithNothing.kt
@@ -1,5 +1,6 @@
 // !DIAGNOSTICS_NUMBER: 1
 // !DIAGNOSTICS: TYPE_MISMATCH
+// !LANGUAGE: -NewInference
 
 package b
 
diff --git a/idea/testData/diagnosticMessage/upperBoundViolated.kt b/idea/testData/diagnosticMessage/upperBoundViolated.kt
index 1bf033ff2b4..eeab0f8e83e 100644
--- a/idea/testData/diagnosticMessage/upperBoundViolated.kt
+++ b/idea/testData/diagnosticMessage/upperBoundViolated.kt
@@ -1,6 +1,7 @@
 // !DIAGNOSTICS_NUMBER: 3
 // !DIAGNOSTICS: TYPE_INFERENCE_UPPER_BOUND_VIOLATED
 // !MESSAGE_TYPE: TEXT
+// !LANGUAGE: -NewInference
 
 package i
 
diff --git a/idea/testData/diagnosticMessage/upperBoundViolatedInTypeAliasConstructorCall.kt b/idea/testData/diagnosticMessage/upperBoundViolatedInTypeAliasConstructorCall.kt
index 0e890c57a39..e3880b96f51 100644
--- a/idea/testData/diagnosticMessage/upperBoundViolatedInTypeAliasConstructorCall.kt
+++ b/idea/testData/diagnosticMessage/upperBoundViolatedInTypeAliasConstructorCall.kt
@@ -1,6 +1,7 @@
 // !DIAGNOSTICS_NUMBER: 1
 // !DIAGNOSTICS: TYPE_INFERENCE_UPPER_BOUND_VIOLATED
 // !MESSAGE_TYPE: TEXT
+// !LANGUAGE: -NewInference
 
 class Num<Tn : Number>(val x: Tn)
 typealias N<T> = Num<T>