MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-stubs] TypeInfo: remove special processing of unqualified Object and String

Browse Source 
They are useless for Cls stubs and de-facto rarely used in Psi stubs but may cause bugs like IDEA-356054 Unable to open file when contents references inner class of "Object"

GitOrigin-RevId: da7cf23835e93a19a615e4c5d18e99d31528e1a7
This commit is contained in:
Tagir Valeev
2024-08-30 11:44:10 +02:00
committed by intellij-monorepo-bot
parent 3ebe612c3d
commit 145cb49135
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-psi-impl/src/com/intellij/psi/impl/cache/TypeInfo.java vendored
View File

@@ -46,8 +46,7 @@ public /*sealed*/ abstract class TypeInfo {
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
CommonClassNames.JAVA_LANG_OBJECT, CommonClassNames.JAVA_LANG_STRING
};
ourFrequentTypeIndex = new Object2IntOpenHashMap<>();
@@ -124,8 +123,7 @@ public /*sealed*/ abstract class TypeInfo {
*/
ELLIPSIS,
BOOLEAN("boolean"), BYTE("byte"), CHAR("char"), DOUBLE("double"), FLOAT("float"), INT("int"), LONG("long"), SHORT("short"),
VOID("void"),
OBJECT("Object"), STRING("String"), WILDCARD("?");
VOID("void"), WILDCARD("?");
private final @Nullable String text;

2
java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java
View File

@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
import java.io.IOException;
public class JavaFileElementType extends ILightStubFileElementType<PsiJavaFileStub> {
public static final int STUB_VERSION = 59;
public static final int STUB_VERSION = 60;
private static volatile int TEST_STUB_VERSION_MODIFIER = 0;