MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-21 22:11:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java] Fix spelling mistake

Browse Source 
#IDEA-370797

GitOrigin-RevId: 190b6511a8ec3514c9fe3fe286b798aff19824b5
This commit is contained in:
Bart van Helvert
2025-04-14 20:47:27 +02:00
committed by intellij-monorepo-bot
parent dfdb0a5170
commit a21cc87462
11 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/java-analysis-api/src/com/intellij/openapi/module/JdkApiCompatabilityCache.java → java/java-analysis-api/src/com/intellij/openapi/module/JdkApiCompatibilityCache.java
View File

@@ -23,13 +23,13 @@ import java.util.*;
* Stores a compatibility matrix for JDK APIs. The matrix is generated from {@code @since} tags in the JDK source code.
*/
@Service(Service.Level.APP)
public final class JdkApiCompatabilityCache {
private static final Logger LOG = Logger.getInstance(JdkApiCompatabilityCache.class);
public final class JdkApiCompatibilityCache {
private static final Logger LOG = Logger.getInstance(JdkApiCompatibilityCache.class);
private final Map<LanguageLevel, List<String>> cache = new EnumMap<>(LanguageLevel.class);
public static JdkApiCompatabilityCache getInstance() {
return ApplicationManager.getApplication().getService(JdkApiCompatabilityCache.class);
public static JdkApiCompatibilityCache getInstance() {
return ApplicationManager.getApplication().getService(JdkApiCompatibilityCache.class);
}
/**
@@ -97,7 +97,7 @@ public final class JdkApiCompatabilityCache {
List<String> result = cache.get(languageLevel);
if (result != null) return result;
result = Collections.emptyList();
URL resource = JdkApiCompatabilityCache.class.getResource("api" + featureString + ".txt");
URL resource = JdkApiCompatibilityCache.class.getResource("api" + featureString + ".txt");
if (resource != null) {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(resource.openStream(), StandardCharsets.UTF_8))) {
result = FileUtil.loadLines(reader);

8
java/java-analysis-api/src/com/intellij/openapi/module/LanguageLevelUtil.java
View File

@@ -88,11 +88,11 @@ public final class LanguageLevelUtil {
*/
@Deprecated(forRemoval = true)
public static @Nullable LanguageLevel getLastIncompatibleLanguageLevel(@NotNull PsiMember member, @NotNull LanguageLevel languageLevel) {
return JdkApiCompatabilityCache.getInstance().firstCompatibleLanguageLevel(member, languageLevel);
return JdkApiCompatibilityCache.getInstance().firstCompatibleLanguageLevel(member, languageLevel);
}
/**
* @deprecated Please use {@link JdkApiCompatabilityCache} to check for incompatible APIs.
* @deprecated Please use {@link JdkApiCompatibilityCache} to check for incompatible APIs.
*/
@Deprecated(forRemoval = true)
public static Set<String> loadSignatureList(@NotNull URL resource) {
@@ -108,10 +108,10 @@ public final class LanguageLevelUtil {
/**
* For serialization of forbidden api.
*
* @deprecated Please don't use this, this API was moved to {@link JdkApiCompatabilityCache} and is for internal use only.
* @deprecated Please don't use this, this API was moved to {@link JdkApiCompatibilityCache} and is for internal use only.
*/
@Deprecated(forRemoval = true)
public static @Nullable String getSignature(@Nullable PsiMember member) {
return JdkApiCompatabilityCache.getInstance().getSignature(member);
return JdkApiCompatibilityCache.getInstance().getSignature(member);
}
}

4
java/java-impl-inspections/src/com/intellij/codeInspection/CharsetObjectCanBeUsedInspection.java
View File

@@ -7,7 +7,7 @@ import com.intellij.codeInsight.daemon.impl.quickfix.DeleteMultiCatchFix;
import com.intellij.java.JavaBundle;
import com.intellij.modcommand.ModPsiUpdater;
import com.intellij.modcommand.PsiUpdateModCommandQuickFix;
import com.intellij.openapi.module.JdkApiCompatabilityCache;
import com.intellij.openapi.module.JdkApiCompatibilityCache;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.pom.java.LanguageLevel;
@@ -205,7 +205,7 @@ public final class CharsetObjectCanBeUsedInspection extends AbstractBaseJavaLoca
PsiMethod[] candidates = method.isConstructor() ? aClass.getConstructors() : aClass.findMethodsByName(method.getName(), false);
PsiMethod charsetMethod = Arrays.stream(candidates)
.filter(psiMethod -> checkMethod(psiMethod, "java.nio.charset.Charset"))
.filter(psiMethod -> JdkApiCompatabilityCache.getInstance().firstCompatibleLanguageLevel(psiMethod, languageLevel) == null)
.filter(psiMethod -> JdkApiCompatibilityCache.getInstance().firstCompatibleLanguageLevel(psiMethod, languageLevel) == null)
.findFirst().orElse(null);
if (charsetMethod == null) return null;
return new CharsetMatch(argument, method, charsetMethod);

4
java/java-impl/src/com/intellij/codeInsight/FunctionalInterfaceSuggester.java
View File

@@ -5,7 +5,7 @@ import com.intellij.java.JavaBundle;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.application.ReadActionProcessor;
import com.intellij.openapi.module.JdkApiCompatabilityCache;
import com.intellij.openapi.module.JdkApiCompatibilityCache;
import com.intellij.openapi.progress.EmptyProgressIndicator;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
@@ -151,7 +151,7 @@ public final class FunctionalInterfaceSuggester {
@Override
public boolean processInReadAction(PsiMember member) {
if (member instanceof PsiClass &&
JdkApiCompatabilityCache.getInstance().firstCompatibleLanguageLevel(member, PsiUtil.getLanguageLevel(element)) == null) {
JdkApiCompatibilityCache.getInstance().firstCompatibleLanguageLevel(member, PsiUtil.getLanguageLevel(element)) == null) {
if (!JavaPsiFacade.getInstance(project).getResolveHelper().isAccessible(member, element, null)) {
return true;
}

4
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
View File

@@ -19,7 +19,7 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.RangeMarker;
import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.module.JdkApiCompatabilityCache;
import com.intellij.openapi.module.JdkApiCompatibilityCache;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.*;
@@ -503,7 +503,7 @@ public final class JavaCompletionUtil {
private @Nullable LookupElement generateLookupElementDecorator(@Nullable PsiType qualifierType, @NotNull Object object,
@NotNull Function<Consumer<LookupElementPresentation>, LookupElementDecorator<LookupElement>> generator) {
if (object instanceof PsiMember) {
if (JdkApiCompatabilityCache.getInstance().firstCompatibleLanguageLevel((PsiMember)object, myLanguageLevel) != null) {
if (JdkApiCompatibilityCache.getInstance().firstCompatibleLanguageLevel((PsiMember)object, myLanguageLevel) != null) {
LookupElementDecorator<LookupElement> element = generator.apply(presentation -> presentation.setItemTextForeground(JBColor.RED));
return PrioritizedLookupElement.withExplicitProximity(element, -1);
}

4
java/java-impl/src/com/siyeh/ig/inheritance/MissingOverrideAnnotationInspection.java
View File

@@ -6,7 +6,7 @@ import com.intellij.codeInspection.AnnotateMethodFix;
import com.intellij.codeInspection.CleanupLocalInspectionTool;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.openapi.module.JdkApiCompatabilityCache;
import com.intellij.openapi.module.JdkApiCompatibilityCache;
import com.intellij.openapi.module.LanguageLevelUtil;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
@@ -216,7 +216,7 @@ public class MissingOverrideAnnotationInspection extends BaseInspection implemen
@Contract("_, _, _,null -> true")
private static boolean ignoreSuperMethod(PsiMethod method, PsiClass methodClass, PsiMethod superMethod, PsiClass superClass) {
return !InheritanceUtil.isInheritorOrSelf(methodClass, superClass, true) ||
JdkApiCompatabilityCache.getInstance().firstCompatibleLanguageLevel(superMethod, PsiUtil.getLanguageLevel(method)) != null;
JdkApiCompatibilityCache.getInstance().firstCompatibleLanguageLevel(superMethod, PsiUtil.getLanguageLevel(method)) != null;
}
}

4
java/java-impl/src/com/siyeh/ig/internationalization/ImplicitDefaultCharsetUsageInspection.java
View File

@@ -6,7 +6,7 @@ import com.intellij.codeInspection.CleanupLocalInspectionTool;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.modcommand.ModPsiUpdater;
import com.intellij.modcommand.PsiUpdateModCommandQuickFix;
import com.intellij.openapi.module.JdkApiCompatabilityCache;
import com.intellij.openapi.module.JdkApiCompatibilityCache;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.pom.java.LanguageLevel;
@@ -62,7 +62,7 @@ public final class ImplicitDefaultCharsetUsageInspection extends BaseInspection
}
LocalQuickFix createFix(LanguageLevel level) {
return myMethod == null || JdkApiCompatabilityCache.getInstance().firstCompatibleLanguageLevel(myMethod, level) != null
return myMethod == null || JdkApiCompatibilityCache.getInstance().firstCompatibleLanguageLevel(myMethod, level) != null
? null
: new AddUtf8CharsetFix(this);
}

4
java/java-impl/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspection.java
View File

@@ -8,7 +8,7 @@ import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.options.OptPane;
import com.intellij.modcommand.ModPsiUpdater;
import com.intellij.modcommand.PsiUpdateModCommandQuickFix;
import com.intellij.openapi.module.JdkApiCompatabilityCache;
import com.intellij.openapi.module.JdkApiCompatibilityCache;
import com.intellij.openapi.project.Project;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
@@ -115,7 +115,7 @@ public final class SizeReplaceableByIsEmptyInspection extends BaseInspection {
private class SizeReplaceableByIsEmptyVisitor extends BaseInspectionVisitor {
private static boolean isLanguageLevelCompatible(PsiElement element, PsiMethod method) {
LanguageLevel languageLevel = PsiUtil.getLanguageLevel(element);
LanguageLevel lastIncompatibleLanguageLevel = JdkApiCompatabilityCache.getInstance().firstCompatibleLanguageLevel(method, languageLevel);
LanguageLevel lastIncompatibleLanguageLevel = JdkApiCompatibilityCache.getInstance().firstCompatibleLanguageLevel(method, languageLevel);
return lastIncompatibleLanguageLevel == null || lastIncompatibleLanguageLevel.isLessThan(languageLevel);
}

8
jvm/jvm-analysis-impl/src/com/intellij/codeInspection/JavaApiUsageInspection.kt
View File

@@ -14,7 +14,7 @@ import com.intellij.java.JavaBundle
import com.intellij.lang.Language
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.module.JdkApiCompatabilityCache
import com.intellij.openapi.module.JdkApiCompatibilityCache
import com.intellij.openapi.module.LanguageLevelUtil
import com.intellij.openapi.module.Module
import com.intellij.openapi.module.ModuleUtilCore
@@ -142,7 +142,7 @@ class JavaApiUsageInspection : AbstractBaseUastLocalInspectionTool() {
val module = ModuleUtilCore.findModuleForPsiElement(sourcePsi) ?: return
val languageLevel = getEffectiveLanguageLevel(module)
val lastIncompatibleLevel = overriddenMethods.mapNotNull { overriddenMethod ->
JdkApiCompatabilityCache.getInstance().firstCompatibleLanguageLevel(overriddenMethod, languageLevel)
JdkApiCompatibilityCache.getInstance().firstCompatibleLanguageLevel(overriddenMethod, languageLevel)
}.minOrNull() ?: return
val toHighlight = overrideAnnotation?.uastAnchor?.sourcePsi ?: method.uastAnchor?.sourcePsi ?: return
if (shouldReportSinceLevelForElement(lastIncompatibleLevel, sourcePsi) == true) return
@@ -162,7 +162,7 @@ class JavaApiUsageInspection : AbstractBaseUastLocalInspectionTool() {
val sourcePsi = sourceNode.sourcePsi ?: return
val module = ModuleUtilCore.findModuleForPsiElement(sourcePsi) ?: return
val languageLevel = getEffectiveLanguageLevel(module)
val lastIncompatibleLevel = JdkApiCompatabilityCache.getInstance().firstCompatibleLanguageLevel(constructor, languageLevel)
val lastIncompatibleLevel = JdkApiCompatibilityCache.getInstance().firstCompatibleLanguageLevel(constructor, languageLevel)
?: return
if (shouldReportSinceLevelForElement(lastIncompatibleLevel, sourcePsi) == true) return
registerError(sourcePsi, lastIncompatibleLevel, holder, isOnTheFly)
@@ -184,7 +184,7 @@ class JavaApiUsageInspection : AbstractBaseUastLocalInspectionTool() {
languageLevel = sourcePsi.containingFile.getUserData(PsiUtil.FILE_LANGUAGE_LEVEL_KEY)
}
if (languageLevel == null) return
val lastIncompatibleLevel = JdkApiCompatabilityCache.getInstance().firstCompatibleLanguageLevel(target, languageLevel)
val lastIncompatibleLevel = JdkApiCompatibilityCache.getInstance().firstCompatibleLanguageLevel(target, languageLevel)
if (lastIncompatibleLevel != null) {
if (shouldReportSinceLevelForElement(lastIncompatibleLevel, sourcePsi) == true) return
val psiClass = if (qualifier != null) {

6
jvm/jvm-analysis-internal-testFramework/src/com/intellij/jvm/analysis/internal/testFramework/JavaApiUsageGenerator.kt
View File

@@ -5,7 +5,7 @@ import com.intellij.jvm.analysis.internal.testFramework.JavaApiUsageGenerator.Co
import com.intellij.jvm.analysis.internal.testFramework.JavaApiUsageGenerator.Companion.LANGUAGE_LEVEL
import com.intellij.jvm.analysis.internal.testFramework.JavaApiUsageGenerator.Companion.PREVIEW_JDK_HOME
import com.intellij.jvm.analysis.internal.testFramework.JavaApiUsageGenerator.Companion.SINCE_VERSION
import com.intellij.openapi.module.JdkApiCompatabilityCache
import com.intellij.openapi.module.JdkApiCompatibilityCache
import com.intellij.openapi.projectRoots.JavaSdk
import com.intellij.openapi.projectRoots.Sdk
import com.intellij.openapi.roots.ContentIterator
@@ -173,7 +173,7 @@ class JavaApiUsageGenerator : LightJavaCodeInsightFixtureTestCase() {
member.hasAnnotation(JavaPreviewFeatureUtil.JDK_INTERNAL_JAVAC_PREVIEW_FEATURE)
}
.filter { member -> getLanguageLevel(member) == LANGUAGE_LEVEL }
.mapNotNull { JdkApiCompatabilityCache.getInstance().getSignature(it) }
.mapNotNull { JdkApiCompatibilityCache.getInstance().getSignature(it) }
)
return true
}
@@ -195,7 +195,7 @@ class JavaApiUsageGenerator : LightJavaCodeInsightFixtureTestCase() {
override fun visitElement(element: PsiElement) {
super.visitElement(element)
if (element is PsiMember && element.isPublicApi()) {
val signature = JdkApiCompatabilityCache.getInstance().getSignature(element) ?: return
val signature = JdkApiCompatibilityCache.getInstance().getSignature(element) ?: return
val className = signature.substringBefore("#")
if (JavaPsiFacade.getInstance(project).findClass(className, GlobalSearchScope.allScope(project)) == null) {
return // If the class is not in all scope, don't generate

4
plugins/ui-designer/src/com/intellij/uiDesigner/inspections/Java15FormInspection.java
View File

@@ -1,7 +1,7 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.uiDesigner.inspections;
import com.intellij.openapi.module.JdkApiCompatabilityCache;
import com.intellij.openapi.module.JdkApiCompatibilityCache;
import com.intellij.openapi.module.LanguageLevelUtil;
import com.intellij.openapi.module.Module;
import com.intellij.pom.java.LanguageLevel;
@@ -44,7 +44,7 @@ public final class Java15FormInspection extends BaseFormInspection {
final PsiMethod getter = PropertyUtilBase.findPropertyGetter(aClass, prop.getName(), false, true);
if (getter == null) continue;
final LanguageLevel languageLevel = LanguageLevelUtil.getEffectiveLanguageLevel(module);
if (JdkApiCompatabilityCache.getInstance().firstCompatibleLanguageLevel(getter, languageLevel) != null) {
if (JdkApiCompatibilityCache.getInstance().firstCompatibleLanguageLevel(getter, languageLevel) != null) {
registerError(component, collector, prop, "@since " + languageLevel.toJavaVersion().toFeatureString());
}
}