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

GO-16835: (fix) make TemplateLanguageStrutureView outdated only when the underlying languages were actually changed

Browse Source 
Merge-request: IJ-MR-148653
Merged-by: Shmulik Klein <shmulik.klein@jetbrains.com>

Merge-request: IJ-MR-150939
Merged-by: Shmulik Klein <shmulik.klein@jetbrains.com>

GitOrigin-RevId: 0fb92f6f766993b19e942b1936bd7409d61e3c68
This commit is contained in:
Shmulik Klein
2024-12-05 19:39:10 +00:00
committed by intellij-monorepo-bot
parent 10605ab9ed
commit 2af660d44f
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/lang-impl/src/com/intellij/ide/structureView/impl/TemplateLanguageStructureViewBuilder.java
View File

@@ -54,8 +54,7 @@ public abstract class TemplateLanguageStructureViewBuilder extends TreeBasedStru
private final VirtualFile myVirtualFile;
private final Project myProject;
private final Map<Language, StructureViewBuilder> myLanguageToBuilderMap = new LinkedHashMap<>();
private final Map<Language, @Nullable StructureViewBuilder> myLanguageToBuilderMap = new LinkedHashMap<>();
protected TemplateLanguageStructureViewBuilder(PsiElement psiElement) {
myProject = psiElement.getProject();
@@ -63,11 +62,9 @@ public abstract class TemplateLanguageStructureViewBuilder extends TreeBasedStru
PsiFile file = psiElement.getContainingFile();
if (file != null) {
for (Language language : getLanguages(psiElement.getContainingFile())) {
for (Language language : getLanguages(file)) {
StructureViewBuilder builder = getBuilder(file, language);
if (builder != null) {
myLanguageToBuilderMap.put(language, builder);
}
myLanguageToBuilderMap.put(language, builder);
}
}
}
@@ -82,6 +79,7 @@ public abstract class TemplateLanguageStructureViewBuilder extends TreeBasedStru
List<StructureViewComposite.StructureViewDescriptor> viewDescriptors = new ArrayList<>();
for (Language language : myLanguageToBuilderMap.keySet()) {
StructureViewBuilder builder = myLanguageToBuilderMap.get(language);
if (builder == null) continue;
StructureView structureView = builder.createStructureView(fileEditor, project);
String title = language.getDisplayName();
Icon icon = ObjectUtils.notNull(LanguageUtil.getLanguageFileType(language), FileTypes.UNKNOWN).getIcon();