From 287443cab94743b7efe289597357c4033f40ac12 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 23 May 2017 18:22:36 +0300
Subject: [PATCH] Add not-null annotation to avoid warnings on
 getProjectDescriptor()

---
 .../test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java  | 5 +++++
 .../kotlin/idea/test/ProjectDescriptorWithStdlibSources.java | 1 +
 2 files changed, 6 insertions(+)

diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java
index 12bcbbdfa3b..66f1c1ace72 100644
--- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java
+++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java
@@ -34,11 +34,16 @@ public class KotlinWithJdkAndRuntimeLightProjectDescriptor extends KotlinJdkAndL
         super(libraryFiles);
     }
 
+    @NotNull
     public static final KotlinWithJdkAndRuntimeLightProjectDescriptor INSTANCE = new KotlinWithJdkAndRuntimeLightProjectDescriptor();
+
+    @NotNull
     public static final KotlinWithJdkAndRuntimeLightProjectDescriptor INSTANCE_WITH_KOTLIN_TEST = new KotlinWithJdkAndRuntimeLightProjectDescriptor(
             Arrays.asList(ForTestCompileRuntime.runtimeJarForTests(),
                           PathUtil.getKotlinPathsForDistDirectory().getKotlinTestPath())
     );
+
+    @NotNull
     public static final KotlinWithJdkAndRuntimeLightProjectDescriptor INSTANCE_FULL_JDK = new KotlinWithJdkAndRuntimeLightProjectDescriptor() {
         @Override
         public Sdk getSdk() {
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java
index ac2030647c8..f81d41fb59f 100644
--- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java
+++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java
@@ -26,6 +26,7 @@ import org.jetbrains.annotations.NotNull;
 import java.io.File;
 
 public class ProjectDescriptorWithStdlibSources extends KotlinWithJdkAndRuntimeLightProjectDescriptor {
+    @NotNull
     public static final ProjectDescriptorWithStdlibSources INSTANCE = new ProjectDescriptorWithStdlibSources();
 
     @Override