MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-156633: add position inside stubList to "stub inconsistency" error message

Browse Source 
GitOrigin-RevId: 6ba533b2440df2c96c8070ffa51af322d2e0054b
This commit is contained in:
Andrei.Kuznetsov
2024-06-17 21:05:47 +02:00
committed by intellij-monorepo-bot
parent 2e0883e163
commit ff85a4fbe2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platform/indexing-impl/src/com/intellij/psi/stubs/StubProcessingHelperBase.java
View File

@@ -59,7 +59,7 @@ public abstract class StubProcessingHelperBase {
if (value.size() == 1 && value.get(0) == 0) {
//noinspection unchecked
return !checkType(requiredClass, psiFile, psiFile, debugOperationName, value, ZeroStubIdList) || processor.process((Psi)psiFile);
return !checkType(requiredClass, psiFile, psiFile, debugOperationName, value, 0, ZeroStubIdList) || processor.process((Psi)psiFile);
}
List<StubbedSpine> spines = getAllSpines(psiFile);
@@ -69,7 +69,7 @@ public abstract class StubProcessingHelperBase {
for (int i = 0, size = value.size(); i < size; i++) {
PsiElement psi = getStubPsi(spines, value.get(i));
if (!checkType(requiredClass, psiFile, psi, debugOperationName, value, StubPsiCheck)) break;
if (!checkType(requiredClass, psiFile, psi, debugOperationName, value, i, StubPsiCheck)) break;
//noinspection unchecked
if (!processor.process((Psi)psi)) return false;
}
@@ -85,7 +85,8 @@ public abstract class StubProcessingHelperBase {
}
private <Psi extends PsiElement> boolean checkType(@NotNull Class<Psi> requiredClass, PsiFile psiFile, @Nullable PsiElement psiElement,
@NotNull Computable<String> debugOperationName, @NotNull StubIdList debugStubIdList,
@NotNull Computable<String> debugOperationName,
@NotNull StubIdList debugStubIdList, int stubIdListIdx,
@NotNull StubInconsistencyReporter.StubTreeAndIndexDoNotMatchSource source) {
if (requiredClass.isInstance(psiElement)) return true;
@@ -94,8 +95,8 @@ public abstract class StubProcessingHelperBase {
(psiElement != null ? ", psiElement.class=" + psiElement.getClass() : "") +
", requiredClass=" + requiredClass +
", operation=" + debugOperationName.get() +
", stubIdList=" + debugStubIdList +
".\nref: 50cf572587cf";
", stubIdList=" + debugStubIdList + "@" + stubIdListIdx +
".\nref: 20240717";
StubTree stubTree = ((PsiFileWithStubSupport)psiFile).getStubTree();
if (stubTree == null && psiFile instanceof PsiFileImpl) stubTree = ((PsiFileImpl)psiFile).calcStubTree();