Implement persistent disk cache with EhCache for TypoDiagnostic with WordStatus enum, separated cache managers, and tested EhCacheAdapter component

.gitignore

@@ -83,3 +83,4 @@ bsl-language-server_*.zip
 *.log
 *.hprof
 /.idea/material_theme_project_new.xml
+.bsl-ls-cache/

build.gradle.kts

@@ -75,6 +75,8 @@ dependencies {
 
     // кэширование
     api("com.github.ben-manes.caffeine", "caffeine", "3.2.0")
+    api("org.ehcache:ehcache:3.10.8")
+    api("javax.cache:cache-api:1.1.1")
 
     // lsp4j core
     api("org.eclipse.lsp4j", "org.eclipse.lsp4j", "0.24.0")
@@ -200,6 +202,14 @@ tasks.test {
 
     val jmockitPath = classpath.find { it.name.contains("jmockit") }!!.absolutePath
     jvmArgs("-javaagent:${jmockitPath}")
+
+    // Cleanup test cache directories after tests complete
+    doLast {
+        val tmpDir = File(System.getProperty("java.io.tmpdir"))
+        tmpDir.listFiles()?.filter { it.name.startsWith("bsl-ls-cache-") }?.forEach { cacheDir ->
+            cacheDir.deleteRecursively()
+        }
+    }
 }
 
 tasks.check {

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic.java

@@ -27,13 +27,16 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticSeverity;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticTag;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.typo.CheckedWordsHolder;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.typo.JLanguageToolPool;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.typo.WordStatus;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
 import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.antlr.v4.runtime.Token;
 import org.apache.commons.lang3.StringUtils;
@@ -49,7 +52,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -63,22 +65,17 @@
   }
 )
 @Slf4j
