Skip to content

Commit 35239d0

Browse files
martinlippertmartinlippert
committed
more refactorings to clean up old names
1 parent e2ad1f4 commit 35239d0

File tree

8 files changed

+58
-58
lines changed

8 files changed

+58
-58
lines changed

‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,11 @@ public void afterPropertiesSet() throws Exception {
173173

174174
SymbolHandler handler = new SymbolHandler() {
175175
@Override
176-
public void addSymbols(IJavaProject project, String docURI, WorkspaceSymbol[] enhancedSymbols, List<SpringIndexElement> beanDefinitions,
176+
public void addSymbols(IJavaProject project, String docURI, WorkspaceSymbol[] symbols, List<SpringIndexElement> beanDefinitions,
177177
List<Diagnostic> diagnostics) {
178178

179-
if (enhancedSymbols != null) {
180-
SpringSymbolIndex.this.addSymbolsByDoc(project, docURI, enhancedSymbols);
179+
if (symbols != null) {
180+
SpringSymbolIndex.this.addSymbolsByDoc(project, docURI, symbols);
181181
}
182182

183183
if (beanDefinitions != null) {
@@ -191,14 +191,14 @@ public void addSymbols(IJavaProject project, String docURI, WorkspaceSymbol[] en
191191
}
192192

193193
@Override
194-
public void addSymbols(IJavaProject project, WorkspaceSymbol[] enhancedSymbols,
194+
public void addSymbols(IJavaProject project, WorkspaceSymbol[] symbols,
195195
Map<String, List<SpringIndexElement>> beanDefinitionsByDoc, Map<String, List<Diagnostic>> diagnosticsPerDoc) {
196196

197-
if (enhancedSymbols != null) {
197+
if (symbols != null) {
198198

199199
// organize symbols by doc URI
200200
Map<String, List<WorkspaceSymbol>> symbolsPerDoc = new HashMap<>();
201-
for (WorkspaceSymbol symbol : enhancedSymbols) {
201+
for (WorkspaceSymbol symbol : symbols) {
202202
Either<Location, WorkspaceSymbolLocation> location = symbol.getLocation();
203203
String docURI = location.isLeft() ? location.getLeft().getUri() : location.getRight().getUri();
204204

@@ -208,9 +208,9 @@ public void addSymbols(IJavaProject project, WorkspaceSymbol[] enhancedSymbols,
208208
// add symbols per doc
209209
for (Map.Entry<String, List<WorkspaceSymbol>> entry : symbolsPerDoc.entrySet()) {
210210
String docURI = entry.getKey();
211-
List<WorkspaceSymbol> symbols = entry.getValue();
211+
List<WorkspaceSymbol> symbolsForDoc = entry.getValue();
212212

213-
SpringSymbolIndex.this.addSymbolsByDoc(project, docURI, (WorkspaceSymbol[]) symbols.toArray(new WorkspaceSymbol[symbols.size()]));
213+
SpringSymbolIndex.this.addSymbolsByDoc(project, docURI, (WorkspaceSymbol[]) symbolsForDoc.toArray(new WorkspaceSymbol[symbolsForDoc.size()]));
214214
}
215215
}
216216

@@ -873,9 +873,9 @@ public List<? extends WorkspaceSymbol> getWorkspaceSymbolsFromSymbolIndex(String
873873
for (SpringIndexer indexer : this.indexers) {
874874
if (indexer.isInterestedIn(docURI)) {
875875
try {
876-
for (WorkspaceSymbol enhanced : indexer.computeSymbols(project, docURI,
876+
for (WorkspaceSymbol symbol : indexer.computeSymbols(project, docURI,
877877
doc.get())) {
878-
builder.add(enhanced);
878+
builder.add(symbol);
879879
}
880880
} catch (Exception e) {
881881
log.error("{}", e);
@@ -1118,23 +1118,23 @@ public void run() {
11181118

11191119
}
11201120

1121-
private void addSymbolsByDoc(IJavaProject project, String docURI, WorkspaceSymbol[] enhancedSymbols) {
1121+
private void addSymbolsByDoc(IJavaProject project, String docURI, WorkspaceSymbol[] workspaceSymbols) {
11221122

11231123
List<WorkspaceSymbol> docSymbols = symbolsByDoc.computeIfAbsent(docURI, s -> new ArrayList<WorkspaceSymbol>());
11241124
List<WorkspaceSymbol> projectSymbols = symbolsByProject.computeIfAbsent(project.getElementName(), s -> new ArrayList<WorkspaceSymbol>());
11251125

1126-
for (WorkspaceSymbol enhancedSymbol : enhancedSymbols) {
1126+
for (WorkspaceSymbol symbol : workspaceSymbols) {
11271127

11281128
synchronized(this.symbols) {
1129-
symbols.add(enhancedSymbol);
1129+
symbols.add(symbol);
11301130
}
11311131

11321132
synchronized(docSymbols) {
1133-
docSymbols.add(enhancedSymbol);
1133+
docSymbols.add(symbol);
11341134
}
11351135

11361136
synchronized(projectSymbols) {
1137-
projectSymbols.add(enhancedSymbol);
1137+
projectSymbols.add(symbol);
11381138
}
11391139

11401140
}

‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/CachedSymbol.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
public class CachedSymbol extends AbstractIndexCacheable {
1717

1818
private final long lastModified;
19-
private final WorkspaceSymbol enhancedSymbol;
19+
private final WorkspaceSymbol symbol;
2020

21-
public CachedSymbol(String docURI, long lastModified, WorkspaceSymbol enhancedSymbol) {
21+
public CachedSymbol(String docURI, long lastModified, WorkspaceSymbol symbol) {
2222
super(docURI);
2323
this.lastModified = lastModified;
24-
this.enhancedSymbol = enhancedSymbol;
24+
this.symbol = symbol;
2525
}
2626

27-
public WorkspaceSymbol getEnhancedSymbol() {
28-
return enhancedSymbol;
27+
public WorkspaceSymbol getSymbol() {
28+
return symbol;
2929
}
3030

3131
public long getLastModified() {
@@ -34,7 +34,7 @@ public long getLastModified() {
3434

3535
@Override
3636
public String toString() {
37-
return "CachedSymbol [docURI=" + getDocURI() + ", enhancedSymbol=" + enhancedSymbol + "]";
37+
return "CachedSymbol [docURI=" + getDocURI() + ", symbol=" + symbol + "]";
3838
}
3939

4040
}

‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringFactoriesIndexer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ public void initializeProject(IJavaProject project, boolean clean) throws Except
219219
}
220220

221221
if (symbols != null && indexElements != null) {
222-
WorkspaceSymbol[] enhancedSymbols = Arrays.stream(symbols).map(cachedSymbol -> cachedSymbol.getEnhancedSymbol()).toArray(WorkspaceSymbol[]::new);
222+
WorkspaceSymbol[] allSymbols = Arrays.stream(symbols).map(cachedSymbol -> cachedSymbol.getSymbol()).toArray(WorkspaceSymbol[]::new);
223223
Map<String, List<SpringIndexElement>> beansByDoc = Arrays.stream(indexElements).filter(cachedBean -> cachedBean.getIndexElement() != null).collect(Collectors.groupingBy(CachedIndexElement::getDocURI, Collectors.mapping(CachedIndexElement::getIndexElement, Collectors.toList())));
224-
symbolHandler.addSymbols(project, enhancedSymbols, beansByDoc, null);
224+
symbolHandler.addSymbols(project, allSymbols, beansByDoc, null);
225225
}
226226

227227
long endTime = System.currentTimeMillis();
@@ -266,7 +266,7 @@ public void updateFile(IJavaProject project, DocumentDescriptor updatedDoc, Stri
266266
this.cache.update(symbolsCacheKey, file, updatedDoc.getLastModified(), generatedSymbols, null, CachedSymbol.class);
267267
this.cache.update(indexCacheKey, file, updatedDoc.getLastModified(), generatedIndexElements, null, CachedIndexElement.class);
268268

269-
WorkspaceSymbol[] symbols = generatedSymbols.stream().map(cachedSymbol -> cachedSymbol.getEnhancedSymbol()).toArray(WorkspaceSymbol[]::new);
269+
WorkspaceSymbol[] symbols = generatedSymbols.stream().map(cachedSymbol -> cachedSymbol.getSymbol()).toArray(WorkspaceSymbol[]::new);
270270
List<SpringIndexElement> beans = generatedIndexElements.stream().filter(cachedBean -> cachedBean.getIndexElement() != null).map(cachedBean -> cachedBean.getIndexElement()).toList();
271271
symbolHandler.addSymbols(project, docURI, symbols, beans, null);
272272
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ public void accept(ReconcileProblem problem) {
260260

261261
scanAST(context, false);
262262

263-
return result.getGeneratedSymbols().stream().map(s -> s.getEnhancedSymbol()).collect(Collectors.toList());
263+
return result.getGeneratedSymbols().stream().map(s -> s.getSymbol()).collect(Collectors.toList());
264264
});
265265
}
266266

‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJavaScanResult.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@ public List<CachedDiagnostics> getGeneratedDiagnostics() {
106106
}
107107

108108
public void publishResults(SymbolHandler symbolHandler) {
109-
WorkspaceSymbol[] enhancedSymbols = generatedSymbols.stream().map(cachedSymbol -> cachedSymbol.getEnhancedSymbol()).toArray(WorkspaceSymbol[]::new);
109+
WorkspaceSymbol[] allSymbols = generatedSymbols.stream().map(cachedSymbol -> cachedSymbol.getSymbol()).toArray(WorkspaceSymbol[]::new);
110110
Map<String, List<SpringIndexElement>> allIndexElements = generatedIndexElements.stream().filter(cachedIndexElement -> cachedIndexElement.getIndexElement() != null).collect(Collectors.groupingBy(CachedIndexElement::getDocURI, Collectors.mapping(CachedIndexElement::getIndexElement, Collectors.toList())));
111111
Map<String, List<Diagnostic>> diagnosticsByDoc = generatedDiagnostics.stream().filter(cachedDiagnostic -> cachedDiagnostic.getDiagnostic() != null).collect(Collectors.groupingBy(CachedDiagnostics::getDocURI, Collectors.mapping(CachedDiagnostics::getDiagnostic, Collectors.toList())));
112112

113113
// to make sure that files without index elements or diagnostics publish an empty array of diagnostics
114114
addEmptyDiagnostics(diagnosticsByDoc, javaFiles);
115115
addEmptyIndexElements(allIndexElements, javaFiles);
116116

117-
symbolHandler.addSymbols(this.project, enhancedSymbols, allIndexElements, diagnosticsByDoc);
117+
symbolHandler.addSymbols(this.project, allSymbols, allIndexElements, diagnosticsByDoc);
118118
}
119119

120120
public void publishDiagnosticsOnly(SymbolHandler symbolHandler) {

‎headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerXML.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ public void initializeProject(IJavaProject project, boolean clean) throws Except
143143
}
144144

145145
if (symbols != null && indexElements != null) {
146-
WorkspaceSymbol[] enhancedSymbols = Arrays.stream(symbols).map(cachedSymbol -> cachedSymbol.getEnhancedSymbol()).toArray(WorkspaceSymbol[]::new);
146+
WorkspaceSymbol[] allSymbols = Arrays.stream(symbols).map(cachedSymbol -> cachedSymbol.getSymbol()).toArray(WorkspaceSymbol[]::new);
147147
Map<String, List<SpringIndexElement>> allIndexElements = Arrays.stream(indexElements).filter(cachedIndexElement -> cachedIndexElement.getIndexElement() != null).collect(Collectors.groupingBy(CachedIndexElement::getDocURI, Collectors.mapping(CachedIndexElement::getIndexElement, Collectors.toList())));
148-
symbolHandler.addSymbols(project, enhancedSymbols, allIndexElements, null);
148+
symbolHandler.addSymbols(project, allSymbols, allIndexElements, null);
149149
}
150150

151151
long endTime = System.currentTimeMillis();
@@ -181,7 +181,7 @@ public void updateFile(IJavaProject project, DocumentDescriptor updatedDoc, Stri
181181
this.cache.update(symbolsCacheKey, file, updatedDoc.getLastModified(), generatedSymbols, null, CachedSymbol.class);
182182
this.cache.update(indexCacheKey, file, updatedDoc.getLastModified(), generatedIndexElements, null, CachedIndexElement.class);
183183

184-
WorkspaceSymbol[] symbols = generatedSymbols.stream().map(cachedSymbol -> cachedSymbol.getEnhancedSymbol()).toArray(WorkspaceSymbol[]::new);
184+
WorkspaceSymbol[] symbols = generatedSymbols.stream().map(cachedSymbol -> cachedSymbol.getSymbol()).toArray(WorkspaceSymbol[]::new);
185185
List<SpringIndexElement> indexElements = generatedIndexElements.stream().filter(cachedBean -> cachedBean.getIndexElement() != null).map(cachedBean -> cachedBean.getIndexElement()).toList();
186186
symbolHandler.addSymbols(project, docURI, symbols, indexElements, null);
187187
}
@@ -208,7 +208,7 @@ public void updateFiles(IJavaProject project, DocumentDescriptor[] updatedDocs)
208208
this.cache.update(symbolCacheKey, file, updatedDoc.getLastModified(), generatedSymbols, null, CachedSymbol.class);
209209
this.cache.update(indexCacheKey, file, updatedDoc.getLastModified(), generatedIndexElements, null, CachedIndexElement.class);
210210

211-
WorkspaceSymbol[] symbols = generatedSymbols.stream().map(cachedSymbol -> cachedSymbol.getEnhancedSymbol()).toArray(WorkspaceSymbol[]::new);
211+
WorkspaceSymbol[] symbols = generatedSymbols.stream().map(cachedSymbol -> cachedSymbol.getSymbol()).toArray(WorkspaceSymbol[]::new);
212212
List<SpringIndexElement> indexElements = generatedIndexElements.stream().filter(cachedBean -> cachedBean.getIndexElement() != null).map(cachedBean -> cachedBean.getIndexElement()).toList();
213213
symbolHandler.addSymbols(project, docURI, symbols, indexElements, null);
214214
}
@@ -360,7 +360,7 @@ public List<WorkspaceSymbol> computeSymbols(IJavaProject project, String docURI,
360360
List<CachedIndexElement> generatedIndexElements = new ArrayList<>();
361361

362362
scanFile(project, content, docURI, 0, generatedSymbols, generatedIndexElements);
363-
return generatedSymbols.stream().map(s -> s.getEnhancedSymbol()).collect(Collectors.toList());
363+
return generatedSymbols.stream().map(s -> s.getSymbol()).collect(Collectors.toList());
364364
}
365365

366366
return Collections.emptyList();

‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/cache/test/IndexCacheOnDiscDeltaBasedTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ void testSimpleValidCache() throws Exception {
102102
assertNotNull(cachedSymbols);
103103
assertEquals(1, cachedSymbols.length);
104104

105-
assertEquals("symbol1", cachedSymbols[0].getEnhancedSymbol().getName());
106-
assertEquals(SymbolKind.Field, cachedSymbols[0].getEnhancedSymbol().getKind());
107-
assertEquals(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20))), cachedSymbols[0].getEnhancedSymbol().getLocation().getLeft());
105+
assertEquals("symbol1", cachedSymbols[0].getSymbol().getName());
106+
assertEquals(SymbolKind.Field, cachedSymbols[0].getSymbol().getKind());
107+
assertEquals(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20))), cachedSymbols[0].getSymbol().getLocation().getLeft());
108108

109109
Multimap<String, String> dependencies = result.getRight();
110110
assertEquals(2, dependencies.keySet().size());
@@ -409,7 +409,7 @@ void testSymbolsAddedToMultipleFiles() throws Exception {
409409

410410
private void assertSymbol(WorkspaceSymbol enhancedSymbol, CachedSymbol[] cachedSymbols) {
411411
for (CachedSymbol cachedSymbol : cachedSymbols) {
412-
WorkspaceSymbol symbol = cachedSymbol.getEnhancedSymbol();
412+
WorkspaceSymbol symbol = cachedSymbol.getSymbol();
413413

414414
if (symbol.toString().equals(enhancedSymbol.toString())) {
415415
return;
@@ -603,9 +603,9 @@ void testFileDeleted() throws Exception {
603603
assertNotNull(result);
604604
assertEquals(1, cachedSymbols.length);
605605

606-
assertEquals("symbol2", cachedSymbols[0].getEnhancedSymbol().getName());
607-
assertEquals(SymbolKind.Field, cachedSymbols[0].getEnhancedSymbol().getKind());
608-
assertEquals(new Location(doc2URI, new Range(new Position(5, 10), new Position(5, 20))), cachedSymbols[0].getEnhancedSymbol().getLocation().getLeft());
606+
assertEquals("symbol2", cachedSymbols[0].getSymbol().getName());
607+
assertEquals(SymbolKind.Field, cachedSymbols[0].getSymbol().getKind());
608+
assertEquals(new Location(doc2URI, new Range(new Position(5, 10), new Position(5, 20))), cachedSymbols[0].getSymbol().getLocation().getLeft());
609609

610610
Multimap<String, String> cachedDependencies = result.getRight();
611611
assertEquals(ImmutableSet.of(), cachedDependencies.get(file1.toString()));
@@ -667,13 +667,13 @@ void testMultipleFilesDeleted() throws Exception {
667667
assertNotNull(result);
668668
assertEquals(2, cachedSymbols.length);
669669

670-
assertEquals("symbol2", cachedSymbols[0].getEnhancedSymbol().getName());
671-
assertEquals(SymbolKind.Field, cachedSymbols[0].getEnhancedSymbol().getKind());
672-
assertEquals(new Location(doc2URI, new Range(new Position(5, 10), new Position(5, 20))), cachedSymbols[0].getEnhancedSymbol().getLocation().getLeft());
670+
assertEquals("symbol2", cachedSymbols[0].getSymbol().getName());
671+
assertEquals(SymbolKind.Field, cachedSymbols[0].getSymbol().getKind());
672+
assertEquals(new Location(doc2URI, new Range(new Position(5, 10), new Position(5, 20))), cachedSymbols[0].getSymbol().getLocation().getLeft());
673673

674-
assertEquals("symbol4", cachedSymbols[1].getEnhancedSymbol().getName());
675-
assertEquals(SymbolKind.Field, cachedSymbols[1].getEnhancedSymbol().getKind());
676-
assertEquals(new Location(doc4URI, new Range(new Position(4, 4), new Position(5, 5))), cachedSymbols[1].getEnhancedSymbol().getLocation().getLeft());
674+
assertEquals("symbol4", cachedSymbols[1].getSymbol().getName());
675+
assertEquals(SymbolKind.Field, cachedSymbols[1].getSymbol().getKind());
676+
assertEquals(new Location(doc4URI, new Range(new Position(4, 4), new Position(5, 5))), cachedSymbols[1].getSymbol().getLocation().getLeft());
677677

678678
Multimap<String, String> cachedDependencies = result.getRight();
679679
assertEquals(ImmutableSet.of(), cachedDependencies.get(file1.toString()));

‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/cache/test/IndexCacheOnDiscTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ void testSimpleValidCache() throws Exception {
100100
assertNotNull(cachedSymbols);
101101
assertEquals(1, cachedSymbols.length);
102102

103-
assertEquals("symbol1", cachedSymbols[0].getEnhancedSymbol().getName());
104-
assertEquals(SymbolKind.Field, cachedSymbols[0].getEnhancedSymbol().getKind());
105-
assertEquals(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20))), cachedSymbols[0].getEnhancedSymbol().getLocation().getLeft());
103+
assertEquals("symbol1", cachedSymbols[0].getSymbol().getName());
104+
assertEquals(SymbolKind.Field, cachedSymbols[0].getSymbol().getKind());
105+
assertEquals(new Location("docURI", new Range(new Position(3, 10), new Position(3, 20))), cachedSymbols[0].getSymbol().getLocation().getLeft());
106106

107107
Multimap<String, String> dependencies = result.getRight();
108108
assertEquals(2, dependencies.keySet().size());
@@ -354,7 +354,7 @@ void testSymbolsAddedToMultipleFiles() throws Exception {
354354

355355
private void assertSymbol(WorkspaceSymbol enhancedSymbol, CachedSymbol[] cachedSymbols) {
356356
for (CachedSymbol cachedSymbol : cachedSymbols) {
357-
WorkspaceSymbol symbol = cachedSymbol.getEnhancedSymbol();
357+
WorkspaceSymbol symbol = cachedSymbol.getSymbol();
358358

359359
if (symbol.toString().equals(enhancedSymbol.toString())) {
360360
return;
@@ -549,9 +549,9 @@ void testFileDeleted() throws Exception {
549549
assertNotNull(result);
550550
assertEquals(1, cachedSymbols.length);
551551

552-
assertEquals("symbol2", cachedSymbols[0].getEnhancedSymbol().getName());
553-
assertEquals(SymbolKind.Field, cachedSymbols[0].getEnhancedSymbol().getKind());
554-
assertEquals(new Location(doc2URI, new Range(new Position(5, 10), new Position(5, 20))), cachedSymbols[0].getEnhancedSymbol().getLocation().getLeft());
552+
assertEquals("symbol2", cachedSymbols[0].getSymbol().getName());
553+
assertEquals(SymbolKind.Field, cachedSymbols[0].getSymbol().getKind());
554+
assertEquals(new Location(doc2URI, new Range(new Position(5, 10), new Position(5, 20))), cachedSymbols[0].getSymbol().getLocation().getLeft());
555555

556556
Multimap<String, String> cachedDependencies = result.getRight();
557557
assertEquals(ImmutableSet.of(), cachedDependencies.get(file1.toString()));
@@ -613,13 +613,13 @@ void testMultipleFilesDeleted() throws Exception {
613613
assertNotNull(result);
614614
assertEquals(2, cachedSymbols.length);
615615

616-
assertEquals("symbol2", cachedSymbols[0].getEnhancedSymbol().getName());
617-
assertEquals(SymbolKind.Field, cachedSymbols[0].getEnhancedSymbol().getKind());
618-
assertEquals(new Location(doc2URI, new Range(new Position(5, 10), new Position(5, 20))), cachedSymbols[0].getEnhancedSymbol().getLocation().getLeft());
616+
assertEquals("symbol2", cachedSymbols[0].getSymbol().getName());
617+
assertEquals(SymbolKind.Field, cachedSymbols[0].getSymbol().getKind());
618+
assertEquals(new Location(doc2URI, new Range(new Position(5, 10), new Position(5, 20))), cachedSymbols[0].getSymbol().getLocation().getLeft());
619619

620-
assertEquals("symbol4", cachedSymbols[1].getEnhancedSymbol().getName());
621-
assertEquals(SymbolKind.Field, cachedSymbols[1].getEnhancedSymbol().getKind());
622-
assertEquals(new Location(doc4URI, new Range(new Position(4, 4), new Position(5, 5))), cachedSymbols[1].getEnhancedSymbol().getLocation().getLeft());
620+
assertEquals("symbol4", cachedSymbols[1].getSymbol().getName());
621+
assertEquals(SymbolKind.Field, cachedSymbols[1].getSymbol().getKind());
622+
assertEquals(new Location(doc4URI, new Range(new Position(4, 4), new Position(5, 5))), cachedSymbols[1].getSymbol().getLocation().getLeft());
623623

624624
Multimap<String, String> cachedDependencies = result.getRight();
625625
assertEquals(ImmutableSet.of(), cachedDependencies.get(file1.toString()));

0 commit comments

Comments
 (0)