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

IDEA-158708 JSP code completion not working in IDEA 2016.2

Browse Source 
(cherry picked from commit bb701cf)
This commit is contained in:
Dmitry Avdeev
2016-07-26 13:20:42 +03:00
parent e6cc53f27d
commit 90db163e4c
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/psi/templateLanguages/TemplateLanguageUtil.java
+5
View File
@@ -39,6 +39,11 @@ public class TemplateLanguageUtil {
}
}
public static PsiFile getBaseFile(@NotNull PsiFile file) {
FileViewProvider viewProvider = file.getViewProvider();
return viewProvider.getPsi(viewProvider.getBaseLanguage());
}
public static boolean isInsideTemplateFile(@NotNull PsiElement element) {
return element.getContainingFile().getViewProvider() instanceof TemplateLanguageFileViewProvider;
}
platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixLiveTemplate.java
+2 -1
View File
@@ -40,6 +40,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiFileFactory;
import com.intellij.psi.impl.source.PsiFileImpl;
import com.intellij.psi.templateLanguages.TemplateLanguageUtil;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
@@ -272,7 +273,7 @@ public class PostfixLiveTemplate extends CustomLiveTemplateBase {
PsiFile copy = psiFileFactory.createFileFromText(file.getName(), file.getFileType(), fileContentWithoutKey);
if (copy instanceof PsiFileImpl) {
((PsiFileImpl) copy).setOriginalFile(file);
((PsiFileImpl) copy).setOriginalFile(TemplateLanguageUtil.getBaseFile(file));
}
VirtualFile vFile = copy.getVirtualFile();