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

Rewrite integration fixes

Browse Source
This commit is contained in:
aboyko
2022-07-27 00:18:10 -04:00
parent e002ddf6fb
commit 35af0be47f
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,7 +219,7 @@ public class RewriteCompilationUnitCache implements DocumentContentProvider, Dis
synchronized (URI_TO_CU_LOCK) {
return uriToCu.get(uri, () -> {
logger.debug("Parsing CU {}", uri);
JavaParser javaParser = loadJavaParser(project);
JavaParser javaParser = /*loadJavaParser(project)*/createJavaParser(project);
Input input = new Input(Paths.get(uri), () -> {
try {
return new ByteArrayInputStream(fetchContent(uri).getBytes());
@@ -228,13 +228,18 @@ public class RewriteCompilationUnitCache implements DocumentContentProvider, Dis
}
});
List<CompilationUnit> cus = ORAstUtils.parseInputs(javaParser, List.of(input));
CompilationUnit cu = cus.get(0);
if (cu != null) {
projectToDocs.get(project, () -> new HashSet<>()).add(uri);
CompilationUnit cu = null;
try {
List<CompilationUnit> cus = ORAstUtils.parseInputs(javaParser, List.of(input));
cu = cus.get(0);
if (cu != null) {
projectToDocs.get(project, () -> new HashSet<>()).add(uri);
}
} catch (Exception e) {
// ignore rewrite parse errors
}
return cu;

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

@@ -223,7 +223,13 @@ public class RewriteRecipeRepository {
server.onCommand("sts/rewrite/list", params -> {
JsonElement uri = (JsonElement) params.getArguments().get(0);
return CompletableFuture.completedFuture(uri == null ? Collections.emptyList() : listProjectRefactoringRecipes(uri.getAsString()).stream().map(RewriteRecipeRepository::recipeToJson).collect(Collectors.toList()));
return loaded.thenApply(v -> {
if (uri == null) {
return Collections.emptyList();
} else {
return listProjectRefactoringRecipes(uri.getAsString()).stream().map(RewriteRecipeRepository::recipeToJson).collect(Collectors.toList());
}
});
});
listBuilder.add("sts/rewrite/list");