diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java index 402e89bbecb..d17cc7b2f7c 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java @@ -109,7 +109,7 @@ public class RangeCodegenUtil { // Must be a standard library class return null; } - return map.get(DescriptorUtils.getFQName(declarationDescriptor).toSafe()); + return map.get(DescriptorUtils.getFqName(declarationDescriptor).toSafe()); } public static boolean isOptimizableRangeTo(CallableDescriptor rangeTo) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java index a8dcece4ca7..4ac13d93f09 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java @@ -16,7 +16,6 @@ package org.jetbrains.jet.codegen; -import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.asm4.MethodVisitor; @@ -136,6 +135,7 @@ public class SamWrapperCodegen extends ParentCodegenAwareImpl { FqName packageClassFqName = PackageClassUtils.getPackageClassFqName(JetPsiUtil.getFQName(containingFile)); String packageInternalName = JvmClassName.byFqNameWithoutInnerClasses(packageClassFqName).getInternalName(); return packageInternalName + "$sam$" + samInterface.getName().asString() + "$" + - Integer.toHexString(CodegenUtil.getPathHashCode(containingFile.getVirtualFile()) * 31 + DescriptorUtils.getFQName(samInterface).hashCode()); + Integer.toHexString(CodegenUtil.getPathHashCode(containingFile.getVirtualFile()) * 31 + DescriptorUtils.getFqName( + samInterface).hashCode()); } } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java index ce6012fa41a..a6a62595553 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java @@ -138,7 +138,7 @@ public class IntrinsicMethods { declareIntrinsicProperty(Name.identifier("CharSequence"), Name.identifier("length"), new StringLength()); declareIntrinsicProperty(Name.identifier("String"), Name.identifier("length"), new StringLength()); - registerStaticField(getFQName(KotlinBuiltIns.getInstance().getUnit()).toSafe(), Name.identifier("VALUE")); + registerStaticField(getFqName(KotlinBuiltIns.getInstance().getUnit()).toSafe(), Name.identifier("VALUE")); for (PrimitiveType type : PrimitiveType.NUMBER_TYPES) { FqName rangeClassFqName = RangeCodegenUtil.getRangeClassFqName(type); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicsMap.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicsMap.java index 149f1fc5f3a..4b6e948bb97 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicsMap.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicsMap.java @@ -97,7 +97,7 @@ class IntrinsicsMap { @Nullable public IntrinsicMethod getIntrinsic(@NotNull CallableMemberDescriptor descriptor) { Key key = new Key( - DescriptorUtils.getFQName(descriptor.getContainingDeclaration()), + DescriptorUtils.getFqName(descriptor.getContainingDeclaration()), descriptor.getName(), valueParameterCountForKey(descriptor)); return intrinsicsMap.get(key); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java index d12e5be7231..d1fb957b408 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java @@ -233,7 +233,7 @@ public class JetTypeMapper extends BindingTraceAware { DeclarationDescriptor descriptor = jetType.getConstructor().getDeclarationDescriptor(); if (descriptor instanceof ClassDescriptor) { - FqNameUnsafe className = DescriptorUtils.getFQName(descriptor); + FqNameUnsafe className = DescriptorUtils.getFqName(descriptor); if (className.isSafe()) { known = KotlinToJavaTypesMap.getInstance().getJavaAnalog(className.toSafe(), jetType.isNullable()); } diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java b/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java index e2b39276a52..2b9c81ed368 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java @@ -104,7 +104,7 @@ public final class AnalyzerWithCompilerReport { if (!incompletes.isEmpty()) { StringBuilder message = new StringBuilder("The following classes have incomplete hierarchies:\n"); for (ClassDescriptor incomplete : incompletes) { - String fqName = DescriptorUtils.getFQName(incomplete).asString(); + String fqName = DescriptorUtils.getFqName(incomplete).asString(); message.append(" ").append(fqName).append("\n"); } messageCollectorWrapper.report(CompilerMessageSeverity.ERROR, message.toString(), CompilerMessageLocation.NO_LOCATION); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java index 74b0020a3fc..8077575565d 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java @@ -51,7 +51,7 @@ import org.jetbrains.jet.renderer.DescriptorRenderer; import java.util.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFQName; +import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; import static org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage.*; import static org.jetbrains.jet.lang.types.Variance.INVARIANT; @@ -169,7 +169,7 @@ public class SignaturesPropagationData { ) { assert receiverType == null : "Parameters before propagation have receiver type," + " but propagation should be disabled for functions compiled from Kotlin in class: " + - DescriptorUtils.getFQName(containingClass); + DescriptorUtils.getFqName(containingClass); JetType resultReceiverType = null; List resultParameters = Lists.newArrayList(); @@ -260,8 +260,8 @@ public class SignaturesPropagationData { Collections.sort(superFunctions, new Comparator() { @Override public int compare(FunctionDescriptor fun1, FunctionDescriptor fun2) { - FqNameUnsafe fqName1 = getFQName(fun1.getContainingDeclaration()); - FqNameUnsafe fqName2 = getFQName(fun2.getContainingDeclaration()); + FqNameUnsafe fqName1 = getFqName(fun1.getContainingDeclaration()); + FqNameUnsafe fqName2 = getFqName(fun2.getContainingDeclaration()); return fqName1.asString().compareTo(fqName2.asString()); } }); @@ -282,7 +282,7 @@ public class SignaturesPropagationData { for (JetType supertype : TypeUtils.getAllSupertypes(containingClass.getDefaultType())) { ClassifierDescriptor klass = supertype.getConstructor().getDeclarationDescriptor(); assert klass != null; - FqName fqName = DescriptorUtils.getFQName(klass).toSafe(); + FqName fqName = DescriptorUtils.getFqName(klass).toSafe(); for (FunctionDescriptor fun : klass.getDefaultType().getMemberScope().getFunctions(functionName)) { CallableMemberDescriptor.Kind kind = fun.getKind(); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java index e25c868efd5..9d46a4bed91 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java @@ -98,7 +98,7 @@ public class TypeTransformingVisitor extends JetVisitor { } private JetType visitCommonType(@NotNull ClassDescriptor classDescriptor, @NotNull JetTypeElement type) { - return visitCommonType(DescriptorUtils.getFQName(classDescriptor).toSafe().asString(), type); + return visitCommonType(DescriptorUtils.getFqName(classDescriptor).toSafe().asString(), type); } @NotNull @@ -109,7 +109,7 @@ public class TypeTransformingVisitor extends JetVisitor { TypeConstructor originalTypeConstructor = originalType.getConstructor(); ClassifierDescriptor declarationDescriptor = originalTypeConstructor.getDeclarationDescriptor(); assert declarationDescriptor != null; - FqName originalClassFqName = DescriptorUtils.getFQName(declarationDescriptor).toSafe(); + FqName originalClassFqName = DescriptorUtils.getFqName(declarationDescriptor).toSafe(); ClassDescriptor classFromLibrary = getAutoTypeAnalogWithinBuiltins(originalClassFqName, qualifiedName); if (!isSameName(qualifiedName, originalClassFqName.asString()) && classFromLibrary == null) { throw new AlternativeSignatureMismatchException("Alternative signature type mismatch, expected: %s, actual: %s", @@ -191,7 +191,7 @@ public class TypeTransformingVisitor extends JetVisitor { if (altProjectionKind == parameter.getVariance()) { if (strictMode) { throw new AlternativeSignatureMismatchException("Projection kind '%s' is redundant", - altProjectionKind, DescriptorUtils.getFQName(typeConstructor.getDeclarationDescriptor())); + altProjectionKind, DescriptorUtils.getFqName(typeConstructor.getDeclarationDescriptor())); } else { altProjectionKind = projectionKind; @@ -199,7 +199,7 @@ public class TypeTransformingVisitor extends JetVisitor { } else { throw new AlternativeSignatureMismatchException("Projection kind '%s' is conflicting with variance of %s", - altProjectionKind, DescriptorUtils.getFQName(typeConstructor.getDeclarationDescriptor())); + altProjectionKind, DescriptorUtils.getFqName(typeConstructor.getDeclarationDescriptor())); } } } @@ -216,7 +216,7 @@ public class TypeTransformingVisitor extends JetVisitor { Collection descriptors = JavaToKotlinClassMap.getInstance().mapPlatformClass(javaFqName); for (ClassDescriptor descriptor : descriptors) { - String fqName = DescriptorUtils.getFQName(descriptor).asString(); + String fqName = DescriptorUtils.getFqName(descriptor).asString(); if (isSameName(qualifiedName, fqName)) { return descriptor; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java index 04ba23b0b93..1ae07c127b2 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java @@ -97,7 +97,7 @@ public class KotlinToJavaTypesMap extends JavaToKotlinClassMapBuilder { @Override protected void register(@NotNull Class javaClass, @NotNull ClassDescriptor kotlinDescriptor, @NotNull Direction direction) { if (direction == Direction.BOTH || direction == Direction.KOTLIN_TO_JAVA) { - FqNameUnsafe fqNameUnsafe = DescriptorUtils.getFQName(kotlinDescriptor); + FqNameUnsafe fqNameUnsafe = DescriptorUtils.getFqName(kotlinDescriptor); assert fqNameUnsafe.isSafe() : "FQ name of a mapped class should be safe: " + fqNameUnsafe; FqName fqName = fqNameUnsafe.toSafe(); register(fqName, AsmTypeConstants.getType(javaClass)); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java index bdfd1c70e05..15910b09c0d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java @@ -312,7 +312,7 @@ public class Renderers { StringBuilder sb = new StringBuilder(); int index = 0; for (ClassDescriptor descriptor : descriptors) { - sb.append(DescriptorUtils.getFQName(descriptor).asString()); + sb.append(DescriptorUtils.getFqName(descriptor).asString()); index++; if (index <= descriptors.size() - 2) { sb.append(", "); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationUtils.java index baf18799387..1c16a287cfd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationUtils.java @@ -126,7 +126,7 @@ public class AnnotationUtils { } public static boolean isJavaLangClass(ClassDescriptor descriptor) { - return "java.lang.Class".equals(DescriptorUtils.getFQName(descriptor).asString()); + return "java.lang.Class".equals(DescriptorUtils.getFqName(descriptor).asString()); } private AnnotationUtils() { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java index 91fe6ff903d..06d6cfb08a6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java @@ -34,7 +34,7 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFQName; +import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; public class OverloadResolver { private TopDownAnalysisContext context; @@ -83,7 +83,7 @@ public class OverloadResolver { inClasses.put(classDescriptor, klass.getConstructors()); } else if (containingDeclaration instanceof PackageFragmentDescriptor) { - inPackages.put(getFQName(klass), klass.getConstructors()); + inPackages.put(getFqName(klass), klass.getConstructors()); } else if (!(containingDeclaration instanceof FunctionDescriptor)) { throw new IllegalStateException(); @@ -97,13 +97,13 @@ public class OverloadResolver { for (SimpleFunctionDescriptor function : context.getFunctions().values()) { if (function.getContainingDeclaration() instanceof PackageFragmentDescriptor) { - functionsByName.putValue(getFQName(function), function); + functionsByName.putValue(getFqName(function), function); } } for (PropertyDescriptor property : context.getProperties().values()) { if (property.getContainingDeclaration() instanceof PackageFragmentDescriptor) { - functionsByName.putValue(getFQName(property), property); + functionsByName.putValue(getFqName(property), property); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java index 4100e141cf3..988fb37ea5d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java @@ -402,7 +402,7 @@ public class QualifiedExpressionResolver { } if (packageView != null && classDescriptor != null) { - if (DescriptorUtils.getFQName(packageView).equalsTo(DescriptorUtils.getFQName(classDescriptor))) { + if (DescriptorUtils.getFqName(packageView).equalsTo(DescriptorUtils.getFqName(classDescriptor))) { trace.record(BindingContext.REFERENCE_TARGET, referenceExpression, classDescriptor); trace.record(BindingContext.RESOLUTION_SCOPE, referenceExpression, resolutionScope); checkVisibility(classDescriptor, trace, referenceExpression, scopeToCheckVisibility); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java index e2187835e6f..08bfc08fc50 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -346,7 +346,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDesc new Function0>() { @Override public Collection invoke() { - if (resolveSession.isClassSpecial(DescriptorUtils.getFQName(LazyClassDescriptor.this))) { + if (resolveSession.isClassSpecial(DescriptorUtils.getFqName(LazyClassDescriptor.this))) { return Collections.emptyList(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageMemberScope.java index 8fe66f04b85..4e5b3fd14ab 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageMemberScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageMemberScope.java @@ -24,7 +24,6 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider; -import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; @@ -48,7 +47,7 @@ public class LazyPackageMemberScope extends AbstractLazyMemberScope argument = annotation.getAllValueArguments().values().iterator().next(); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java index ec45e345fca..e5a68535fe2 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java @@ -188,7 +188,7 @@ public class JdkAnnotationsValidityTest extends UsefulTestCase { @Override public Void visitClassDescriptor(ClassDescriptor descriptor, Void data) { // skip java.util.Collection, etc. - if (!JavaToKotlinClassMap.getInstance().mapPlatformClass(DescriptorUtils.getFQName(descriptor).toSafe()).isEmpty()) { + if (!JavaToKotlinClassMap.getInstance().mapPlatformClass(DescriptorUtils.getFqName(descriptor).toSafe()).isEmpty()) { return null; } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMap.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMap.java index 484ef887a4a..c55e5d2e534 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMap.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMap.java @@ -172,7 +172,7 @@ public class JavaToKotlinClassMap extends JavaToKotlinClassMapBuilder implements @Override @NotNull public Collection mapPlatformClass(@NotNull ClassDescriptor classDescriptor) { - FqNameUnsafe className = DescriptorUtils.getFQName(classDescriptor); + FqNameUnsafe className = DescriptorUtils.getFqName(classDescriptor); if (!className.isSafe()) { return Collections.emptyList(); } @@ -182,7 +182,7 @@ public class JavaToKotlinClassMap extends JavaToKotlinClassMapBuilder implements @Override @NotNull public Collection mapPlatformClassesInside(@NotNull DeclarationDescriptor containingDeclaration) { - FqNameUnsafe fqName = DescriptorUtils.getFQName(containingDeclaration); + FqNameUnsafe fqName = DescriptorUtils.getFqName(containingDeclaration); if (!fqName.isSafe()) { return Collections.emptyList(); } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java index 83a0bf09dd9..dd6c527cb3c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java @@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.types.TypeSubstitutor; import java.util.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFQName; +import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumClassObject; public final class DescriptorResolverUtils { @@ -338,7 +338,7 @@ public final class DescriptorResolverUtils { "java class " + javaClass + " is under non-java fragment: " + packageFragment; JavaPackageFragmentProvider provider = ((JavaPackageFragmentDescriptor) packageFragment).getProvider(); - return provider.getOrCreatePackage(getFQName(javaClass).toSafe()); + return provider.getOrCreatePackage(getFqName(javaClass).toSafe()); } public static boolean isJavaClassVisibleAsPackage(@NotNull JavaClass javaClass) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java index 7395ea06772..97a98f5037d 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java @@ -320,7 +320,7 @@ public final class JavaClassResolver { FqName containerFqName = methodContainer.getFqName(); assert containerFqName != null : "qualified name is null for " + methodContainer; - if (DescriptorUtils.getFQName(samInterface).equalsTo(containerFqName)) { + if (DescriptorUtils.getFqName(samInterface).equalsTo(containerFqName)) { SimpleFunctionDescriptor abstractMethod = functionResolver.resolveFunctionMutely(samInterfaceMethod, samInterface); assert abstractMethod != null : "couldn't resolve method " + samInterfaceMethod; return abstractMethod; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java index 753eb5ef96d..3c3127b81e5 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java @@ -111,7 +111,7 @@ public class TypeParameterDescriptorImpl extends DeclarationDescriptorNonRootImp } private String nameForAssertions() { - return getName() + " declared in " + DescriptorUtils.getFQName(getContainingDeclaration()); + return getName() + " declared in " + DescriptorUtils.getFqName(getContainingDeclaration()); } public void setInitialized() { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java index 9733d8527ac..873bf9e7d42 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java @@ -109,7 +109,7 @@ public class DescriptorUtils { } @NotNull - public static FqNameUnsafe getFQName(@NotNull DeclarationDescriptor descriptor) { + public static FqNameUnsafe getFqName(@NotNull DeclarationDescriptor descriptor) { DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration(); if (descriptor instanceof ModuleDescriptor || ErrorUtils.isError(descriptor)) { @@ -126,10 +126,10 @@ public class DescriptorUtils { if (containingDeclaration instanceof ClassDescriptor && ((ClassDescriptor) containingDeclaration).getKind() == ClassKind.CLASS_OBJECT) { DeclarationDescriptor classOfClassObject = containingDeclaration.getContainingDeclaration(); assert classOfClassObject != null; - return getFQName(classOfClassObject).child(descriptor.getName()); + return getFqName(classOfClassObject).child(descriptor.getName()); } - return getFQName(containingDeclaration).child(descriptor.getName()); + return getFqName(containingDeclaration).child(descriptor.getName()); } public static boolean isTopLevelDeclaration(@NotNull DeclarationDescriptor descriptor) { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/descriptorUtils.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/descriptorUtils.kt index dc30149567f..df7e888d24f 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/descriptorUtils.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/descriptorUtils.kt @@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor public fun ClassDescriptor.checkSuperTypeByFQName(qualifiedName: String, deep: Boolean): Boolean { fun checkDescriptor(descriptor: DeclarationDescriptor): Boolean { - return qualifiedName == DescriptorUtils.getFQName(descriptor).asString() + return qualifiedName == DescriptorUtils.getFqName(descriptor).asString() } if (deep && checkDescriptor(this)) return true diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java index 380af1cc673..0070eff492b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java @@ -30,8 +30,8 @@ public interface RedeclarationHandler { @Override public void handleRedeclaration(@NotNull DeclarationDescriptor first, @NotNull DeclarationDescriptor second) { throw new IllegalStateException( - String.format("Redeclaration: %s (%s) and %s (%s) (no line info available)", DescriptorUtils.getFQName(first), first, - DescriptorUtils.getFQName(second), second) + String.format("Redeclaration: %s (%s) and %s (%s) (no line info available)", DescriptorUtils.getFqName(first), first, + DescriptorUtils.getFqName(second), second) ); } }; diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java index e9d39378d52..9ea5e8503fd 100644 --- a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java @@ -197,7 +197,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer { Collections.reverse(qualifiedNameElements); return renderFqName(qualifiedNameElements); } - return renderFqName(DescriptorUtils.getFQName(klass)); + return renderFqName(DescriptorUtils.getFqName(klass)); } /* TYPES RENDERING */ @@ -299,7 +299,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer { DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration(); if (containingDeclaration != null) { - FqNameUnsafe fqName = DescriptorUtils.getFQName(containingDeclaration); + FqNameUnsafe fqName = DescriptorUtils.getFqName(containingDeclaration); builder.append(FqName.ROOT.equalsTo(fqName) ? "root package" : renderFqName(fqName)); } } @@ -310,7 +310,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer { ClassDescriptor annotationClass = (ClassDescriptor) annotation.getType().getConstructor().getDeclarationDescriptor(); assert annotationClass != null; - if (!excludedAnnotationClasses.contains(DescriptorUtils.getFQName(annotationClass).toSafe())) { + if (!excludedAnnotationClasses.contains(DescriptorUtils.getFqName(annotationClass).toSafe())) { builder.append(renderType(annotation.getType())); if (verbose) { builder.append("(").append(StringUtil.join(DescriptorUtils.getSortedValueArguments(annotation, this), ", ")).append(")"); diff --git a/generators/src/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMap.java b/generators/src/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMap.java index aa130251e0b..eaa42b7a2fb 100644 --- a/generators/src/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMap.java +++ b/generators/src/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMap.java @@ -228,7 +228,7 @@ public class GenerateJavaToKotlinMethodMap { private void appendBeforeClass(@NotNull ClassDescriptor kotlinClass, @NotNull PsiClass psiClass) { String psiFqName = psiClass.getQualifiedName(); - String kotlinFqName = DescriptorUtils.getFQName(kotlinClass).toSafe().asString(); + String kotlinFqName = DescriptorUtils.getFqName(kotlinClass).toSafe().asString(); assert kotlinFqName.startsWith(BUILTINS_FQNAME_PREFIX); String kotlinSubQualifiedName = kotlinFqName.substring(BUILTINS_FQNAME_PREFIX.length()); diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ReferenceToClassesShortening.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ReferenceToClassesShortening.java index 37a16fd7dab..a3a57f09265 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ReferenceToClassesShortening.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ReferenceToClassesShortening.java @@ -71,7 +71,7 @@ public class ReferenceToClassesShortening { compactReferenceToClass(userType, targetClass); } else if (classifier == null) { - ImportInsertHelper.addImportDirectiveIfNeeded(DescriptorUtils.getFQName(targetTopLevelClass).toSafe(), file); + ImportInsertHelper.addImportDirectiveIfNeeded(DescriptorUtils.getFqName(targetTopLevelClass).toSafe(), file); compactReferenceToClass(userType, targetClass); } else { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java b/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java index 8b823a92dc4..3db7ce15d6d 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java @@ -76,7 +76,7 @@ public final class DescriptorLookupConverter { DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration(); if (containingDeclaration != null && extensionFunction) { tailText += " for " + DescriptorRenderer.TEXT.renderType(functionDescriptor.getReceiverParameter().getType()); - tailText += " in " + DescriptorUtils.getFQName(containingDeclaration); + tailText += " in " + DescriptorUtils.getFqName(containingDeclaration); } } else if (descriptor instanceof VariableDescriptor) { @@ -86,7 +86,7 @@ public final class DescriptorLookupConverter { else if (descriptor instanceof ClassDescriptor) { DeclarationDescriptor declaredIn = descriptor.getContainingDeclaration(); assert declaredIn != null; - tailText = " (" + DescriptorUtils.getFQName(declaredIn) + ")"; + tailText = " (" + DescriptorUtils.getFqName(declaredIn) + ")"; tailTextGrayed = true; } else { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/SmartCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/SmartCompletion.kt index b621623e123..1f29eeb5367 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/SmartCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/SmartCompletion.kt @@ -282,7 +282,7 @@ private fun staticMembers(context: JetExpression, expectedType: JetType, resolve var builder = LookupElementBuilder.create(lookupElement.getObject(), classDescriptor.getName().asString() + "." + lookupElement.getLookupString()) .withIcon(presentation.getIcon()) .withStrikeoutness(presentation.isStrikeout()) - .withTailText(" (" + DescriptorUtils.getFQName(classDescriptor.getContainingDeclaration()) + ")") + .withTailText(" (" + DescriptorUtils.getFqName(classDescriptor.getContainingDeclaration()) + ")") .withTypeText(if (!presentation.getTypeText().isNullOrEmpty()) presentation.getTypeText() else diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java index f9504ad686e..b57a1764550 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java @@ -54,7 +54,7 @@ public class JetClassInsertHandler implements InsertHandler { DeclarationDescriptor descriptor = lookupObject.getDescriptor(); PsiElement targetElement = lookupObject.getPsiElement(); if (descriptor != null) { - FqName fqn = DescriptorUtils.getFQName(descriptor).toSafe(); + FqName fqn = DescriptorUtils.getFqName(descriptor).toSafe(); // TODO: Find out the way for getting psi element for JS libs if (targetElement != null) { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.kt index b94562337e4..2f4cec59e55 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.kt @@ -177,7 +177,7 @@ public class JetFunctionInsertHandler(val caretPosition : CaretPosition, val bra if (DescriptorUtils.isTopLevelDeclaration(functionDescriptor)) { ApplicationManager.getApplication()?.runWriteAction { - val fqn = DescriptorUtils.getFQName(functionDescriptor).toSafe() + val fqn = DescriptorUtils.getFqName(functionDescriptor).toSafe() ImportInsertHelper.addImportDirectiveIfNeeded(fqn, file) } } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetDeclarationRemotenessWeigher.java b/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetDeclarationRemotenessWeigher.java index 49b259bca3a..9b101104bd4 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetDeclarationRemotenessWeigher.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/weigher/JetDeclarationRemotenessWeigher.java @@ -63,7 +63,7 @@ public class JetDeclarationRemotenessWeigher extends LookupElementWeigher { DeclarationDescriptor descriptor = lookupObject.getDescriptor(); if (descriptor != null) { - FqNameUnsafe fqName = DescriptorUtils.getFQName(descriptor); + FqNameUnsafe fqName = DescriptorUtils.getFqName(descriptor); // Invalid name can be met for class object descriptor: Test.MyTest.A..testOther if (QualifiedNamesUtil.isValidJavaFqName(fqName.toString())) { ImportPath importPath = new ImportPath(fqName.toString()); diff --git a/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java b/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java index 23cef18cf00..15ba72d9981 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java +++ b/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java @@ -36,7 +36,6 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache; -import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; import org.jetbrains.jet.util.QualifiedNamesUtil; import java.util.*; @@ -184,7 +183,7 @@ public class JetImportOptimizer implements ImportOptimizer { private void addResolvedCallFqName(@Nullable ResolvedCall resolvedCall) { if (resolvedCall != null) { CallableDescriptor resultingDescriptor = resolvedCall.getResultingDescriptor(); - FqNameUnsafe name = DescriptorUtils.getFQName(resultingDescriptor); + FqNameUnsafe name = DescriptorUtils.getFqName(resultingDescriptor); assert name.isSafe(): "FqName for resulting descriptor should be safe " + resultingDescriptor.getName(); usedQualifiedNames.add(name.toSafe()); } diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java index 54f6078c7f3..2dba4a48ec8 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java @@ -247,7 +247,7 @@ public class DeprecatedAnnotationVisitor extends AfterAnalysisHighlightingVisito private static String getDescriptorString(@NotNull DeclarationDescriptor descriptor) { if (descriptor instanceof ClassDescriptor) { - return DescriptorUtils.getFQName(descriptor).asString(); + return DescriptorUtils.getFqName(descriptor).asString(); } else if (descriptor instanceof ConstructorDescriptor) { DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration(); diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java b/idea/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java index 1d4ada26894..d0dafece135 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java @@ -164,7 +164,7 @@ public class IdeRenderers { stringBuilder.append(" defined in "); DeclarationDescriptor containingDeclaration = funDescriptor.getContainingDeclaration(); if (containingDeclaration != null) { - FqNameUnsafe fqName = DescriptorUtils.getFQName(containingDeclaration); + FqNameUnsafe fqName = DescriptorUtils.getFqName(containingDeclaration); stringBuilder.append(FqName.ROOT.equalsTo(fqName) ? "root package" : fqName.asString()); } stringBuilder.append(""); diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java index 2e09bc14f92..477a8a1e75b 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import java.util.Set; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFQName; +import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; public final class DecompiledNavigationUtils { @@ -65,7 +65,7 @@ public final class DecompiledNavigationUtils { return jetDeclaration; } else { - LOG.warn("Could not find an element to navigate to for descriptor " + getFQName(effectiveReferencedDescriptor)); + LOG.warn("Could not find an element to navigate to for descriptor " + getFqName(effectiveReferencedDescriptor)); } return null; } @@ -120,7 +120,7 @@ public final class DecompiledNavigationUtils { if (classKind == ClassKind.CLASS_OBJECT || classKind == ClassKind.ENUM_ENTRY) { return getContainerFqName(containerDescriptor.getContainingDeclaration()); } - return getFQName(containerDescriptor).toSafe(); + return getFqName(containerDescriptor).toSafe(); } return null; } diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java index a44c7032306..dc471d197ec 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java @@ -353,7 +353,7 @@ public class JetSourceNavigationHelper { assert className != null : "Class from BuiltIns should have a name"; ClassDescriptor classDescriptor = KotlinBuiltIns.getInstance().getBuiltInClassByName(className); - FqNameUnsafe fqName = DescriptorUtils.getFQName(classDescriptor); + FqNameUnsafe fqName = DescriptorUtils.getFqName(classDescriptor); if (fqName.isSafe()) { FqName javaFqName = KotlinToJavaTypesMap.getInstance().getKotlinToJavaFqName(fqName.toSafe()); if (javaFqName != null) { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java index 98687bd67d6..227df201251 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java @@ -125,7 +125,7 @@ public class AutoImportFix extends JetHintAction implem @Override public FqName apply(@Nullable DeclarationDescriptor declarationDescriptor) { assert declarationDescriptor != null; - return DescriptorUtils.getFQName(declarationDescriptor).toSafe(); + return DescriptorUtils.getFqName(declarationDescriptor).toSafe(); } })); } @@ -152,7 +152,7 @@ public class AutoImportFix extends JetHintAction implem @Override public FqName apply(@Nullable DeclarationDescriptor declarationDescriptor) { assert declarationDescriptor != null; - return DescriptorUtils.getFQName(declarationDescriptor).toSafe(); + return DescriptorUtils.getFqName(declarationDescriptor).toSafe(); } })); } @@ -219,7 +219,7 @@ public class AutoImportFix extends JetHintAction implem return Collections2.transform(descriptors, new Function() { @Override public FqName apply(ClassDescriptor descriptor) { - return DescriptorUtils.getFQName(descriptor).toSafe(); + return DescriptorUtils.getFqName(descriptor).toSafe(); } }); } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.java index 91d5d07b516..a639f12e832 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.java @@ -57,7 +57,6 @@ import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.*; @@ -902,7 +901,7 @@ public class CreateFunctionFromUsageFix extends CreateFromUsageFixBase { assert returnTypeRef != null; properties.setProperty(FileTemplate.ATTRIBUTE_RETURN_TYPE, returnTypeRef.getText()); } - properties.setProperty(FileTemplate.ATTRIBUTE_CLASS_NAME, DescriptorUtils.getFQName(ownerClassDescriptor).asString()); + properties.setProperty(FileTemplate.ATTRIBUTE_CLASS_NAME, DescriptorUtils.getFqName(ownerClassDescriptor).asString()); properties.setProperty(FileTemplate.ATTRIBUTE_SIMPLE_CLASS_NAME, ownerClassDescriptor.getName().asString()); properties.setProperty(ATTRIBUTE_FUNCTION_NAME, functionName); @@ -1060,7 +1059,7 @@ public class CreateFunctionFromUsageFix extends CreateFromUsageFixBase { String replacement = typeParameterNameMap.get(declarationDescriptor); return replacement == null ? declarationDescriptor.getName().asString() : replacement; } else { - return fq ? DescriptorUtils.getFQName(declarationDescriptor).asString() : declarationDescriptor.getName().asString(); + return fq ? DescriptorUtils.getFqName(declarationDescriptor).asString() : declarationDescriptor.getName().asString(); } } diff --git a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java index dc3fd002b0b..02176cf651e 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java +++ b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java @@ -138,7 +138,7 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent { return ((ClassDescriptor) currentParent).getClassObjectDescriptor(); } else { - return bindingContext.get(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, DescriptorUtils.getFQName(originalDescriptor).toSafe()); + return bindingContext.get(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, DescriptorUtils.getFqName(originalDescriptor).toSafe()); } } diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java index 5c4ed3342ff..5b70eb8975f 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java @@ -78,7 +78,7 @@ public class KotlinAnnotatedElementsSearcher extends AnnotatedElementsSearcher { ClassifierDescriptor descriptor = annotationDescriptor.getType().getConstructor().getDeclarationDescriptor(); if (descriptor == null) return; - if (!(DescriptorUtils.getFQName(descriptor).asString().equals(annotationFQN))) return; + if (!(DescriptorUtils.getFqName(descriptor).asString().equals(annotationFQN))) return; if (parentOfType instanceof JetClass) { PsiClass lightClass = LightClassUtil.getPsiClass((JetClass) parentOfType); diff --git a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java b/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java index 983d70db764..bc91aaaf06f 100644 --- a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java +++ b/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java @@ -225,7 +225,7 @@ public class JetStructureViewElement implements StructureViewTreeElement { textBuilder = new StringBuilder(descriptor.getName().asString()); textBuilder .append(" (") - .append(DescriptorUtils.getFQName(descriptor.getContainingDeclaration())) + .append(DescriptorUtils.getFqName(descriptor.getContainingDeclaration())) .append(")"); } else { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java b/js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java index dc9af6c3154..6472ec17a8f 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import java.util.Map; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFQName; +import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; /** * Provides a mechanism to bind some of the kotlin/java declations with library implementations. @@ -153,12 +153,12 @@ public final class StandardClasses { } public boolean isStandardObject(@NotNull DeclarationDescriptor descriptor) { - return standardObjects.containsKey(getFQName(descriptor)); + return standardObjects.containsKey(getFqName(descriptor)); } @NotNull public JsName getStandardObjectName(@NotNull DeclarationDescriptor descriptor) { - return standardObjects.get(getFQName(descriptor)); + return standardObjects.get(getFqName(descriptor)); } @NotNull diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java index 5d54328a198..52dfbc6fc9d 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java @@ -94,7 +94,7 @@ public final class PatternBuilder { } private boolean doApply(@NotNull FunctionDescriptor descriptor) { - List nameParts = DescriptorUtils.getFQName(descriptor).pathSegments(); + List nameParts = DescriptorUtils.getFqName(descriptor).pathSegments(); if (nameParts.size() != checkersWithPrefixChecker.size()) { return false; } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/AnnotationsUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/AnnotationsUtils.java index 3092b09a017..8b459e61f04 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/AnnotationsUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/AnnotationsUtils.java @@ -98,7 +98,7 @@ public final class AnnotationsUtils { DeclarationDescriptor annotationDeclaration = annotationDescriptor.getType().getConstructor().getDeclarationDescriptor(); assert annotationDeclaration != null : "Annotation supposed to have a declaration"; - return DescriptorUtils.getFQName(annotationDeclaration).asString(); + return DescriptorUtils.getFqName(annotationDeclaration).asString(); } public static boolean isNativeObject(@NotNull DeclarationDescriptor descriptor) { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java index 1ddf7ad03fd..881b0f1dc94 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java @@ -36,12 +36,12 @@ import java.util.List; import java.util.Set; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFQName; +import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; public final class JsDescriptorUtils { // TODO: maybe we should use external annotations or something else. private static final Set FAKE_CLASSES = ContainerUtil.immutableSet( - getFQName(KotlinBuiltIns.getInstance().getAny()).toSafe().asString(), + getFqName(KotlinBuiltIns.getInstance().getAny()).toSafe().asString(), "jet.Iterable" ); @@ -82,7 +82,7 @@ public final class JsDescriptorUtils { @Override public boolean value(JetType type) { ClassDescriptor classDescriptor = getClassDescriptorForType(type); - return !FAKE_CLASSES.contains(getFQName(classDescriptor).toSafe().asString()); + return !FAKE_CLASSES.contains(getFqName(classDescriptor).toSafe().asString()); } }); } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java index 0550aba5484..057208a32ec 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java @@ -34,7 +34,7 @@ import java.util.Collections; import java.util.List; import static com.google.dart.compiler.backend.js.ast.JsBinaryOperator.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFQName; +import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; import static org.jetbrains.k2js.translate.context.Namer.getKotlinBackingFieldName; import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptorForOperationExpression; import static org.jetbrains.k2js.translate.utils.JsAstUtils.assignment; @@ -133,7 +133,7 @@ public final class TranslationUtils { @NotNull public static String getMangledName(@NotNull PropertyDescriptor descriptor, @NotNull String suggestedName) { - int absHashCode = Math.abs(getFQName(descriptor).asString().hashCode()); + int absHashCode = Math.abs(getFqName(descriptor).asString().hashCode()); return suggestedName + "_" + Integer.toString(absHashCode, Character.MAX_RADIX) + "$"; }