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

AP-7517 Fix bug where bundled dictionaries would not overwrite local dictionaries even if they are more recent.

Browse Source 
GitOrigin-RevId: f6bd8326dcf714c6d820ba21d8c30c848aecc89b
This commit is contained in:
Dennis.Scheffer
2025-09-04 15:11:06 +00:00
committed by intellij-monorepo-bot
parent 273f4c0226
commit 885291fe87
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/statistics/src/com/intellij/internal/statistic/eventLog/validator/storage/persistence/EventLogMetadataPersistence.java
+8 -9
View File
@@ -169,17 +169,18 @@ public class EventLogMetadataPersistence extends BaseEventLogMetadataPersistence
return true;
}
private void initAllBuiltinDictionaries(@NotNull Path file) throws IOException {
RemoteDictionaryList dictionaryList;
try (InputStream stream = getClass().getClassLoader().getResourceAsStream(builtinDictionariesPath() + "dictionaries.json")) {
private RemoteDictionaryList readBuiltinDictionaryList() throws IOException {
try (InputStream stream = getClass().getClassLoader().getResourceAsStream(builtinDictionariesPath() + DICTIONARIES_LIST_FILE)) {
if (stream == null) {
LOG.trace("Cannot load builtin dictionaries list");
return;
return null;
}
String content = new String(stream.readAllBytes(), StandardCharsets.UTF_8);
dictionaryList = getRemoteDictionaryList(content);
return getRemoteDictionaryList(content);
}
}
private void initAllBuiltinDictionaries(@NotNull Path file) throws IOException {
RemoteDictionaryList dictionaryList = readBuiltinDictionaryList();
if (dictionaryList == null) {
LOG.trace("Cannot load builtin dictionaries list");
return;
@@ -283,9 +284,7 @@ public class EventLogMetadataPersistence extends BaseEventLogMetadataPersistence
DictionaryStorage builtinDictionaryStorage = new SimpleDictionaryStorage(
tempDictionaryDir.toFile(), Dictionary.AccessMode.RANDOM_FILE_ACCESS
);
Path dictionariesList = Path.of(builtinDictionariesPath() + DICTIONARIES_LIST_FILE);
String dictionariesListJson = readJsonFileContent(dictionariesList);
RemoteDictionaryList builtinRemoteDictionaryList = getRemoteDictionaryList(dictionariesListJson);
RemoteDictionaryList builtinRemoteDictionaryList = readBuiltinDictionaryList();
// no builtin dictionaries, so we can not initialize them
if (builtinRemoteDictionaryList == null) {