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

diagnostics for EA-55898 - assert: TemplateLanguageStructureViewBuilder.<init>

Browse Source
This commit is contained in:
peter
2014-07-01 18:15:11 +02:00
parent 5e9762adfb
commit fc9caebfe2
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/structureView/impl/TemplateLanguageStructureViewBuilder.java
+11 -5
View File
@@ -60,9 +60,7 @@ public abstract class TemplateLanguageStructureViewBuilder implements StructureV
myVirtualFile = psiElement.getContainingFile().getVirtualFile();
myProject = psiElement.getProject();
final TemplateLanguageFileViewProvider provider = getViewProvider();
assert provider != null;
myTemplateDataLanguage = provider.getTemplateDataLanguage();
myTemplateDataLanguage = getNotNullViewProvider().getTemplateDataLanguage();
}
private void updateAfterPsiChange() {
@@ -115,6 +113,15 @@ public abstract class TemplateLanguageStructureViewBuilder implements StructureV
return provider instanceof TemplateLanguageFileViewProvider ? (TemplateLanguageFileViewProvider)provider : null;
}
@NotNull
private TemplateLanguageFileViewProvider getNotNullViewProvider() {
final FileViewProvider provider = PsiManager.getInstance(myProject).findViewProvider(myVirtualFile);
if (provider == null || !(provider instanceof TemplateLanguageFileViewProvider)) {
throw new AssertionError("Not a template view provider for " + myVirtualFile + ": " + provider);
}
return (TemplateLanguageFileViewProvider)provider;
}
private void updateBaseLanguageView() {
if (myBaseStructureViewDescriptor == null || !myProject.isOpen()) return;
final StructureViewComponent view = (StructureViewComponent)myBaseStructureViewDescriptor.structureView;
@@ -158,8 +165,7 @@ public abstract class TemplateLanguageStructureViewBuilder implements StructureV
public StructureView createStructureView(FileEditor fileEditor, @NotNull Project project) {
myFileEditor = fileEditor;
List<StructureViewComposite.StructureViewDescriptor> viewDescriptors = new ArrayList<StructureViewComposite.StructureViewDescriptor>();
final TemplateLanguageFileViewProvider provider = getViewProvider();
assert provider != null;
final TemplateLanguageFileViewProvider provider = getNotNullViewProvider();
final StructureViewComposite.StructureViewDescriptor structureViewDescriptor = createMainView(fileEditor, provider.getPsi(provider.getBaseLanguage()));
if (structureViewDescriptor != null) viewDescriptors.add(structureViewDescriptor);