From b06309b613b708ba23db305cea064f309416d562 Mon Sep 17 00:00:00 2001 From: Olga Strizhenko Date: Mon, 30 Oct 2017 19:36:42 +0300 Subject: [PATCH] Spellchecker: (minor) refactoring --- .../com/intellij/spellchecker/SpellCheckerManager.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/spellchecker/src/com/intellij/spellchecker/SpellCheckerManager.java b/spellchecker/src/com/intellij/spellchecker/SpellCheckerManager.java index 0881dc7ffb8e..cd83c56094cf 100644 --- a/spellchecker/src/com/intellij/spellchecker/SpellCheckerManager.java +++ b/spellchecker/src/com/intellij/spellchecker/SpellCheckerManager.java @@ -140,7 +140,6 @@ public class SpellCheckerManager implements Disposable { private void fillEngineDictionary() { spellChecker.reset(); - final List loaders = new SmartList<>(); // Load bundled dictionaries from corresponding jars for (BundledDictionaryProvider provider : Extensions.getExtensions(BundledDictionaryProvider.EP_NAME)) { for (String dictionary : provider.getBundledDictionaries()) { @@ -148,7 +147,7 @@ public class SpellCheckerManager implements Disposable { final Class loaderClass = provider.getClass(); final InputStream stream = loaderClass.getResourceAsStream(dictionary); if (stream != null) { - loaders.add(new StreamLoader(stream, dictionary)); + spellChecker.loadDictionary(new StreamLoader(stream, dictionary)); } else { LOG.warn("Couldn't load dictionary '" + dictionary + "' with loader '" + loaderClass + "'"); @@ -161,16 +160,12 @@ public class SpellCheckerManager implements Disposable { for (String folder : settings.getDictionaryFoldersPaths()) { SPFileUtil.processFilesRecursively(folder, s -> { if (!disabledDictionaries.contains(s)) { - loaders.add(new FileLoader(s)); + spellChecker.loadDictionary(new FileLoader(s)); } }); } } - for (Loader loader : loaders) { - spellChecker.loadDictionary(loader); - } - final AggregatedDictionaryState dictionaryState = ServiceManager.getService(project, AggregatedDictionaryState.class); dictionaryState.addDictStateListener((dict) -> restartInspections()); userDictionary = dictionaryState.getDictionary();