From 35fa4eadd8fcf0dc5e188e693aca01814cf63e58 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 17 Jun 2015 14:43:32 +0300 Subject: [PATCH] Attach ideaSDK/jdkAnnotations.jar to external annotations for intention tests As they're always attached to real SDKs in real projects --- .../src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java index dce1d3fd6f7..99823c8eea8 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.test; import com.intellij.openapi.projectRoots.JavaSdk; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.SdkModificator; +import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.roots.AnnotationOrderRootType; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.JarFileSystem; @@ -43,6 +44,7 @@ public class PluginTestCaseBase { private static Sdk getSdk(String sdkHome) { Sdk sdk = JavaSdk.getInstance().createJdk("JDK", sdkHome, true); SdkModificator modificator = sdk.getSdkModificator(); + JavaSdkImpl.attachJdkAnnotations(modificator); VirtualFile file = LocalFileSystem.getInstance().findFileByIoFile(JetTestUtils.getJdkAnnotationsJar()); assert file != null; modificator.addRoot(JarFileSystem.getInstance().getJarRootForLocalFile(file), AnnotationOrderRootType.getInstance());