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

again: do not include jdk headers when compiling jdk headers

Browse Source
This commit is contained in:
Stepan Koltsov
2012-04-08 02:08:25 +04:00
parent 74e0bd85f5
commit 4aec67a1c6
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java
+1
View File
@@ -68,6 +68,7 @@ public class InjectorForJavaSemanticServices {
javaBridgeConfiguration.setMode(compilerSpecialMode);
javaBridgeConfiguration.setProject(project);
this.psiClassFinderForJvm.setCompilerSpecialMode(compilerSpecialMode);
this.psiClassFinderForJvm.setProject(project);
javaTypeTransformer.setJavaSemanticServices(javaSemanticServices);
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+1
View File
@@ -144,6 +144,7 @@ public class InjectorForTopDownAnalyzerForJvm {
this.javaBridgeConfiguration.setMode(compilerSpecialMode);
this.javaBridgeConfiguration.setProject(project);
psiClassFinderForJvm.setCompilerSpecialMode(compilerSpecialMode);
psiClassFinderForJvm.setProject(project);
declarationResolver.setAnnotationResolver(annotationResolver);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java
+13 -2
View File
@@ -33,25 +33,36 @@ import org.jetbrains.jet.utils.PathUtil;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import java.util.Collections;
/**
* @author Stepan Koltsov
*/
public class PsiClassFinderForJvm implements PsiClassFinder {
@NotNull
private Project project;
@NotNull
private CompilerSpecialMode compilerSpecialMode;
private AltClassFinder altClassFinder;
private GlobalSearchScope javaSearchScope;
private JavaPsiFacade javaFacade;
@Inject
public void setProject(Project project) {
public void setProject(@NotNull Project project) {
this.project = project;
}
@Inject
public void setCompilerSpecialMode(@NotNull CompilerSpecialMode compilerSpecialMode) {
this.compilerSpecialMode = compilerSpecialMode;
}
@PostConstruct
public void initialize() {
this.altClassFinder = new AltClassFinder(project, PathUtil.getAltHeadersRoots());
this.altClassFinder = new AltClassFinder(project,
compilerSpecialMode == CompilerSpecialMode.REGULAR ? PathUtil.getAltHeadersRoots() : Collections.<VirtualFile>emptyList());
this.javaSearchScope = new DelegatingGlobalSearchScope(GlobalSearchScope.allScope(project)) {
@Override
public boolean contains(VirtualFile file) {