From 8b62c73e4ea4f148f7f13432844750975eb7ab77 Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Tue, 27 Jan 2015 16:25:46 +0300 Subject: [PATCH] use correct ast node for secondary roots when building stubs --- .../src/com/intellij/psi/stubs/StubTreeBuilder.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/core-impl/src/com/intellij/psi/stubs/StubTreeBuilder.java b/platform/core-impl/src/com/intellij/psi/stubs/StubTreeBuilder.java index 8ab9df1d7334..431e40f208cc 100644 --- a/platform/core-impl/src/com/intellij/psi/stubs/StubTreeBuilder.java +++ b/platform/core-impl/src/com/intellij/psi/stubs/StubTreeBuilder.java @@ -107,12 +107,13 @@ public class StubTreeBuilder { stubs.add((PsiFileStub)data); for (Pair stubbedRoot : stubbedRoots) { - if (psi == stubbedRoot.second) continue; + final PsiFile secondaryPsi = stubbedRoot.second; + if (psi == secondaryPsi) continue; final StubBuilder stubbedRootBuilder = stubbedRoot.first.getBuilder(); if (stubbedRootBuilder instanceof LightStubBuilder) { - LightStubBuilder.FORCED_AST.set(new TreeBackedLighterAST(psi.getNode())); + LightStubBuilder.FORCED_AST.set(new TreeBackedLighterAST(secondaryPsi.getNode())); } - final StubElement element = stubbedRootBuilder.buildStubTree(stubbedRoot.second); + final StubElement element = stubbedRootBuilder.buildStubTree(secondaryPsi); if (element instanceof PsiFileStub) { stubs.add((PsiFileStub)element); }