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

formatting

Browse Source
This commit is contained in:
Stepan Koltsov
2012-06-08 21:36:49 +04:00
parent 321c781c90
commit acac0eddc7
48 changed files with 475 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
+4 -4
View File
@@ -296,12 +296,12 @@ public class DescriptorUtils {
}
public static boolean isClassObject(@NotNull DeclarationDescriptor descriptor) {
if(descriptor instanceof ClassDescriptor) {
if (descriptor instanceof ClassDescriptor) {
ClassDescriptor classDescriptor = (ClassDescriptor) descriptor;
if(classDescriptor.getKind() == ClassKind.OBJECT) {
if(classDescriptor.getContainingDeclaration() instanceof ClassDescriptor) {
if (classDescriptor.getKind() == ClassKind.OBJECT) {
if (classDescriptor.getContainingDeclaration() instanceof ClassDescriptor) {
ClassDescriptor containingDeclaration = (ClassDescriptor) classDescriptor.getContainingDeclaration();
if(classDescriptor.getDefaultType().equals(containingDeclaration.getClassObjectType())) {
if (classDescriptor.getDefaultType().equals(containingDeclaration.getClassObjectType())) {
return true;
}
}
compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java
+1 -1
View File
@@ -116,7 +116,7 @@ public class SubstitutionUtils {
}
for(TypeProjection proj : type.getArguments()) {
if(hasUnsubstitutedTypeParameters(proj.getType())) {
if (hasUnsubstitutedTypeParameters(proj.getType())) {
return true;
}
}
compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardLibrary.java
+2 -2
View File
@@ -166,7 +166,7 @@ public class JetStandardLibrary {
}
private void initStdClasses() {
if(libraryScope == null) {
if (libraryScope == null) {
this.libraryScope = JetStandardClasses.STANDARD_CLASSES_NAMESPACE.getMemberScope();
this.numberClass = (ClassDescriptor) libraryScope.getClassifier(Name.identifier("Number"));
@@ -504,7 +504,7 @@ public class JetStandardLibrary {
public final boolean isVolatile(PropertyDescriptor descriptor) {
List<AnnotationDescriptor> annotations = descriptor.getOriginal().getAnnotations();
if(annotations != null) {
if (annotations != null) {
for(AnnotationDescriptor d: annotations) {
if (d.getType().equals(getVolatileType())) { return true; }
}