MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix possible races in multiple roots file view providers

Browse Source
This commit is contained in:
Konstantin Ulitin
2015-12-23 21:29:48 +03:00
parent f1985504d6
commit 87f52eb3d3
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
python/python-rest/src/com/jetbrains/rest/RestFileViewProvider.java
View File

@@ -15,7 +15,6 @@
*/
package com.jetbrains.rest;
import com.google.common.collect.Sets;
import com.intellij.lang.Language;
import com.intellij.lang.LanguageParserDefinitions;
import com.intellij.lang.ParserDefinition;
@@ -25,6 +24,7 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.psi.impl.source.PsiFileImpl;
import com.intellij.psi.templateLanguages.TemplateLanguageFileViewProvider;
import com.intellij.util.containers.ContainerUtil;
import com.jetbrains.python.PythonLanguage;
import org.jetbrains.annotations.NotNull;
@@ -63,13 +63,14 @@ public class RestFileViewProvider extends MultiplePsiFilesPerDocumentFileViewPro
@NotNull
public Set<Language> getLanguages() {
if (myLanguages == null) {
myLanguages = Sets.newConcurrentHashSet();
myLanguages.add(getBaseLanguage());
final Set<Language> languages = ContainerUtil.newHashSet();
languages.add(getBaseLanguage());
Language djangoTemplateLanguage = Language.findLanguageByID("DjangoTemplate");
if (djangoTemplateLanguage != null) {
myLanguages.add(djangoTemplateLanguage);
languages.add(djangoTemplateLanguage);
}
myLanguages.add(getTemplateDataLanguage());
languages.add(getTemplateDataLanguage());
myLanguages = languages;
}
return myLanguages;
}