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

DescriptorSearchRule removed

Browse Source
This commit is contained in:
Andrey Breslav
2014-02-05 02:47:21 +04:00
committed by Alexander Udalov
parent aa0dde3a78
commit 8dc9aecbf8
11 changed files with 11 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java
+2 -4
View File
@@ -49,8 +49,6 @@ import org.jetbrains.jet.renderer.DescriptorRendererBuilder;
import javax.swing.*;
import static org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule.IGNORE_KOTLIN_SOURCES;
public class KotlinSignatureAnnotationIntention extends BaseIntentionAction implements Iconable {
private static final DescriptorRenderer RENDERER = new DescriptorRendererBuilder()
.setShortNames(true)
@@ -136,7 +134,7 @@ public class KotlinSignatureAnnotationIntention extends BaseIntentionAction impl
private static String getDefaultSignature(@NotNull PsiMethod method, FqName classFqName, JavaDescriptorResolver javaDescriptorResolver, BindingContext context) {
if (method.getReturnType() == null) {
// For constructor
ClassDescriptor classDescriptor = javaDescriptorResolver.resolveClass(classFqName, IGNORE_KOTLIN_SOURCES);
ClassDescriptor classDescriptor = javaDescriptorResolver.resolveClass(classFqName);
assert classDescriptor != null: "Couldn't resolve class descriptor for " + classFqName;
classDescriptor.getConstructors();
@@ -192,7 +190,7 @@ public class KotlinSignatureAnnotationIntention extends BaseIntentionAction impl
return packageFragment.getMemberScope();
}
ClassDescriptor classDescriptor = javaDescriptorResolver.resolveClass(classFqName, IGNORE_KOTLIN_SOURCES);
ClassDescriptor classDescriptor = javaDescriptorResolver.resolveClass(classFqName);
assert classDescriptor != null: "Couldn't resolve class descriptor for " + classFqName;
return classDescriptor.getDefaultType().getMemberScope();
}
idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java
+1 -3
View File
@@ -59,8 +59,6 @@ import java.awt.event.MouseEvent;
import java.util.Collection;
import java.util.List;
import static org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule.IGNORE_KOTLIN_SOURCES;
public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider {
private static final String SHOW_MARKERS_PROPERTY = "kotlin.signature.markers.enabled";
@@ -175,7 +173,7 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider {
return packageFragment.getMemberScope();
}
else {
ClassDescriptor klass = javaDescriptorResolver.resolveClass(classFqName, IGNORE_KOTLIN_SOURCES);
ClassDescriptor klass = javaDescriptorResolver.resolveClass(classFqName);
if (klass == null) {
return null;
}
idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
+1 -2
View File
@@ -39,7 +39,6 @@ import java.util.*;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumEntry;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isSyntheticClassObject;
import static org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule.INCLUDE_KOTLIN_SOURCES;
import static org.jetbrains.jet.plugin.libraries.JetDecompiledData.descriptorToKey;
public final class DecompiledDataFactory {
@@ -96,7 +95,7 @@ public final class DecompiledDataFactory {
}
}
else if (kind == KotlinClassHeader.Kind.CLASS) {
ClassDescriptor cd = javaDescriptorResolver.resolveClass(classFqName, INCLUDE_KOTLIN_SOURCES);
ClassDescriptor cd = javaDescriptorResolver.resolveClass(classFqName);
if (cd != null) {
appendDescriptor(cd, "");
}
idea/tests/org/jetbrains/jet/plugin/ktSignature/SignatureMarkerProviderTest.java
+1 -3
View File
@@ -33,8 +33,6 @@ import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
import org.jetbrains.jet.plugin.caches.resolve.KotlinCacheManager;
import org.jetbrains.jet.plugin.project.TargetPlatform;
import static org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule.IGNORE_KOTLIN_SOURCES;
public class SignatureMarkerProviderTest extends LightCodeInsightFixtureTestCase {
@NotNull
@@ -57,7 +55,7 @@ public class SignatureMarkerProviderTest extends LightCodeInsightFixtureTestCase
InjectorForJavaDescriptorResolver injector =
InjectorForJavaDescriptorResolverUtil.create(project, KotlinSignatureInJavaMarkerProvider.createDelegatingTrace(project));
ClassDescriptor reResolvedClass = injector.getJavaDescriptorResolver()
.resolveClass(new FqName("java.lang.Thread"), IGNORE_KOTLIN_SOURCES);
.resolveClass(new FqName("java.lang.Thread"));
assertSame(preResolvedClass, reResolvedClass);
}