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

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2012-03-07 15:52:17 +04:00
parent 8d9e592a45
commit d3b0ad08df
1 changed files with 1 additions and 17 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
+1 -17
View File
@@ -91,12 +91,7 @@ public class InjectedLanguageUtil {
}
}
});
if (result.isEmpty()) {
return null;
}
else {
return result;
}
return result.isEmpty() ? null : result;
}
public static List<Trinity<IElementType, PsiLanguageInjectionHost, TextRange>> getHighlightTokens(PsiFile file) {
@@ -206,7 +201,6 @@ public class InjectedLanguageUtil {
private static final InjectedPsiCachedValueProvider INJECTED_PSI_PROVIDER = new InjectedPsiCachedValueProvider();
private static final Key<ParameterizedCachedValue<MultiHostRegistrarImpl, PsiElement>> INJECTED_PSI = Key.create("INJECTED_PSI");
private static final boolean DEBUG = false;
private static MultiHostRegistrarImpl probeElementsUp(@NotNull PsiElement element, @NotNull PsiFile hostPsiFile, boolean probeUp) {
PsiManager psiManager = hostPsiFile.getManager();
@@ -228,7 +222,6 @@ public class InjectedLanguageUtil {
else {
registrar = data.getValue(current);
}
if (DEBUG) log(current, (registrar == null ? "!": "")+" computed result="+registrar);
current = current.getParent(); // cache no injection for current
@@ -256,7 +249,6 @@ public class InjectedLanguageUtil {
ProgressManager.checkCanceled();
if (registrar == null) {
e.putUserData(INJECTED_PSI, null);
if (DEBUG) log(e, "Cache .INJECTED_PSI=null");
}
else {
ParameterizedCachedValue<MultiHostRegistrarImpl, PsiElement> cachedValue =
@@ -266,20 +258,12 @@ public class InjectedLanguageUtil {
((PsiParameterizedCachedValue<MultiHostRegistrarImpl, PsiElement>)cachedValue).setValue(result);
e.putUserData(INJECTED_PSI, cachedValue);
if (DEBUG) log(e, "Cache .INJECTED_PSI="+result);
}
}
}
return registrar;
}
private static void log(PsiElement e, String msg) {
//if (e.getClass().getName().equals("com.intellij.psi.impl.source.tree.java.PsiLiteralExpressionImpl")) {
// System.out.println(e+": "+ msg + " ("+Thread.currentThread()+")");
//}
}
public static PsiElement findInjectedElementNoCommit(@NotNull PsiFile hostFile, final int offset) {
if (hostFile instanceof PsiCompiledElement) return null;
Project project = hostFile.getProject();