From c38385c1c19869fcc7a02ca40af7cd668b0d90ea Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 15 Sep 2011 15:15:33 +0200 Subject: [PATCH] one more pull up from PsiUtilBase --- java/jsp-openapi/src/com/intellij/psi/JspPsiUtil.java | 4 ++-- java/openapi/src/com/intellij/psi/util/PsiUtil.java | 2 +- .../src/com/intellij/psi/util/PsiUtilCore.java | 10 ++++++++++ .../src/com/intellij/psi/util/PsiUtilBase.java | 10 ---------- .../generation/actions/SurroundWithAction.java | 4 ++-- .../source/codeStyle/CodeStyleManagerRunnable.java | 4 ++-- .../source/tree/injected/MultiHostRegistrarImpl.java | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/java/jsp-openapi/src/com/intellij/psi/JspPsiUtil.java b/java/jsp-openapi/src/com/intellij/psi/JspPsiUtil.java index c7255195b5f7..2bb82cb75f6e 100644 --- a/java/jsp-openapi/src/com/intellij/psi/JspPsiUtil.java +++ b/java/jsp-openapi/src/com/intellij/psi/JspPsiUtil.java @@ -15,9 +15,9 @@ */ package com.intellij.psi; +import com.intellij.psi.util.PsiUtilCore; import org.jetbrains.annotations.Nullable; import com.intellij.psi.jsp.JspFile; -import com.intellij.psi.util.PsiUtilBase; /** * @author yole @@ -28,7 +28,7 @@ public class JspPsiUtil { } public static JspFile getJspFile(final PsiElement element) { - final PsiFile psiFile = PsiUtilBase.getTemplateLanguageFile(element); + final PsiFile psiFile = PsiUtilCore.getTemplateLanguageFile(element); return psiFile instanceof JspFile ? (JspFile)psiFile : null; /*final FileViewProvider provider = element.getContainingFile().getViewProvider(); diff --git a/java/openapi/src/com/intellij/psi/util/PsiUtil.java b/java/openapi/src/com/intellij/psi/util/PsiUtil.java index d4db90343f57..590eb3338761 100644 --- a/java/openapi/src/com/intellij/psi/util/PsiUtil.java +++ b/java/openapi/src/com/intellij/psi/util/PsiUtil.java @@ -207,7 +207,7 @@ public final class PsiUtil extends PsiUtilCore { if (element instanceof PsiClass && !isLocalOrAnonymousClass((PsiClass)element)) { break; } - if (element instanceof PsiFile && PsiUtilBase.getTemplateLanguageFile(element) != null) { + if (element instanceof PsiFile && PsiUtilCore.getTemplateLanguageFile(element) != null) { return element; } } diff --git a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java index 9e2206215cda..2c33c5143100 100644 --- a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java +++ b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java @@ -340,4 +340,14 @@ public class PsiUtilCore { } return elt; } + + @Nullable + public static PsiFile getTemplateLanguageFile(final PsiElement element) { + if (element == null) return null; + final PsiFile containingFile = element.getContainingFile(); + if (containingFile == null) return null; + + final FileViewProvider viewProvider = containingFile.getViewProvider(); + return viewProvider.getPsi(viewProvider.getBaseLanguage()); + } } diff --git a/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java b/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java index ccf565b7fc50..25e9e4bd0172 100644 --- a/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java +++ b/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java @@ -94,16 +94,6 @@ public class PsiUtilBase extends PsiUtilCore { return elt.getLanguage(); } - @Nullable - public static PsiFile getTemplateLanguageFile(final PsiElement element) { - if (element == null) return null; - final PsiFile containingFile = element.getContainingFile(); - if (containingFile == null) return null; - - final FileViewProvider viewProvider = containingFile.getViewProvider(); - return viewProvider.getPsi(viewProvider.getBaseLanguage()); - } - /** @return name for element using element structure info */ @Nullable diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/SurroundWithAction.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/SurroundWithAction.java index bc434ffd06c2..30f21ba01e58 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/SurroundWithAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/SurroundWithAction.java @@ -25,7 +25,7 @@ import com.intellij.lang.LanguageSurrounders; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; public class SurroundWithAction extends BaseCodeInsightAction{ public SurroundWithAction() { @@ -41,7 +41,7 @@ public class SurroundWithAction extends BaseCodeInsightAction{ if (!LanguageSurrounders.INSTANCE.allForLanguage(language).isEmpty()) { return true; } - final PsiFile baseFile = PsiUtilBase.getTemplateLanguageFile(file); + final PsiFile baseFile = PsiUtilCore.getTemplateLanguageFile(file); if (baseFile != null && baseFile != file && !LanguageSurrounders.INSTANCE.allForLanguage(baseFile.getLanguage()).isEmpty()) { return true; } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerRunnable.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerRunnable.java index 331b520eb859..d3e7978fbc1f 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerRunnable.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerRunnable.java @@ -29,7 +29,7 @@ import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.formatter.DocumentBasedFormattingModel; import com.intellij.psi.impl.source.SourceTreeToPsiMap; import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.text.CharArrayUtil; import org.jetbrains.annotations.Nullable; @@ -68,7 +68,7 @@ abstract class CodeStyleManagerRunnable { } } - final PsiFile templateFile = PsiUtilBase.getTemplateLanguageFile(file); + final PsiFile templateFile = PsiUtilCore.getTemplateLanguageFile(file); if (templateFile != null) { file = templateFile; document = documentManager.getDocument(templateFile); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/MultiHostRegistrarImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/MultiHostRegistrarImpl.java index c3f9bb2dc0bb..a6807878dcef 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/MultiHostRegistrarImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/MultiHostRegistrarImpl.java @@ -52,7 +52,7 @@ import com.intellij.psi.impl.source.tree.TreeElement; import com.intellij.psi.impl.source.tree.TreeUtil; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.ArrayUtil; import com.intellij.util.SmartList; import org.jetbrains.annotations.NonNls; @@ -84,7 +84,7 @@ public class MultiHostRegistrarImpl implements MultiHostRegistrar { MultiHostRegistrarImpl(@NotNull Project project, @NotNull PsiFile hostPsiFile, @NotNull PsiElement contextElement) { myProject = project; myContextElement = contextElement; - myHostPsiFile = PsiUtilBase.getTemplateLanguageFile(hostPsiFile); + myHostPsiFile = PsiUtilCore.getTemplateLanguageFile(hostPsiFile); myPsiManager = myHostPsiFile.getManager(); cleared = true; } @@ -145,7 +145,7 @@ public class MultiHostRegistrarImpl implements MultiHostRegistrar { @NotNull TextRange rangeInsideHost) { ProperTextRange.assertProperRange(rangeInsideHost); - PsiFile containingFile = PsiUtilBase.getTemplateLanguageFile(host); + PsiFile containingFile = PsiUtilCore.getTemplateLanguageFile(host); assert containingFile == myHostPsiFile : exceptionContext("Trying to inject into foreign file: "+containingFile); TextRange hostTextRange = host.getTextRange(); if (!hostTextRange.contains(rangeInsideHost.shiftRight(hostTextRange.getStartOffset()))) {