Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Send rewrite commands only to Boot LS. Start Boot LS on menu invocation

Browse Source
This commit is contained in:
aboyko
2022-11-20 21:51:48 -05:00
parent 297edabf46
commit dd2f60ad91
3 changed files with 69 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepository.java
View File

@@ -118,9 +118,11 @@ public class RewriteRecipeRepository implements ApplicationContextAware {
this.scanDirs = UNINITIALIZED_SET;
this.scanFiles = UNINITIALIZED_SET;
this.recipeFilters = UNINITIALIZED_SET;
CompletableFuture<Void> firstConfigLoaded = new CompletableFuture<>();
config.addListener(l -> {
Set<String> recipeFilterFromConfig = config.getRecipesFilters();
boolean firstTimeConfig = recipeFilters == UNINITIALIZED_SET && scanDirs == UNINITIALIZED_SET && scanFiles == UNINITIALIZED_SET;
if (recipeFilters == UNINITIALIZED_SET || recipeFilters.equals(recipeFilterFromConfig)) {
recipeFilters = recipeFilterFromConfig;
}
@@ -130,10 +132,19 @@ public class RewriteRecipeRepository implements ApplicationContextAware {
// Therefore it is best to store the scanDirs here right after it is received, not during scan process or anything else done async
scanDirs = config.getRecipeDirectories();
scanFiles = config.getRecipeFiles();
load();
if (!firstTimeConfig) {
load();
}
}
// First time config loaded. Received when server fully initialized. Start load after the firstConfigLoaded then and assign it to loaded field such that it is never null
if (firstTimeConfig) {
firstConfigLoaded.complete(null);
}
});
// Initial configuration is followed by load() as a special case to have 'loaded' future value to never be null
this.loaded = firstConfigLoaded.thenCompose(v -> load());
registerCommands();
}