azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added default implementation for ExternalAnnotationsProvider to be used in compiler.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-06-27 00:42:40 +04:00
parent cf1756aad3
commit d64a7397b3
6 changed files with 1104 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
+5
View File
@@ -33,6 +33,8 @@ import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.java.CompilerDependencies;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.lang.resolve.java.JetFilesProvider;
import org.jetbrains.jet.lang.resolve.java.extAnnotations.CoreAnnotationsProvider;
import org.jetbrains.jet.lang.resolve.java.extAnnotations.ExternalAnnotationsProvider;
import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
import org.jetbrains.jet.plugin.JetFileType;
@@ -91,6 +93,9 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
addLibraryRoot(root);
}
}
ExternalAnnotationsProvider.setInstance(new CoreAnnotationsProvider());
if (compilerSpecialMode.includeKotlinRuntime()) {
addToClasspath(compilerDependencies.getRuntimeJar());
}