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

GH-1119: do not invoke reconcile operation when only computing document symbols

Browse Source
This commit is contained in:
Martin Lippert
2023-10-20 16:06:23 +02:00
parent 2977081237
commit 31e3667ad1
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java
View File

@@ -299,7 +299,7 @@ public class SpringIndexerJava implements SpringIndexer {
SpringIndexerJavaContext context = new SpringIndexerJavaContext(project, cu, docURI, file,
lastModified, docRef, content, generatedSymbols, generatedBeans, problemCollector, SCAN_PASS.ONE, new ArrayList<>(), !ignoreMethodBodies);
scanAST(context);
scanAST(context, true);
IndexCacheKey symbolCacheKey = getCacheKey(project, SYMBOL_KEY);
IndexCacheKey beansCacheKey = getCacheKey(project, BEANS_KEY);
@@ -350,7 +350,7 @@ public class SpringIndexerJava implements SpringIndexer {
SpringIndexerJavaContext context = new SpringIndexerJavaContext(project, cu, docURI, file,
0, docRef, content, generatedSymbols, generatedBeans, voidProblemCollector, SCAN_PASS.ONE, new ArrayList<>(), true);
scanAST(context);
scanAST(context, false);
return generatedSymbols.stream().map(s -> s.getEnhancedSymbol()).collect(Collectors.toList());
});
@@ -408,7 +408,7 @@ public class SpringIndexerJava implements SpringIndexer {
SpringIndexerJavaContext context = new SpringIndexerJavaContext(project, cu, docURI, sourceFilePath,
lastModified, docRef, null, generatedSymbols, generatedBeans, problemCollector, SCAN_PASS.ONE, new ArrayList<>(), !ignoreMethodBodies);
scanAST(context);
scanAST(context, true);
dependencies.putAll(sourceFilePath, context.getDependencies());
scannedTypes.addAll(context.getScannedTypes());
@@ -559,7 +559,7 @@ public class SpringIndexerJava implements SpringIndexer {
SpringIndexerJavaContext context = new SpringIndexerJavaContext(project, cu, docURI, sourceFilePath,
lastModified, docRef, null, generatedSymbols, generatedBeans, problemCollector, pass, nextPassFiles, !ignoreMethodBodies);
scanAST(context);
scanAST(context, true);
progressTask.increment();
}
};
@@ -584,7 +584,7 @@ public class SpringIndexerJava implements SpringIndexer {
}
}
private void scanAST(final SpringIndexerJavaContext context) {
private void scanAST(final SpringIndexerJavaContext context, boolean includeReconcile) {
context.getCu().accept(new ASTVisitor() {
@Override
@@ -647,8 +647,9 @@ public class SpringIndexerJava implements SpringIndexer {
}
});
reconcile(context);
if (includeReconcile) {
reconcile(context);
}
dependencyTracker.update(context.getFile(), context.getDependencies());;
}