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

merged with Andrey's changes

Browse Source
This commit is contained in:
James Strachan
2012-03-29 16:40:44 +01:00
parent beedd36456
commit d76454ce08
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java
+1 -5
View File
@@ -165,14 +165,10 @@ public class KotlinCompiler {
environment.setStubs(arguments.stubs); environment.setStubs(arguments.stubs);
if (arguments.docOutputDir != null) {
KDocLoader.install(arguments.docOutputDir, environment.getMyEnvironment());
}
// install any compiler plugins // install any compiler plugins
List<CompilerPlugin> plugins = arguments.getCompilerPlugins(); List<CompilerPlugin> plugins = arguments.getCompilerPlugins();
if (plugins != null) { if (plugins != null) {
environment.getMyEnvironment().getCompilerPlugins().addAll(plugins); environment.getEnvironment().getCompilerPlugins().addAll(plugins);
} }
if (arguments.stdlib != null) { if (arguments.stdlib != null) {
compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java
+2 -1
View File
@@ -221,8 +221,9 @@ public class CompileSession {
List<CompilerPlugin> plugins = environment.getCompilerPlugins(); List<CompilerPlugin> plugins = environment.getCompilerPlugins();
if (!module) { if (!module) {
if (plugins != null) { if (plugins != null) {
CompilerPluginContext context = new CompilerPluginContext(project, bindingContext.getBindingContext(), getSourceFileNamespaces());
for (CompilerPlugin plugin : plugins) { for (CompilerPlugin plugin : plugins) {
plugin.processFiles(bindingContext.getBindingContext(), getSourceFileNamespaces()); plugin.processFiles(context);
} }
} }
} }