MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (formatting)

Browse Source
This commit is contained in:
Roman Shevchenko
2016-04-14 19:54:28 +02:00
parent fed760568f
commit 5446817867
4 changed files with 58 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/cache/TypeInfo.java
Vendored
+6 -19
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -50,30 +50,17 @@ import static com.intellij.util.BitUtil.isSet;
public class TypeInfo {
private static final String[] ourIndexFrequentType;
private static final TObjectIntHashMap<String> ourFrequentTypeIndex;
static {
ourIndexFrequentType = new String[]{
"",
"boolean",
"byte",
"char",
"double",
"float",
"int",
"long",
"null",
"short",
"void",
CommonClassNames.JAVA_LANG_OBJECT_SHORT,
CommonClassNames.JAVA_LANG_OBJECT,
CommonClassNames.JAVA_LANG_STRING_SHORT,
CommonClassNames.JAVA_LANG_STRING
"boolean", "byte", "char", "double", "float", "int", "long", "null", "short", "void",
CommonClassNames.JAVA_LANG_OBJECT_SHORT, CommonClassNames.JAVA_LANG_OBJECT,
CommonClassNames.JAVA_LANG_STRING_SHORT, CommonClassNames.JAVA_LANG_STRING
};
ourFrequentTypeIndex = new TObjectIntHashMap<String>();
for (int i = 0; i < ourIndexFrequentType.length; i++) {
String type = ourIndexFrequentType[i];
ourFrequentTypeIndex.put(type, i);
ourFrequentTypeIndex.put(ourIndexFrequentType[i], i);
}
}
@@ -282,4 +269,4 @@ public class TypeInfo {
int frequentIndex = ourFrequentTypeIndex.get(type);
return frequentIndex == 0 ? type : ourIndexFrequentType[frequentIndex];
}
}
}
java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
+38 -39
View File
@@ -29,7 +29,6 @@ import com.intellij.psi.impl.java.stubs.impl.*;
import com.intellij.psi.stubs.PsiFileStub;
import com.intellij.psi.stubs.StubElement;
import com.intellij.util.ArrayUtil;
import com.intellij.util.BitUtil;
import com.intellij.util.Consumer;
import com.intellij.util.Function;
import com.intellij.util.cls.ClsFormatException;
@@ -49,6 +48,7 @@ import static com.intellij.openapi.util.Pair.pair;
import static com.intellij.psi.CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION;
import static com.intellij.psi.CommonClassNames.JAVA_LANG_STRING;
import static com.intellij.psi.impl.compiled.ClsFileImpl.EMPTY_ATTRIBUTES;
import static com.intellij.util.BitUtil.isSet;
/**
* @author max
@@ -101,10 +101,10 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
String shortName = myShortName != null && name.endsWith(myShortName) ? myShortName : PsiNameHelper.getShortClassName(fqn);
int flags = myAccess | access;
boolean isDeprecated = BitUtil.isSet(flags, Opcodes.ACC_DEPRECATED);
boolean isInterface = BitUtil.isSet(flags, Opcodes.ACC_INTERFACE);
boolean isEnum = BitUtil.isSet(flags, Opcodes.ACC_ENUM);
boolean isAnnotationType = BitUtil.isSet(flags, Opcodes.ACC_ANNOTATION);
boolean isDeprecated = isSet(flags, Opcodes.ACC_DEPRECATED);
boolean isInterface = isSet(flags, Opcodes.ACC_INTERFACE);
boolean isEnum = isSet(flags, Opcodes.ACC_ENUM);
boolean isAnnotationType = isSet(flags, Opcodes.ACC_ANNOTATION);
byte stubFlags = PsiClassStubImpl.packFlags(isDeprecated, isInterface, isEnum, false, false, isAnnotationType, false, false);
myResult = new PsiClassStubImpl(JavaStubElementTypes.CLASS, myParent, fqn, shortName, null, stubFlags);
@@ -206,39 +206,39 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
private static int packCommonFlags(int access) {
int flags = 0;
if (BitUtil.isSet(access, Opcodes.ACC_PRIVATE)) flags |= ModifierFlags.PRIVATE_MASK;
else if (BitUtil.isSet(access, Opcodes.ACC_PROTECTED)) flags |= ModifierFlags.PROTECTED_MASK;
else if (BitUtil.isSet(access, Opcodes.ACC_PUBLIC)) flags |= ModifierFlags.PUBLIC_MASK;
if (isSet(access, Opcodes.ACC_PRIVATE)) flags |= ModifierFlags.PRIVATE_MASK;
else if (isSet(access, Opcodes.ACC_PROTECTED)) flags |= ModifierFlags.PROTECTED_MASK;
else if (isSet(access, Opcodes.ACC_PUBLIC)) flags |= ModifierFlags.PUBLIC_MASK;
else flags |= ModifierFlags.PACKAGE_LOCAL_MASK;
if (BitUtil.isSet(access, Opcodes.ACC_STATIC)) flags |= ModifierFlags.STATIC_MASK;
if (BitUtil.isSet(access, Opcodes.ACC_FINAL)) flags |= ModifierFlags.FINAL_MASK;
if (isSet(access, Opcodes.ACC_STATIC)) flags |= ModifierFlags.STATIC_MASK;
if (isSet(access, Opcodes.ACC_FINAL)) flags |= ModifierFlags.FINAL_MASK;
return flags;
}
private static int packClassFlags(int access) {
int flags = packCommonFlags(access);
if (BitUtil.isSet(access, Opcodes.ACC_ABSTRACT)) flags |= ModifierFlags.ABSTRACT_MASK;
if (isSet(access, Opcodes.ACC_ABSTRACT)) flags |= ModifierFlags.ABSTRACT_MASK;
return flags;
}
private static int packFieldFlags(int access) {
int flags = packCommonFlags(access);
if (BitUtil.isSet(access, Opcodes.ACC_VOLATILE)) flags |= ModifierFlags.VOLATILE_MASK;
if (BitUtil.isSet(access, Opcodes.ACC_TRANSIENT)) flags |= ModifierFlags.TRANSIENT_MASK;
if (isSet(access, Opcodes.ACC_VOLATILE)) flags |= ModifierFlags.VOLATILE_MASK;
if (isSet(access, Opcodes.ACC_TRANSIENT)) flags |= ModifierFlags.TRANSIENT_MASK;
return flags;
}
private static int packMethodFlags(int access, boolean isInterface) {
int flags = packCommonFlags(access);
if (BitUtil.isSet(access, Opcodes.ACC_SYNCHRONIZED)) flags |= ModifierFlags.SYNCHRONIZED_MASK;
if (BitUtil.isSet(access, Opcodes.ACC_NATIVE)) flags |= ModifierFlags.NATIVE_MASK;
if (BitUtil.isSet(access, Opcodes.ACC_STRICT)) flags |= ModifierFlags.STRICTFP_MASK;
if (isSet(access, Opcodes.ACC_SYNCHRONIZED)) flags |= ModifierFlags.SYNCHRONIZED_MASK;
if (isSet(access, Opcodes.ACC_NATIVE)) flags |= ModifierFlags.NATIVE_MASK;
if (isSet(access, Opcodes.ACC_STRICT)) flags |= ModifierFlags.STRICTFP_MASK;
if (BitUtil.isSet(access, Opcodes.ACC_ABSTRACT)) flags |= ModifierFlags.ABSTRACT_MASK;
else if (isInterface && !BitUtil.isSet(access, Opcodes.ACC_STATIC)) flags |= ModifierFlags.DEFENDER_MASK;
if (isSet(access, Opcodes.ACC_ABSTRACT)) flags |= ModifierFlags.ABSTRACT_MASK;
else if (isInterface && !isSet(access, Opcodes.ACC_STATIC)) flags |= ModifierFlags.DEFENDER_MASK;
return flags;
}
@@ -267,7 +267,7 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
@Override
public void visitInnerClass(String name, String outerName, String innerName, int access) {
if (BitUtil.isSet(access, Opcodes.ACC_SYNTHETIC)) return;
if (isSet(access, Opcodes.ACC_SYNTHETIC)) return;
if (innerName == null || outerName == null) return;
if (myParent instanceof PsiFileStub && myInternalName.equals(name)) {
@@ -285,16 +285,15 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
@Override
@Nullable
public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
if (BitUtil.isSet(access, Opcodes.ACC_SYNTHETIC)) return null;
if (isSet(access, Opcodes.ACC_SYNTHETIC)) return null;
if (name == null) return null;
byte flags = PsiFieldStubImpl.packFlags(BitUtil.isSet(access, Opcodes.ACC_ENUM), BitUtil.isSet(access, Opcodes.ACC_DEPRECATED), false,
false);
byte flags = PsiFieldStubImpl.packFlags(isSet(access, Opcodes.ACC_ENUM), isSet(access, Opcodes.ACC_DEPRECATED), false, false);
TypeInfo type = fieldType(desc, signature);
String initializer = constToString(value, type.text, false, myMapping);
PsiFieldStub stub = new PsiFieldStubImpl(myResult, name, type, initializer, flags);
PsiModifierListStub modList = new PsiModifierListStubImpl(stub, packFieldFlags(access));
return new AnnotationCollectingVisitor(modList, myMapping);
return new FieldAnnotationCollectingVisitor(modList, myMapping);
}
private TypeInfo fieldType(String desc, String signature) {
@@ -322,7 +321,7 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
// must be marked as synthetic, except for default constructors and the class initialization method.
// However Scala compiler erroneously generates ACC_BRIDGE instead of ACC_SYNTHETIC flag for in-trait implementation delegation.
// See IDEA-78649
if (BitUtil.isSet(access, Opcodes.ACC_SYNTHETIC)) return null;
if (isSet(access, Opcodes.ACC_SYNTHETIC)) return null;
if (name == null) return null;
if (SYNTHETIC_CLASS_INIT_METHOD.equals(name)) return null;
@@ -335,9 +334,9 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
}
boolean isConstructor = SYNTHETIC_INIT_METHOD.equals(name);
boolean isDeprecated = BitUtil.isSet(access, Opcodes.ACC_DEPRECATED);
boolean isVarargs = BitUtil.isSet(access, Opcodes.ACC_VARARGS);
boolean isStatic = BitUtil.isSet(access, Opcodes.ACC_STATIC);
boolean isDeprecated = isSet(access, Opcodes.ACC_DEPRECATED);
boolean isVarargs = isSet(access, Opcodes.ACC_VARARGS);
boolean isStatic = isSet(access, Opcodes.ACC_STATIC);
boolean isAnnotationMethod = myResult.isAnnotationType();
byte flags = PsiMethodStubImpl.packFlags(isConstructor, isAnnotationMethod, isVarargs, isDeprecated, false, false);
@@ -372,7 +371,7 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
boolean isEnumConstructor = isEnum && isConstructor;
boolean isInnerClassConstructor = isConstructor &&
!(myParent instanceof PsiFileStub) &&
!BitUtil.isSet(myModList.getModifiersMask(), Opcodes.ACC_STATIC);
!isSet(myModList.getModifiersMask(), Opcodes.ACC_STATIC);
List<String> args = info.argTypes;
if (!generic && isEnumConstructor && args.size() >= 2 && JAVA_LANG_STRING.equals(args.get(0)) && "int".equals(args.get(1))) {
@@ -401,7 +400,7 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
int localVarIgnoreCount = isStatic ? 0 : isEnumConstructor ? 3 : 1;
int paramIgnoreCount = isEnumConstructor ? 2 : isInnerClassConstructor ? 1 : 0;
return new AnnotationParamCollectingVisitor(stub, modList, localVarIgnoreCount, paramIgnoreCount, paramCount, paramStubs, myMapping);
return new ParameterAnnotationCollectingVisitor(stub, modList, localVarIgnoreCount, paramIgnoreCount, paramCount, paramStubs, myMapping);
}
private MethodInfo parseMethodSignature(String signature, String[] exceptions) throws ClsFormatException {
@@ -556,11 +555,11 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
}
}
private static class AnnotationCollectingVisitor extends FieldVisitor {
private static class FieldAnnotationCollectingVisitor extends FieldVisitor {
private final PsiModifierListStub myModList;
private final Function<String, String> myMapping;
private AnnotationCollectingVisitor(PsiModifierListStub modList, Function<String, String> mapping) {
private FieldAnnotationCollectingVisitor(PsiModifierListStub modList, Function<String, String> mapping) {
super(ASM_API);
myModList = modList;
myMapping = mapping;
@@ -577,7 +576,7 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
}
}
private static class AnnotationParamCollectingVisitor extends MethodVisitor {
private static class ParameterAnnotationCollectingVisitor extends MethodVisitor {
private final PsiMethodStub myOwner;
private final PsiModifierListStub myModList;
private final int myIgnoreCount;
@@ -588,13 +587,13 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
private int myUsedParamSize = 0;
private int myUsedParamCount = 0;
private AnnotationParamCollectingVisitor(PsiMethodStub owner,
PsiModifierListStub modList,
int ignoreCount,
int paramIgnoreCount,
int paramCount,
PsiParameterStubImpl[] paramStubs,
Function<String, String> mapping) {
private ParameterAnnotationCollectingVisitor(PsiMethodStub owner,
PsiModifierListStub modList,
int ignoreCount,
int paramIgnoreCount,
int paramCount,
PsiParameterStubImpl[] paramStubs,
Function<String, String> mapping) {
super(ASM_API);
myOwner = owner;
myModList = modList;
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiAnnotationStubImpl.java
+6 -9
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public class PsiAnnotationStubImpl extends StubBase<PsiAnnotation> implements Ps
private final String myText;
private SoftReference<PsiAnnotation> myParsedFromRepository;
public PsiAnnotationStubImpl(final StubElement parent, final String text) {
public PsiAnnotationStubImpl(StubElement parent, String text) {
super(parent, JavaStubElementTypes.ANNOTATION);
CharSequence interned = CharTableImpl.getStaticInterned(text);
myText = interned == null ? text : interned.toString();
@@ -58,11 +58,9 @@ public class PsiAnnotationStubImpl extends StubBase<PsiAnnotation> implements Ps
@Override
public PsiAnnotation getPsiElement() {
PsiAnnotation annotation = SoftReference.dereference(myParsedFromRepository);
if (annotation != null) {
return annotation;
}
if (annotation != null) return annotation;
final String text = getText();
String text = getText();
try {
PsiJavaParserFacade facade = JavaPsiFacade.getInstance(getProject()).getParserFacade();
annotation = facade.createAnnotationFromText(text, getPsi());
@@ -76,8 +74,7 @@ public class PsiAnnotationStubImpl extends StubBase<PsiAnnotation> implements Ps
}
@Override
@SuppressWarnings({"HardCodedStringLiteral"})
public String toString() {
return "PsiAnnotationStub[" + myText + "]";
return "PsiAnnotationStub[" + myText + ']';
}
}
}
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiFieldStubImpl.java
+8 -8
View File
@@ -30,16 +30,16 @@ import org.jetbrains.annotations.Nullable;
* @author max
*/
public class PsiFieldStubImpl extends StubBase<PsiField> implements PsiFieldStub {
private final StringRef myName;
private final TypeInfo myType;
private final StringRef myInitializer;
private final byte myFlags;
private static final int ENUM_CONST = 0x01;
private static final int DEPRECATED = 0x02;
private static final int DEPRECATED_ANNOTATION = 0x04;
private static final int HAS_DOC_COMMENT = 0x08;
private final StringRef myName;
private final TypeInfo myType;
private final StringRef myInitializer;
private final byte myFlags;
public PsiFieldStubImpl(StubElement parent, String name, @NotNull TypeInfo type, @Nullable String initializer, byte flags) {
this(parent, StringRef.fromString(name), type, StringRef.fromString(initializer), flags);
}
@@ -105,7 +105,7 @@ public class PsiFieldStubImpl extends StubBase<PsiField> implements PsiFieldStub
return flags;
}
@SuppressWarnings({"HardCodedStringLiteral"})
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("PsiFieldStub[");
@@ -123,7 +123,7 @@ public class PsiFieldStubImpl extends StubBase<PsiField> implements PsiFieldStub
builder.append('=').append(myInitializer);
}
builder.append("]");
builder.append(']');
return builder.toString();
}
}
}