Rename getQualifiedName() -> getFqName()
This commit is contained in:
+1
-1
@@ -261,7 +261,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
|
||||
}
|
||||
else if (containingDeclaration instanceof NamespaceDescriptor) {
|
||||
String peek = peekFromStack(nameStack);
|
||||
FqName qualifiedName = ((NamespaceDescriptor) containingDeclaration).getQualifiedName();
|
||||
FqName qualifiedName = ((NamespaceDescriptor) containingDeclaration).getFqName();
|
||||
String packageClassName = PackageClassUtils.getPackageClassName(qualifiedName);
|
||||
if (peek.isEmpty()) {
|
||||
peek = packageClassName;
|
||||
|
||||
@@ -145,7 +145,7 @@ public class JetTypeMapper extends BindingTraceAware {
|
||||
if (r.length() > 0) {
|
||||
r.append("/");
|
||||
}
|
||||
r.append(PackageClassUtils.getPackageClassName(namespace.getQualifiedName()));
|
||||
r.append(PackageClassUtils.getPackageClassName(namespace.getFqName()));
|
||||
}
|
||||
|
||||
if (r.length() == 0) {
|
||||
|
||||
+1
-1
@@ -47,7 +47,7 @@ public class JavaNamespaceDescriptor extends AbstractNamespaceDescriptorImpl {
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public FqName getQualifiedName() {
|
||||
public FqName getFqName() {
|
||||
return qualifiedName;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,5 +22,5 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
|
||||
public interface FqNamed {
|
||||
|
||||
@NotNull
|
||||
FqName getQualifiedName();
|
||||
FqName getFqName();
|
||||
}
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ public class NamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl {
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public FqName getQualifiedName() {
|
||||
public FqName getFqName() {
|
||||
return DescriptorUtils.getFQName(this).toSafe();
|
||||
}
|
||||
|
||||
|
||||
@@ -87,7 +87,7 @@ public class JetNamedFunction extends JetTypeParameterListOwnerStub<PsiJetFuncti
|
||||
* @return
|
||||
*/
|
||||
@Nullable
|
||||
public FqName getQualifiedName() {
|
||||
public FqName getFqName() {
|
||||
final PsiJetFunctionStub stub = getStub();
|
||||
if (stub != null) {
|
||||
return stub.getTopFQName();
|
||||
|
||||
+1
-1
@@ -67,7 +67,7 @@ public class JetFunctionElementType extends JetStubElementType<PsiJetFunctionStu
|
||||
final boolean isTopLevel = psi.getParent() instanceof JetFile;
|
||||
final boolean isExtension = psi.getReceiverTypeRef() != null;
|
||||
|
||||
FqName qualifiedName = psi.getQualifiedName();
|
||||
FqName qualifiedName = psi.getFqName();
|
||||
|
||||
return new PsiJetFunctionStubImpl(JetStubElementTypes.FUNCTION, parentStub, psi.getName(), isTopLevel, qualifiedName, isExtension);
|
||||
}
|
||||
|
||||
+1
-1
@@ -61,7 +61,7 @@ public class LazyPackageDescriptor extends AbstractNamespaceDescriptorImpl imple
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public FqName getQualifiedName() {
|
||||
public FqName getFqName() {
|
||||
return DescriptorUtils.getFQName(this).toSafe();
|
||||
}
|
||||
|
||||
|
||||
@@ -316,7 +316,7 @@ public class KotlinBuiltIns {
|
||||
|
||||
@NotNull
|
||||
public FqName getBuiltInsPackageFqName() {
|
||||
return getBuiltInsPackage().getQualifiedName();
|
||||
return getBuiltInsPackage().getFqName();
|
||||
}
|
||||
|
||||
@NotNull
|
||||
|
||||
@@ -67,7 +67,7 @@ public class JsConfiguration implements ModuleConfiguration {
|
||||
.extendNamespaceScope(trace, namespaceDescriptor, namespaceMemberScope);
|
||||
|
||||
// Extend root namespace with standard classes
|
||||
if (namespaceDescriptor.getQualifiedName().shortNameOrSpecial().equals(FqNameUnsafe.ROOT_NAME)) {
|
||||
if (namespaceDescriptor.getFqName().shortNameOrSpecial().equals(FqNameUnsafe.ROOT_NAME)) {
|
||||
namespaceMemberScope.importScope(KotlinBuiltIns.getInstance().getBuiltInsScope());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user