From a280b5208fc6948ec19b85eae682691337378536 Mon Sep 17 00:00:00 2001 From: Denis Mukhametianov Date: Mon, 11 Mar 2024 12:07:49 +0100 Subject: [PATCH] [spellchecker] fix IJPL-772 Relaxed nullability requirement for DictionaryLayer in SaveTo, it already handles null gracefully, and, unfortunately, it is valid situation when we can't find layer by name, since it is stored as localized string value. GitOrigin-RevId: 46442994aff7248c198d8d23ee0f3a9490521a9f --- .../src/com/intellij/spellchecker/quickfixes/SaveTo.java | 2 +- .../intellij/spellchecker/tokenizer/SpellcheckingStrategy.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spellchecker/src/com/intellij/spellchecker/quickfixes/SaveTo.java b/spellchecker/src/com/intellij/spellchecker/quickfixes/SaveTo.java index 5b94d30e394c..53a448a71004 100644 --- a/spellchecker/src/com/intellij/spellchecker/quickfixes/SaveTo.java +++ b/spellchecker/src/com/intellij/spellchecker/quickfixes/SaveTo.java @@ -39,7 +39,7 @@ public final class SaveTo implements SpellCheckerQuickFix, LowPriorityAction { myWord = word; } - public SaveTo(String word, @NotNull DictionaryLayer layer) { + public SaveTo(String word, @Nullable DictionaryLayer layer) { myWord = word; myLayer = layer; } diff --git a/spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java b/spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java index 061d241a7bb1..4bddde125cf1 100644 --- a/spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java +++ b/spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java @@ -143,7 +143,7 @@ public class SpellcheckingStrategy { final SpellCheckerSettings settings = SpellCheckerSettings.getInstance(element.getProject()); if (settings.isUseSingleDictionaryToSave()) { - result.add(new SaveTo(typo, Objects.requireNonNull(DictionaryLayersProvider.getLayer(element.getProject(), settings.getDictionaryToSave())))); + result.add(new SaveTo(typo, DictionaryLayersProvider.getLayer(element.getProject(), settings.getDictionaryToSave()))); return result.toArray(LocalQuickFix.EMPTY_ARRAY); }