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

[grazie] IJPL-236018 Russian spelling rule names are written in Russian and in English

Browse Source 
Merge-request: IJ-MR-195145
Merged-by: Ilia Permiashkin <ilia.permiashkin@jetbrains.com>

GitOrigin-RevId: 483219ae67c264c74ea8f1201719b9b31f8db5a5
This commit is contained in:
Ilia Permiashkin
2026-03-09 14:51:58 +00:00
committed by intellij-monorepo-bot
parent 63805ca5fa
commit 857c68e502
6 changed files with 105 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/DynamicBundle.java
+45 -23
View File
@@ -76,29 +76,30 @@ public class DynamicBundle extends AbstractBundle {
protected @NotNull ResourceBundle findBundle(@NotNull String pathToBundle,
@NotNull ClassLoader baseLoader,
@NotNull ResourceBundle.Control control) {
Locale locale = getResolveLocale();
return (DefaultBundleService.isDefaultBundle() ? ourDefaultCache : ourCache)
.computeIfAbsent(baseLoader, __ -> CollectionFactory.createConcurrentSoftValueMap())
.computeIfAbsent(pathToBundle, __ ->
.computeIfAbsent(new BundleCacheKey(pathToBundle, locale), __ ->
resolveResourceBundle(
getBundleClassLoader(),
baseLoader,
pathToBundle,
getResolveLocale(),
(loader, locale) -> super.findBundle(pathToBundle, loader, control, locale)
locale,
(loader, resolvedLocale) -> super.findBundle(pathToBundle, loader, control, resolvedLocale)
));
}
@Nullable
private static ResourceBundle getBundleFromCache(@NotNull ClassLoader loader, @NotNull String pathToBundle) {
Map<String, ResourceBundle> loaderCache = ourCache.get(loader);
private static ResourceBundle getBundleFromCache(@NotNull ClassLoader loader, @NotNull String pathToBundle, @NotNull Locale locale) {
Map<BundleCacheKey, ResourceBundle> loaderCache = ourCache.get(loader);
if (loaderCache == null) return null;
return loaderCache.get(pathToBundle);
return loaderCache.get(new BundleCacheKey(pathToBundle, locale));
}
private static void removeBundleFromCache(@NotNull ClassLoader loader, @NotNull String pathToBundle) {
Map<String, ResourceBundle> loaderCache = ourCache.get(loader);
private static void removeBundleFromCache(@NotNull ClassLoader loader, @NotNull String pathToBundle, @NotNull Locale locale) {
Map<BundleCacheKey, ResourceBundle> loaderCache = ourCache.get(loader);
if (loaderCache == null) return;
loaderCache.remove(pathToBundle);
loaderCache.remove(new BundleCacheKey(pathToBundle, locale));
}
private static @NotNull ResourceBundle resolveResourceBundle(@NotNull ClassLoader bundleClassLoader,
@@ -112,7 +113,7 @@ public class DynamicBundle extends AbstractBundle {
Map<LocalizationOrder, ResourceBundle> bundleOrderMap = new HashMap<>();
if (pluginClassLoader != null) {
try {
ResourceBundle pluginBundle = bundleResolver.apply(pluginClassLoader, Locale.ROOT);
ResourceBundle pluginBundle = bundleResolver.apply(pluginClassLoader, locale);
bundleOrderMap.put(LocalizationOrder.DEFAULT_PLUGIN, pluginBundle);
}
catch (MissingResourceException e) {
@@ -244,14 +245,15 @@ public class DynamicBundle extends AbstractBundle {
LOG.warn("Bundle without name cannot be properly cached: " + bundle);
return bundle;
}
ResourceBundle bundleFromCache = getBundleFromCache(classLoader, pathToBundle);
Locale locale = getResolveLocale();
ResourceBundle bundleFromCache = getBundleFromCache(classLoader, pathToBundle, locale);
if (bundleFromCache == null) {
// Return null to force findBundle execution which will properly resolve and cache the bundle
return null;
}
if (bundleFromCache != bundle) {
LOG.info("Cleanup bundle cache for " + pathToBundle);
removeBundleFromCache(classLoader, pathToBundle);
removeBundleFromCache(classLoader, pathToBundle, locale);
return null;
}
return bundle;
@@ -298,30 +300,50 @@ public class DynamicBundle extends AbstractBundle {
}
}
private static final Map<ClassLoader, Map<String, ResourceBundle>> ourCache = CollectionFactory.createConcurrentWeakMap();
private static final Map<ClassLoader, Map<String, ResourceBundle>> ourDefaultCache = CollectionFactory.createConcurrentWeakMap();
private static final class BundleCacheKey {
private final @NotNull String pathToBundle;
private final @NotNull Locale locale;
private BundleCacheKey(@NotNull String pathToBundle, @NotNull Locale locale) {
this.pathToBundle = pathToBundle;
this.locale = locale;
}
@Override
public boolean equals(Object obj) {
if (this == obj) return true;
if (!(obj instanceof BundleCacheKey)) return false;
BundleCacheKey key = (BundleCacheKey)obj;
return pathToBundle.equals(key.pathToBundle) && locale.equals(key.locale);
}
@Override
public int hashCode() {
int result = pathToBundle.hashCode();
result = 31 * result + locale.hashCode();
return result;
}
}
private static final Map<ClassLoader, Map<BundleCacheKey, ResourceBundle>> ourCache = CollectionFactory.createConcurrentWeakMap();
private static final Map<ClassLoader, Map<BundleCacheKey, ResourceBundle>> ourDefaultCache = CollectionFactory.createConcurrentWeakMap();
public static @NotNull ResourceBundle getResourceBundle(@NotNull ClassLoader loader, @NotNull @NonNls String pathToBundle) {
Locale locale = getResolveLocale();
return (DefaultBundleService.isDefaultBundle() ? ourDefaultCache : ourCache)
.computeIfAbsent(loader, __ -> CollectionFactory.createConcurrentSoftValueMap())
.computeIfAbsent(pathToBundle, __ -> resolveResourceBundle(loader, pathToBundle, getResolveLocale()));
.computeIfAbsent(new BundleCacheKey(pathToBundle, locale), __ -> resolveResourceBundle(loader, pathToBundle, locale));
}
public static @NotNull ResourceBundle getResourceBundle(@NotNull ClassLoader loader, @NotNull @NonNls String pathToBundle, @NotNull Locale locale) {
return (DefaultBundleService.isDefaultBundle() ? ourDefaultCache : ourCache)
.computeIfAbsent(loader, __ -> CollectionFactory.createConcurrentSoftValueMap())
.computeIfAbsent(pathToBundle, __ -> resolveResourceBundle(loader, pathToBundle, locale));
.computeIfAbsent(new BundleCacheKey(pathToBundle, locale), __ -> resolveResourceBundle(loader, pathToBundle, locale));
}
@ApiStatus.Internal
public static @NotNull ResourceBundle getResourceBundleLocalized(@NotNull ClassLoader loader, @NotNull @NonNls String pathToBundle, @NotNull Locale locale) {
ResourceBundle bundle = (DefaultBundleService.isDefaultBundle() ? ourDefaultCache : ourCache)
.computeIfAbsent(loader, __ -> CollectionFactory.createConcurrentSoftValueMap())
.get(pathToBundle);
if (bundle != null && bundle.getLocale().equals(locale)) {
return bundle;
}
return resolveResourceBundle(loader, pathToBundle, locale);
return getResourceBundle(loader, pathToBundle, locale);
}
public static @Nullable ResourceBundle getPluginBundle(@NotNull PluginDescriptor pluginDescriptor) {
platform/util/testResources/com/intellij/DynamicBundleLocaleCacheTestBundle.properties
+1
View File
@@ -0,0 +1 @@
value=root
platform/util/testResources/com/intellij/DynamicBundleLocaleCacheTestBundle_en.properties
+1
View File
@@ -0,0 +1 @@
value=en
platform/util/testResources/com/intellij/DynamicBundleLocaleCacheTestBundle_ru.properties
+1
View File
@@ -0,0 +1 @@
value=ru
platform/util/testSrc/com/intellij/DynamicBundleLocaleCacheTest.kt
+53
View File
@@ -0,0 +1,53 @@
// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.ValueSource
import java.util.Locale
import java.util.ResourceBundle
class DynamicBundleLocaleCacheTest {
@BeforeEach
fun setUp() {
DynamicBundle.clearCache()
ResourceBundle.clearCache(javaClass.classLoader)
}
@AfterEach
fun tearDown() {
DynamicBundle.clearCache()
ResourceBundle.clearCache(javaClass.classLoader)
}
@Test
fun `explicit locale lookups are cached per locale`() {
val loader = javaClass.classLoader
val englishBundle = DynamicBundle.getResourceBundle(loader, BUNDLE_NAME, Locale.ENGLISH)
val russianBundle = DynamicBundle.getResourceBundle(loader, BUNDLE_NAME, Locale.forLanguageTag("ru"))
assertThat(englishBundle.getString(MESSAGE_KEY)).isEqualTo("en")
assertThat(russianBundle.getString(MESSAGE_KEY)).isEqualTo("ru")
}
@ParameterizedTest
@ValueSource(strings = ["ru", "en"])
fun `default locale lookup does not poison explicit locale cache`(localeVariant: String) {
val loader = javaClass.classLoader
val locale = Locale.forLanguageTag(localeVariant)
DynamicBundle.getResourceBundle(loader, BUNDLE_NAME)
val explicitBundle = DynamicBundle.getResourceBundle(loader, BUNDLE_NAME, locale)
assertThat(explicitBundle.getString(MESSAGE_KEY)).isEqualTo(localeVariant)
}
companion object {
private const val BUNDLE_NAME = "com.intellij.DynamicBundleLocaleCacheTestBundle"
private const val MESSAGE_KEY = "value"
}
}
plugins/grazie/src/main/kotlin/com/intellij/grazie/GrazieDynamic.kt
+4 -8
View File
@@ -166,7 +166,8 @@ object GrazieDynamic : DynamicPluginListener {
fun getResourceBundle(baseName: String, locale: Locale): ResourceBundle {
return forClassLoader {
try {
DynamicBundle.getResourceBundle(GrazieBundle::class.java.classLoader, baseName)
DynamicBundle.getResourceBundle(it, baseName, locale)
.takeIf { bundle -> bundle.locale.language == locale.language }
}
catch (e: MissingResourceException) {
null
@@ -174,11 +175,6 @@ object GrazieDynamic : DynamicPluginListener {
} ?: throw MissingResourceException("Missing resource bundle for $baseName with locale $locale", GrazieDynamic.javaClass.name, baseName)
}
private inline fun <T : Any> forClassLoader(crossinline body: (ClassLoader) -> T?): T? {
return body(GraziePlugin.classLoader) ?: dynClassLoaders
.asSequence()
.mapNotNull {
body(it)
}.firstOrNull()
}
private inline fun <T : Any> forClassLoader(crossinline body: (ClassLoader) -> T?): T? =
body(GraziePlugin.classLoader) ?: dynClassLoaders.firstNotNullOfOrNull { body(it) }
}