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 language id so language won't stuck in VFS

Browse Source 
GitOrigin-RevId: b762374f985e4a919f62ca5d1c96ad5f9e77aa7e
This commit is contained in:
Dennis Ushakov
2020-01-30 10:32:21 +00:00
committed by intellij-monorepo-bot
parent bc90b4f87b
commit 17d1bed7ab
1 changed files with 6 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
+6 -6
View File
@@ -33,7 +33,7 @@ public final class LanguageSubstitutors extends LanguageExtension<LanguageSubsti
public static final LanguageSubstitutors INSTANCE = getInstance();
private static final Logger LOG = Logger.getInstance(LanguageSubstitutors.class);
private static final Key<Key<Language>> PROJECT_KEY_FOR_SUBSTITUTED_LANG_KEY = Key.create("PROJECT_KEY_FOR_SUBSTITUTED_LANG_KEY");
private static final Key<Key<String>> PROJECT_KEY_FOR_SUBSTITUTED_LANG_KEY = Key.create("PROJECT_KEY_FOR_SUBSTITUTED_LANG_KEY");
private static final AtomicBoolean REQUESTS_DRAIN_NEEDED = new AtomicBoolean(true);
private static final ConcurrentMap<VirtualFile, SubstitutionInfo> ourReparsingRequests = ContainerUtil.newConcurrentMap();
@@ -78,11 +78,11 @@ public final class LanguageSubstitutors extends LanguageExtension<LanguageSubsti
// com.intellij.psi.impl.source.tree.injected.MultiHostRegistrarImpl#doneInjecting
return;
}
Key<Language> projectKey = getOrCreateProjectKey(project);
Language prevSubstitutedLang = projectKey.get(file);
Key<String> projectKey = getOrCreateProjectKey(project);
Language prevSubstitutedLang = Language.findLanguageByID(projectKey.get(file));
final Language prevLang = ObjectUtils.notNull(prevSubstitutedLang, originalLang);
if (!prevLang.is(substitutedLang)) {
if (file.replace(projectKey, prevSubstitutedLang, substitutedLang)) {
if (file.replace(projectKey, prevSubstitutedLang != null ? prevSubstitutedLang.getID() : null, substitutedLang.getID())) {
if (prevSubstitutedLang == null) {
return; // no need to reparse for the first language substitution
}
@@ -95,8 +95,8 @@ 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);
private static Key<String> getOrCreateProjectKey(@NotNull Project project) {
Key<String> 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);