From ed75faa32385d86fcb7ba1c95083acc2d5efa532 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 1 Dec 2017 16:26:40 +0300
Subject: [PATCH] removed deprecated "getResult" usages

---
 .../impl/source/tree/injected/InjectedLanguageUtil.java    | 7 ++++---
 .../tree/injected/InjectedPsiCachedValueProvider.java      | 6 +-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java
index 584d2aa0645e..9d8596dd32c6 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java
@@ -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);
     }
   }
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedPsiCachedValueProvider.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedPsiCachedValueProvider.java
index bf55467c27be..b3155e2e0282 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedPsiCachedValueProvider.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedPsiCachedValueProvider.java
@@ -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;
     }
   }
 }