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

Annotate additional files through bytecode toolwindow analysis

Browse Source
This commit is contained in:
Michael Bogdanov
2015-02-19 13:29:49 +03:00
parent ab29c59210
commit 37006ad566
5 changed files with 97 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java
+3 -3
View File
@@ -302,7 +302,7 @@ public class PackageCodegen {
} }
else if (declaration instanceof JetClassOrObject) { else if (declaration instanceof JetClassOrObject) {
JetClassOrObject classOrObject = (JetClassOrObject) declaration; JetClassOrObject classOrObject = (JetClassOrObject) declaration;
if (state.getGenerateDeclaredClassFilter().shouldProcessClass(classOrObject)) { if (state.getGenerateDeclaredClassFilter().shouldGenerateClass(classOrObject)) {
generateClassOrObject(classOrObject); generateClassOrObject(classOrObject);
} }
} }
@@ -310,13 +310,13 @@ public class PackageCodegen {
JetScript script = (JetScript) declaration; JetScript script = (JetScript) declaration;
// SCRIPT: generate script code, should be separate execution branch // SCRIPT: generate script code, should be separate execution branch
if (state.getGenerateDeclaredClassFilter().shouldProcessScript(script)) { if (state.getGenerateDeclaredClassFilter().shouldGenerateScript(script)) {
ScriptCodegen.createScriptCodegen(script, state, packagePartContext).generate(); ScriptCodegen.createScriptCodegen(script, state, packagePartContext).generate();
} }
} }
} }
if (!generatePackagePart) return null; if (!generatePackagePart || !state.getGenerateDeclaredClassFilter().shouldGeneratePackagePart(file)) return null;
ClassBuilder builder = state.getFactory().newVisitor(PackagePart(file, packageFragment), packagePartType, file); ClassBuilder builder = state.getFactory().newVisitor(PackagePart(file, packageFragment), packagePartType, file);
compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java
+2 -2
View File
@@ -207,7 +207,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
@Override @Override
public void visitObjectDeclaration(@NotNull JetObjectDeclaration declaration) { public void visitObjectDeclaration(@NotNull JetObjectDeclaration declaration) {
if (!filter.shouldProcessClass(declaration)) return; if (!filter.shouldAnnotateClass(declaration)) return;
ClassDescriptor classDescriptor = bindingContext.get(CLASS, declaration); ClassDescriptor classDescriptor = bindingContext.get(CLASS, declaration);
// working around a problem with shallow analysis // working around a problem with shallow analysis
@@ -225,7 +225,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
@Override @Override
public void visitClass(@NotNull JetClass klass) { public void visitClass(@NotNull JetClass klass) {
if (!filter.shouldProcessClass(klass)) return; if (!filter.shouldAnnotateClass(klass)) return;
ClassDescriptor classDescriptor = bindingContext.get(CLASS, klass); ClassDescriptor classDescriptor = bindingContext.get(CLASS, klass);
// working around a problem with shallow analysis // working around a problem with shallow analysis
compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java
+16 -4
View File
@@ -43,17 +43,29 @@ import java.util.List;
public class GenerationState { public class GenerationState {
public interface GenerateClassFilter { public interface GenerateClassFilter {
boolean shouldProcessClass(JetClassOrObject classOrObject); boolean shouldAnnotateClass(JetClassOrObject classOrObject);
boolean shouldProcessScript(JetScript script); boolean shouldGenerateClass(JetClassOrObject classOrObject);
boolean shouldGeneratePackagePart(JetFile jetFile);
boolean shouldGenerateScript(JetScript script);
GenerateClassFilter GENERATE_ALL = new GenerateClassFilter() { GenerateClassFilter GENERATE_ALL = new GenerateClassFilter() {
@Override @Override
public boolean shouldProcessClass(JetClassOrObject classOrObject) { public boolean shouldAnnotateClass(JetClassOrObject classOrObject) {
return true; return true;
} }
@Override @Override
public boolean shouldProcessScript(JetScript script) { public boolean shouldGenerateClass(JetClassOrObject classOrObject) {
return true;
}
@Override
public boolean shouldGenerateScript(JetScript script) {
return true;
}
@Override
public boolean shouldGeneratePackagePart(JetFile jetFile) {
return true; return true;
} }
}; };
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java
+26 -4
View File
@@ -110,15 +110,26 @@ public class KotlinJavaFileStubProvider<T extends WithFileStubAndExtraDiagnostic
@Override @Override
public GenerationState.GenerateClassFilter getGenerateClassFilter() { public GenerationState.GenerateClassFilter getGenerateClassFilter() {
return new GenerationState.GenerateClassFilter() { return new GenerationState.GenerateClassFilter() {
@Override @Override
public boolean shouldProcessClass(JetClassOrObject classOrObject) { public boolean shouldGeneratePackagePart(JetFile jetFile) {
return true;
}
@Override
public boolean shouldAnnotateClass(JetClassOrObject classOrObject) {
return shouldGenerateClass(classOrObject);
}
@Override
public boolean shouldGenerateClass(JetClassOrObject classOrObject) {
// Top-level classes and such should not be generated for performance reasons. // Top-level classes and such should not be generated for performance reasons.
// Local classes in top-level functions must still be generated // Local classes in top-level functions must still be generated
return JetPsiUtil.isLocal(classOrObject); return JetPsiUtil.isLocal(classOrObject);
} }
@Override @Override
public boolean shouldProcessScript(JetScript script) { public boolean shouldGenerateScript(JetScript script) {
// Scripts yield top-level classes, and should not be generated // Scripts yield top-level classes, and should not be generated
return false; return false;
} }
@@ -221,8 +232,19 @@ public class KotlinJavaFileStubProvider<T extends WithFileStubAndExtraDiagnostic
@Override @Override
public GenerationState.GenerateClassFilter getGenerateClassFilter() { public GenerationState.GenerateClassFilter getGenerateClassFilter() {
return new GenerationState.GenerateClassFilter() { return new GenerationState.GenerateClassFilter() {
@Override @Override
public boolean shouldProcessClass(JetClassOrObject generatedClassOrObject) { public boolean shouldGeneratePackagePart(JetFile jetFile) {
return true;
}
@Override
public boolean shouldAnnotateClass(JetClassOrObject classOrObject) {
return shouldGenerateClass(classOrObject);
}
@Override
public boolean shouldGenerateClass(JetClassOrObject generatedClassOrObject) {
// Trivial: generate and analyze class we are interested in. // Trivial: generate and analyze class we are interested in.
if (generatedClassOrObject == classOrObject) return true; if (generatedClassOrObject == classOrObject) return true;
@@ -255,7 +277,7 @@ public class KotlinJavaFileStubProvider<T extends WithFileStubAndExtraDiagnostic
} }
@Override @Override
public boolean shouldProcessScript(JetScript script) { public boolean shouldGenerateScript(JetScript script) {
// We generate all enclosing classes // We generate all enclosing classes
return PsiTreeUtil.isAncestor(script, classOrObject, false); return PsiTreeUtil.isAncestor(script, classOrObject, false);
} }
idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java
+50 -10
View File
@@ -28,6 +28,7 @@ import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindow;
import com.intellij.openapi.wm.ToolWindowFactory; import com.intellij.openapi.wm.ToolWindowFactory;
@@ -53,9 +54,7 @@ import org.jetbrains.kotlin.idea.codeInsight.DescriptorToDeclarationUtil;
import org.jetbrains.kotlin.idea.util.InfinitePeriodicalTask; import org.jetbrains.kotlin.idea.util.InfinitePeriodicalTask;
import org.jetbrains.kotlin.idea.util.LongRunningReadTask; import org.jetbrains.kotlin.idea.util.LongRunningReadTask;
import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; import org.jetbrains.kotlin.idea.util.ProjectRootsUtil;
import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.psi.JetElement;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor;
@@ -110,26 +109,58 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
@NotNull @NotNull
@Override @Override
protected String processRequest(@NotNull Location location) { protected String processRequest(@NotNull Location location) {
JetFile jetFile = location.getJetFile(); final JetFile jetFile = location.getJetFile();
assert jetFile != null; assert jetFile != null;
GenerationState state; GenerationState state;
try { try {
AnalysisResult result = ResolvePackage.analyzeFullyAndGetResult(jetFile); AnalysisResult result = ResolvePackage.analyzeFullyAndGetResult(jetFile);
boolean disableInline = !enableInline.isSelected(); boolean disableInline = !enableInline.isSelected();
Ref<Set<JetElement>> ref = new Ref();
if (!disableInline) { if (!disableInline) {
result = processInlinedDeclarations(jetFile.getProject(), result, Collections.<JetElement>singleton(jetFile), 1); result = processInlinedDeclarations(jetFile.getProject(), result, Collections.<JetElement>singleton(jetFile), 1, ref);
} }
if (result.isError()) { if (result.isError()) {
return printStackTraceToString(result.getError()); return printStackTraceToString(result.getError());
} }
Set<JetFile> toProcess = new LinkedHashSet<JetFile>();
toProcess.add(jetFile);
if (ref.get() != null) {
for (JetElement element: ref.get()) {
JetFile file = element.getContainingJetFile();
toProcess.add(file);
}
}
GenerationState.GenerateClassFilter generateClassFilter = new GenerationState.GenerateClassFilter() {
@Override
public boolean shouldGeneratePackagePart(JetFile file) {
return file == jetFile;
}
@Override
public boolean shouldAnnotateClass(JetClassOrObject classOrObject) {
return true;
}
@Override
public boolean shouldGenerateClass(JetClassOrObject classOrObject) {
return classOrObject.getContainingJetFile() == jetFile;
}
@Override
public boolean shouldGenerateScript(JetScript script) {
return script.getContainingJetFile() == jetFile;
}
};
state = new GenerationState(jetFile.getProject(), ClassBuilderFactories.TEST, Progress.DEAF, state = new GenerationState(jetFile.getProject(), ClassBuilderFactories.TEST, Progress.DEAF,
result.getModuleDescriptor(), result.getBindingContext(), result.getModuleDescriptor(), result.getBindingContext(),
Collections.singletonList(jetFile), !enableAssertions.isSelected(), !enableAssertions.isSelected(), new ArrayList<JetFile>(toProcess), !enableAssertions.isSelected(), !enableAssertions.isSelected(),
GenerationState.GenerateClassFilter.GENERATE_ALL, generateClassFilter,
disableInline, !enableOptimization.isSelected(), null, null, disableInline, !enableOptimization.isSelected(), null, null,
DiagnosticSink.DO_NOTHING, null); DiagnosticSink.DO_NOTHING, null);
KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION); KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION);
@@ -154,8 +185,15 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
return answer.toString(); return answer.toString();
} }
private AnalysisResult processInlinedDeclarations(Project project, AnalysisResult result, Set<JetElement> originalElements, int deep) { private AnalysisResult processInlinedDeclarations(
@NotNull Project project,
@NotNull AnalysisResult result,
@NotNull Set<JetElement> originalElements,
int deep,
@NotNull Ref<Set<JetElement>> resultElements
) {
if (deep >= 10 || result.isError()) { if (deep >= 10 || result.isError()) {
resultElements.set(originalElements);
return result; return result;
} }
Set<JetElement> collectedElements = new HashSet<JetElement>(); Set<JetElement> collectedElements = new HashSet<JetElement>();
@@ -177,8 +215,10 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
} }
if (collectedElements.size() != originalElements.size()) { if (collectedElements.size() != originalElements.size()) {
AnalysisResult newResult = KotlinCacheService.getInstance(project).getAnalysisResults(collectedElements); AnalysisResult newResult = KotlinCacheService.getInstance(project).getAnalysisResults(collectedElements);
return processInlinedDeclarations(project, newResult, collectedElements, deep + 1); return processInlinedDeclarations(project, newResult, collectedElements, deep + 1, resultElements);
} }
resultElements.set(collectedElements);
return result; return result;
} }