From 14e8d6171e77d3de3503fe23c4499e774c9da8d1 Mon Sep 17 00:00:00 2001 From: Steven Looman Date: Fri, 15 Mar 2024 10:35:49 +0100 Subject: [PATCH] Fix setting `magik.typing.index*Usages` internally in `magik-language-server` --- CHANGES.md | 1 + .../sw/magik/languageserver/MagikWorkspaceService.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 5aa00c41..47552989 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ - Add base functionality to apply fixes from magik-lint. - Add UnsafeEvaluateInvocationCheck to test for unsafe `unsafe_evaluate()` method calls. - Add SwChar16VectorEvaluateInvocationCheck to test for `sw:char16_vector.evaluate()` method calls. +- Fix setting `magik.typing.index*Usages` internally in `magik-language-server`. 0.9.1 (2024-03-13) diff --git a/magik-language-server/src/main/java/nl/ramsolutions/sw/magik/languageserver/MagikWorkspaceService.java b/magik-language-server/src/main/java/nl/ramsolutions/sw/magik/languageserver/MagikWorkspaceService.java index 41b3b4d2..f981ef76 100644 --- a/magik-language-server/src/main/java/nl/ramsolutions/sw/magik/languageserver/MagikWorkspaceService.java +++ b/magik-language-server/src/main/java/nl/ramsolutions/sw/magik/languageserver/MagikWorkspaceService.java @@ -96,7 +96,6 @@ public void didChangeConfiguration(final DidChangeConfigurationParams params) { LOGGER.debug("New settings: {}", settings); MagikSettings.INSTANCE.setSettings(settings); - // TODO: Move this to MagikAnalysisConfiguration or a separate method? // Update magik analysis settings. final boolean magikIndexerIndexGlobalUsages = Objects.requireNonNullElse(MagikSettings.INSTANCE.getTypingIndexGlobalUsages(), false); @@ -104,15 +103,16 @@ public void didChangeConfiguration(final DidChangeConfigurationParams params) { final boolean magikIndexerIndexMethodUsages = Objects.requireNonNullElse(MagikSettings.INSTANCE.getTypingIndexMethodUsages(), false); - this.analysisConfiguration.setMagikIndexerIndexGlobalUsages(magikIndexerIndexMethodUsages); + this.analysisConfiguration.setMagikIndexerIndexMethodUsages(magikIndexerIndexMethodUsages); final boolean magikIndexerIndexSlotUsages = Objects.requireNonNullElse(MagikSettings.INSTANCE.getTypingIndexSlotUsages(), false); - this.analysisConfiguration.setMagikIndexerIndexGlobalUsages(magikIndexerIndexSlotUsages); + this.analysisConfiguration.setMagikIndexerIndexSlotUsages(magikIndexerIndexSlotUsages); final boolean magikIndexerIndexConditionUsages = Objects.requireNonNullElse(MagikSettings.INSTANCE.getTypingIndexConditionUsages(), false); - this.analysisConfiguration.setMagikIndexerIndexGlobalUsages(magikIndexerIndexConditionUsages); + this.analysisConfiguration.setMagikIndexerIndexConditionUsages( + magikIndexerIndexConditionUsages); this.runIndexersInBackground(); }