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

removed deprecated "getResult" usages

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-12-01 18:02:38 +03:00
parent 521cea8535
commit ed75faa323
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java
+4 -3
View File
@@ -686,9 +686,10 @@ public class InjectedLanguageUtil {
*/
public static <T> void putInjectedFileUserData(MultiHostRegistrar registrar, Key<T> key, T value) {
LOG.warn("use #putInjectedFileUserData(com.intellij.psi.PsiElement, com.intellij.lang.Language, com.intellij.openapi.util.Key, java.lang.Object)} instead");
final List<Pair<Place,PsiFile>> result = ((InjectionRegistrarImpl)registrar).getResult();
if (result != null && !result.isEmpty()) {
PsiFile file = result.get(result.size() - 1).getSecond();
InjectionResult result = ((InjectionRegistrarImpl)registrar).getInjectedResult();
if (result != null && result.files != null) {
List<PsiFile> files = result.files;
PsiFile file = files.get(files.size() - 1);
file.putUserData(key, value);
}
}
platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedPsiCachedValueProvider.java
+1 -5
View File
@@ -19,7 +19,6 @@ package com.intellij.psi.impl.source.tree.injected;
import com.intellij.lang.injection.MultiHostInjector;
import com.intellij.openapi.editor.ex.DocumentEx;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.FileViewProvider;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
@@ -30,8 +29,6 @@ import com.intellij.psi.util.PsiModificationTracker;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
class InjectedPsiCachedValueProvider implements ParameterizedCachedValueProvider<InjectionResult, PsiElement> {
@Override
public CachedValueProvider.Result<InjectionResult> compute(PsiElement element) {
@@ -77,8 +74,7 @@ class InjectedPsiCachedValueProvider implements ParameterizedCachedValueProvider
hostRegistrar = new InjectionRegistrarImpl(myProject, myHostPsiFile, element);
}
injector.getLanguagesToInject(hostRegistrar, element);
List<Pair<Place,PsiFile>> result = hostRegistrar.getResult();
return result == null;
return hostRegistrar.getInjectedResult() == null;
}
}
}