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

one more pull up from PsiUtilBase

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-09-20 12:54:51 +02:00
parent 7618abf069
commit c38385c1c1
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/jsp-openapi/src/com/intellij/psi/JspPsiUtil.java
+2 -2
View File
@@ -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();
java/openapi/src/com/intellij/psi/util/PsiUtil.java
+1 -1
View File
@@ -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;
}
}
platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java
+10
View File
@@ -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());
}
}
platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java
-10
View File
@@ -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
platform/lang-impl/src/com/intellij/codeInsight/generation/actions/SurroundWithAction.java
+2 -2
View File
@@ -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;
}
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerRunnable.java
+2 -2
View File
@@ -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<T> {
}
}
final PsiFile templateFile = PsiUtilBase.getTemplateLanguageFile(file);
final PsiFile templateFile = PsiUtilCore.getTemplateLanguageFile(file);
if (templateFile != null) {
file = templateFile;
document = documentManager.getDocument(templateFile);
platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/MultiHostRegistrarImpl.java
+3 -3
View File
@@ -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()))) {