MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java] Rename methods to avoid mentioning explicit Java version

Browse Source 
GitOrigin-RevId: a2d0fcf924b19d88462cbae662f6bc50fac51903
This commit is contained in:
Tagir Valeev
2024-02-13 13:29:40 +01:00
committed by intellij-monorepo-bot
parent 487057d926
commit c3b35ef889
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-frontback-impl/src/com/intellij/codeInsight/editorActions/JavaBackspaceHandler.java
View File

@@ -16,12 +16,12 @@ public final class JavaBackspaceHandler extends BackspaceHandlerDelegate {
@Override
public void beforeCharDeleted(char c, @NotNull PsiFile file, @NotNull Editor editor) {
myToDeleteGt = c == '<' &&
isHigherThan50r(file) &&
areGenericsAvailable(file) &&
TypedHandlerUtil.isAfterClassLikeIdentifierOrDot(editor.getCaretModel().getOffset() - 1,
editor, JavaTokenType.DOT, JavaTokenType.IDENTIFIER, true);
}
private static boolean isHigherThan50r(@Nullable PsiFile file){
private static boolean areGenericsAvailable(@Nullable PsiFile file){
return file instanceof AbstractBasicJavaFile &&
JavaFeature.GENERICS.isSufficient(AbstractBasicJavaDefinitionService.getJavaDefinitionService().getLanguageLevel(file));
}

4
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
View File

@@ -84,7 +84,7 @@ public final class JavaFunctionalExpressionSearcher extends QueryExecutorBase<Ps
if (!aClass.isValid() || !aClass.isInterface()) {
return List.of();
}
if (InjectedLanguageManager.getInstance(project).isInjectedFragment(aClass.getContainingFile()) || !hasJava8Modules(project)) {
if (InjectedLanguageManager.getInstance(project).isInjectedFragment(aClass.getContainingFile()) || !hasModuleWithFunctionalExpressions(project)) {
return List.of();
}
PsiSearchHelper psiSearchHelper = PsiSearchHelper.getInstance(project);
@@ -340,7 +340,7 @@ public final class JavaFunctionalExpressionSearcher extends QueryExecutorBase<Ps
return ThreeState.UNSURE;
}
private static boolean hasJava8Modules(@NotNull Project project) {
private static boolean hasModuleWithFunctionalExpressions(@NotNull Project project) {
final boolean projectLevelIsHigh = JavaFeature.LAMBDA_EXPRESSIONS.isSufficient(PsiUtil.getLanguageLevel(project));
for (Module module : ModuleManager.getInstance(project).getModules()) {