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

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
	compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
	compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentConfiguration.java
	compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
	compiler/tests/org/jetbrains/jet/JetTestUtils.java
	compiler/tests/org/jetbrains/jet/codegen/CompileTextTest.java
This commit is contained in:
pTalanov
2012-05-02 13:39:36 +04:00
parent 3e8624b440 eeafd06cd8
commit 7da1e31eca
120 changed files with 1644 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolwindow.java
+4 -4
View File
@@ -192,9 +192,9 @@ public class ResolveToolwindow extends JPanel implements Disposable {
StringBuilder result = new StringBuilder();
if (debugInfo != null) {
List<? extends ResolutionTask<? extends CallableDescriptor>> resolutionTasks = debugInfo.get(TASKS);
for (ResolutionTask<? extends CallableDescriptor> resolutionTask : resolutionTasks) {
for (ResolvedCallImpl<? extends CallableDescriptor> resolvedCall : resolutionTask.getResolvedCallMap().values()) {
List<? extends ResolutionTask<? extends CallableDescriptor, ?>> resolutionTasks = debugInfo.get(TASKS);
for (ResolutionTask<? extends CallableDescriptor, ?> resolutionTask : resolutionTasks) {
for (ResolvedCallWithTrace<? extends CallableDescriptor> resolvedCall : resolutionTask.getResolvedCalls()) {
renderResolutionLogForCall(debugInfo, resolvedCall, result);
}
}
@@ -212,7 +212,7 @@ public class ResolveToolwindow extends JPanel implements Disposable {
return result.toString();
}
private void renderResolutionLogForCall(Data debugInfo, ResolvedCallImpl<? extends CallableDescriptor> resolvedCall, StringBuilder result) {
private void renderResolutionLogForCall(Data debugInfo, ResolvedCallWithTrace<? extends CallableDescriptor> resolvedCall, StringBuilder result) {
result.append("Trying to call ").append(resolvedCall.getCandidateDescriptor()).append("\n");
StringBuilder errors = debugInfo.getByKey(ERRORS, resolvedCall);
if (errors != null) {