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

Merge commit 'origin/master'

Browse Source
This commit is contained in:
Eugene Kudelevsky
2011-04-25 18:07:06 +04:00
parent 5ff953220c f08d1c68a1
commit 3c1f506c87
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/smartPointers/AnchorElementInfo.java
+2 -2
View File
@@ -35,14 +35,14 @@ class AnchorElementInfo extends SelfElementInfo {
private IStubElementType myStubElementType;
AnchorElementInfo(@NotNull PsiElement anchor, @NotNull PsiFile containingFile) {
super(containingFile.getProject(), anchor.getTextRange(), anchor.getClass(), containingFile, anchor.getLanguage());
super(containingFile.getProject(), anchor.getTextRange(), anchor.getClass(), containingFile, containingFile.getLanguage());
}
// will restore by stub index until file tree get loaded
AnchorElementInfo(@NotNull PsiElement anchor,
@NotNull PsiFileWithStubSupport containingFile,
int stubId,
@NotNull IStubElementType stubElementType) {
super(containingFile.getProject(), new TextRange(0,0), anchor.getClass(), containingFile, anchor.getLanguage());
super(containingFile.getProject(), new TextRange(0,0), anchor.getClass(), containingFile, containingFile.getLanguage());
this.stubId = stubId;
myStubElementType = stubElementType;
IElementType contentElementType = ((PsiFileImpl)containingFile).getContentElementType();
platform/lang-impl/src/com/intellij/psi/impl/smartPointers/SelfElementInfo.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class SelfElementInfo implements SmartPointerElementInfo {
protected final Language myLanguage;
protected SelfElementInfo(@NotNull Project project, @NotNull PsiElement anchor) {
this(project, anchor.getTextRange(), anchor.getClass(), anchor.getContainingFile(), anchor.getLanguage());
this(project, anchor.getTextRange(), anchor.getClass(), anchor.getContainingFile(), anchor.getContainingFile().getLanguage());
}
public SelfElementInfo(@NotNull Project project,
@NotNull TextRange anchor,
platform/lang-impl/src/com/intellij/psi/impl/smartPointers/SmartPsiElementPointerImpl.java
+1 -1
View File
@@ -179,7 +179,7 @@ class SmartPsiElementPointerImpl<E extends PsiElement> implements SmartPointerEx
if (isMultiRoot && !isElementInMainRoot) {
return new MultiRootSelfElementInfo(project, element.getTextRange(), element.getClass(), containingFile, containingFile.getLanguage());
}
return new SelfElementInfo(project, element.getTextRange(), element.getClass(), containingFile, element.getLanguage());
return new SelfElementInfo(project, element.getTextRange(), element.getClass(), containingFile, containingFile.getLanguage());
}
public void documentAndPsiInSync() {