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

store substituted info per (project, file) instead of per file to prevent endless reparsing if the same file has different substituted languges in different projects (DBE-3492)

Browse Source
This commit is contained in:
Sergey Simonchik
2016-11-29 15:28:19 +03:00
parent 03c2b9d4fe
commit f1db01a417
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/psi/LanguageSubstitutors.java
+22 -6
View File
@@ -34,7 +34,7 @@ import org.jetbrains.annotations.NotNull;
public final class LanguageSubstitutors extends LanguageExtension<LanguageSubstitutor> {
public static final LanguageSubstitutors INSTANCE = new LanguageSubstitutors();
private static final Logger LOG = Logger.getInstance(LanguageSubstitutors.class);
private static final Key<Language> SUBSTITUTED_LANG_KEY = Key.create("SUBSTITUTED_LANG_KEY");
private static final Key<Key<Language>> PROJECT_KEY_FOR_SUBSTITUTED_LANG_KEY = Key.create("PROJECT_KEY_FOR_SUBSTITUTED_LANG_KEY");
private static final Key<Boolean> REPARSING_SCHEDULED = Key.create("REPARSING_SCHEDULED");
private LanguageSubstitutors() {
@@ -46,26 +46,27 @@ public final class LanguageSubstitutors extends LanguageExtension<LanguageSubsti
for (LanguageSubstitutor substitutor : forKey(lang)) {
Language language = substitutor.getLanguage(file, project);
if (language != null) {
processLanguageSubstitution(file, lang, language);
processLanguageSubstitution(file, lang, language, project);
return language;
}
}
return lang;
}
private static void processLanguageSubstitution(@NotNull final VirtualFile file,
@NotNull Language originalLang,
@NotNull final Language substitutedLang) {
@NotNull final Language substitutedLang,
@NotNull Project project) {
if (file instanceof VirtualFileWindow) {
// Injected files are created with substituted language, no need to reparse:
// com.intellij.psi.impl.source.tree.injected.MultiHostRegistrarImpl#doneInjecting
return;
}
Language prevSubstitutedLang = SUBSTITUTED_LANG_KEY.get(file);
Key<Language> projectKey = getOrCreateProjectKey(project);
Language prevSubstitutedLang = projectKey.get(file);
final Language prevLang = ObjectUtils.notNull(prevSubstitutedLang, originalLang);
if (!prevLang.is(substitutedLang)) {
if (file.replace(SUBSTITUTED_LANG_KEY, prevSubstitutedLang, substitutedLang)) {
if (file.replace(projectKey, prevSubstitutedLang, substitutedLang)) {
if (prevSubstitutedLang == null) {
return; // no need to reparse for the first language substitution
}
@@ -87,6 +88,21 @@ public final class LanguageSubstitutors extends LanguageExtension<LanguageSubsti
}
}
@NotNull
private static Key<Language> getOrCreateProjectKey(@NotNull Project project) {
Key<Language> key = PROJECT_KEY_FOR_SUBSTITUTED_LANG_KEY.get(project);
if (key == null) {
synchronized (PROJECT_KEY_FOR_SUBSTITUTED_LANG_KEY) {
key = PROJECT_KEY_FOR_SUBSTITUTED_LANG_KEY.get(project);
if (key == null) {
key = new Key<Language>("Substituted lang key for " + project.getName());
PROJECT_KEY_FOR_SUBSTITUTED_LANG_KEY.set(project, key);
}
}
}
return key;
}
public static void cancelReparsing(@NotNull VirtualFile file) {
REPARSING_SCHEDULED.set(file, null);
}