+@RequiredArgsConstructor
 public class TypoDiagnostic extends AbstractDiagnostic {
 
+  private final CheckedWordsHolder checkedWordsHolder;
+
   @Getter(lazy = true, value = AccessLevel.PRIVATE)
   private static final Map<String, JLanguageToolPool> languageToolPoolMap = Map.of(
     "en", new JLanguageToolPool(Languages.getLanguageForShortCode("en-US")),
     "ru", new JLanguageToolPool(Languages.getLanguageForShortCode("ru"))
   );
 
-  /**
-   * Карта, хранящая результат проверки слова (ошибка/нет ошибки) в разрезе языков.
-   */
-  private static final Map<String, Map<String, Boolean>> checkedWords = Map.of(
-    "en", new ConcurrentHashMap<>(),
-    "ru", new ConcurrentHashMap<>()
-  );
-
   private static final Pattern SPACES_PATTERN = Pattern.compile("\\s+");
   private static final Pattern QUOTE_PATTERN = Pattern.compile("\"");
   private static final String FORMAT_STRING_RU = "Л=|ЧЦ=|ЧДЦ=|ЧС=|ЧРД=|ЧРГ=|ЧН=|ЧВН=|ЧГ=|ЧО=|ДФ=|ДЛФ=|ДП=|БЛ=|БИ=";
@@ -166,12 +163,11 @@ private Map<String, List<Token>> getTokensMap(
   protected void check() {
 
     String lang = info.getResourceString("diagnosticLanguage");
-    Map<String, Boolean> checkedWordsForLang = checkedWords.get(lang);
     Map<String, List<Token>> tokensMap = getTokensMap(documentContext);
 
     // build string of unchecked words
     Set<String> uncheckedWords = tokensMap.keySet().stream()
-      .filter(word -> !checkedWordsForLang.containsKey(word))
+      .filter(word -> checkedWordsHolder.getWordStatus(lang, word) == WordStatus.MISSING)
       .collect(Collectors.toSet());
 
     if (uncheckedWords.isEmpty()) {
@@ -201,10 +197,12 @@ protected void check() {
     // check words and mark matched as checked
     matches.stream()
       .map(ruleMatch -> ruleMatch.getSentence().getTokens()[1].getToken())
-      .forEach(word -> checkedWordsForLang.put(word, true));
+      .forEach(word -> checkedWordsHolder.putWordStatus(lang, word, true));
 
     // mark unmatched words without errors as checked
-    uncheckedWords.forEach(word -> checkedWordsForLang.putIfAbsent(word, false));
+    uncheckedWords.stream()
+      .filter(word -> checkedWordsHolder.getWordStatus(lang, word) == WordStatus.MISSING)
+      .forEach(word -> checkedWordsHolder.putWordStatus(lang, word, false));
 
     fireDiagnosticOnCheckedWordsWithErrors(tokensMap);
   }
@@ -213,10 +211,9 @@ private void fireDiagnosticOnCheckedWordsWithErrors(
     Map<String, List<Token>> tokensMap
   ) {
     String lang = info.getResourceString("diagnosticLanguage");
-    Map<String, Boolean> checkedWordsForLang = checkedWords.get(lang);
 
     tokensMap.entrySet().stream()
-      .filter(entry -> checkedWordsForLang.getOrDefault(entry.getKey(), false))
+      .filter(entry -> checkedWordsHolder.getWordStatus(lang, entry.getKey()) == WordStatus.HAS_ERROR)
       .forEach((Map.Entry<String, List<Token>> entry) -> {
         String word = entry.getKey();
         List<Token> tokens = entry.getValue();

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/typo/CheckedWordsHolder.java

@@ -0,0 +1,59 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright (c) 2018-2025
+ * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * BSL Language Server is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * BSL Language Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with BSL Language Server.
+ */
+package com.github._1c_syntax.bsl.languageserver.diagnostics.typo;
+
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Component;
+
+/**
+ * Component for managing persistent cache of checked words for typo diagnostic.
+ * Uses Spring Cache with EhCache for persistent disk storage.
+ */
+@Component
+public class CheckedWordsHolder {
+
+  /**
+   * Get the status of a word from cache.
+   *
+   * @param lang language code ("en" or "ru")
+   * @param word the word to get status for
+   * @return WordStatus indicating if the word has an error, no error, or is missing from cache
+   */
+  @Cacheable(value = "typoCache", key = "#lang + ':' + #word", cacheManager = "typoCacheManager")
+  public WordStatus getWordStatus(String lang, String word) {
+    return WordStatus.MISSING;
+  }
+
+  /**
+   * Store the status of a word in the cache.
+   *
+   * @param lang language code ("en" or "ru")
+   * @param word the word to store status for
+   * @param hasError true if the word has a typo, false otherwise
+   * @return the stored WordStatus
+   */
+  @CachePut(value = "typoCache", key = "#lang + ':' + #word", cacheManager = "typoCacheManager")
+  public WordStatus putWordStatus(String lang, String word, boolean hasError) {
+    return hasError ? WordStatus.HAS_ERROR : WordStatus.NO_ERROR;
+  }
+}

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/typo/WordStatus.java

@@ -0,0 +1,44 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright (c) 2018-2025
+ * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * BSL Language Server is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * BSL Language Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with BSL Language Server.
+ */
+package com.github._1c_syntax.bsl.languageserver.diagnostics.typo;
+
+import java.io.Serializable;
+
+/**
+ * Status of a word's spell check result.
+ */
+public enum WordStatus implements Serializable {
+  /**
+   * Word has a spelling error.
+   */
+  HAS_ERROR,
+
+  /**
+   * Word is spelled correctly.
+   */
+  NO_ERROR,
+
+  /**
+   * Word has not been checked yet.
+   */
+  MISSING
+}

src/main/java/com/github/_1c_syntax/bsl/languageserver/infrastructure/CacheConfiguration.java

@@ -22,19 +22,44 @@
 package com.github._1c_syntax.bsl.languageserver.infrastructure;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.typo.WordStatus;
+import org.ehcache.config.builders.CacheConfigurationBuilder;
+import org.ehcache.config.builders.CacheManagerBuilder;
+import org.ehcache.config.builders.ResourcePoolsBuilder;
+import org.ehcache.config.units.EntryUnit;
+import org.ehcache.config.units.MemoryUnit;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.Cache;
+import org.springframework.cache.Cache.ValueRetrievalException;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.caffeine.CaffeineCacheManager;
+import org.springframework.cache.support.AbstractValueAdaptingCache;
+import org.springframework.cache.support.SimpleCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.concurrent.Callable;
 
 /**
  * Spring-конфигурация кэширования.
+ * <p>
+ * Для typoCache используется EhCache с персистентным хранилищем на диске.
+ * Для остальных кэшей (например, code lens) используется Caffeine с хранением в памяти.
  */
 @Configuration
 @EnableCaching
 public class CacheConfiguration {
+
+  /**
+   * Primary cache manager using Caffeine for in-memory caching.
+   * Used for all caches except typoCache.
+   */
   @Bean
+  @Primary
   public CacheManager cacheManager(Caffeine<Object, Object> caffeine) {
     var caffeineCacheManager = new CaffeineCacheManager();
     caffeineCacheManager.setCaffeine(caffeine);
@@ -45,4 +70,94 @@ public CacheManager cacheManager(Caffeine<Object, Object> caffeine) {
   public Caffeine<Object, Object> caffeineConfig() {
     return Caffeine.newBuilder();
   }
+
+  /**
+   * Dedicated EhCache manager for typoCache with persistent disk storage.
+   * Configured programmatically without XML.
+   */
+  @Bean(destroyMethod = "close")
+  public org.ehcache.CacheManager ehcacheManager(
+    @Value("${app.cache.path}") String cacheDirPath
+  ) {
+    var cacheDir = Path.of(cacheDirPath);
+
+    // Configure EhCache cache with disk persistence
+    var cacheConfig = CacheConfigurationBuilder
+      .newCacheConfigurationBuilder(
+        String.class,
+        WordStatus.class,
+        ResourcePoolsBuilder.newResourcePoolsBuilder()
+          .heap(100_000, EntryUnit.ENTRIES)
+          .disk(50, MemoryUnit.MB, true)
+      )
+      .build();
+
+    // Build native EhCache manager with persistence
+    return CacheManagerBuilder.newCacheManagerBuilder()
+      .with(CacheManagerBuilder.persistence(cacheDir.toFile()))
+      .withCache("typoCache", cacheConfig)
+      .build(true);
+  }
+
+  @Bean
+  public CacheManager typoCacheManager(org.ehcache.CacheManager ehcacheManager) {
+    var nativeCache = ehcacheManager.getCache("typoCache", String.class, WordStatus.class);
+
+    // Wrap the native cache with a custom Spring CacheManager
+    var simpleCacheManager = new SimpleCacheManager();
+    simpleCacheManager.setCaches(List.of(
+      new AbstractValueAdaptingCache(false) {
+        @Override
+        protected Object lookup(Object key) {
+          return nativeCache.get((String) key);
+        }
+
+        @Override
+        public String getName() {
+          return "typoCache";
+        }
+
+        @Override
+        public Object getNativeCache() {
+          return nativeCache;
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public <T> T get(Object key, Callable<T> valueLoader) {
+          var value = nativeCache.get((String) key);
+          if (value != null) {
+            return (T) value;
+          }
+          try {
+            T newValue = valueLoader.call();
+            if (newValue != null) {
+              nativeCache.put((String) key, (WordStatus) newValue);
+            }
+            return newValue;
+          } catch (Exception e) {
+            throw new ValueRetrievalException(key, valueLoader, e);
+          }
+        }
+
+        @Override
+        public void put(Object key, Object value) {
+          nativeCache.put((String) key, (WordStatus) value);
+        }
+
+        @Override
+        public void evict(Object key) {
+          nativeCache.remove((String) key);
+        }
+
+        @Override
+        public void clear() {
+          nativeCache.clear();
+        }
+      }
+    ));
+    simpleCacheManager.afterPropertiesSet();
+
+    return simpleCacheManager;
+  }
 }

src/main/resources/application.properties

@@ -12,6 +12,8 @@ logging.level.org.springframework.data.repository.config.RepositoryConfiguration
 logging.level.org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean=warn
 logging.level.org.springframework.context.support.PostProcessorRegistrationDelegate=warn
 logging.level.org.springframework.core.LocalVariableTableParameterNameDiscoverer=error
+logging.level.org.ehcache=warn
+app.cache.path=.bsl-ls-cache
 spring.application.name=BSL Language Server
 app.globalConfiguration.path=${user.home}/.bsl-language-server.json
 app.configuration.path=.bsl-language-server.json