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

Fix property key hover has binding key "L" in hover content

Browse Source
This commit is contained in:
BoykoAlex
2019-06-13 15:43:30 -04:00
parent 99d62d0ae0
commit 49d655d66c
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jdtls/JdtLsIndex.java
View File

@@ -111,14 +111,9 @@ public class JdtLsIndex implements ClasspathIndex {
return Wrappers.wrap(data, Suppliers.memoize(() -> findType(data.getFqName())), Suppliers.memoize(() -> declaringTypeFqName == null ? null : findType(declaringTypeFqName)), javadocProvider);
}
private TypeData findTypeData(String fqName) {
private TypeData findTypeData(String fqName) throws InterruptedException, ExecutionException {
JavaDataParams params = new JavaDataParams(projectUri.toString(), "L" + fqName.replace('.', '/') + ";", false);
try {
return client.javaType(params).get();
} catch (InterruptedException | ExecutionException e) {
log.error("", e);
}
return null;
return client.javaType(params).get();
}
@Override
@@ -129,17 +124,21 @@ public class JdtLsIndex implements ClasspathIndex {
}
if (type == null) {
TypeData data = findTypeData(fqName);
if (data == null) {
type = Optional.empty();
sourceTypeCache.put(fqName, type);
} else {
type = Optional.of(toType(data));
if (Classpath.isBinary(data.getClasspathEntry().getCpe())) {
binaryTypeCache.put(fqName, type);
} else {
try {
TypeData data = findTypeData(fqName);
if (data == null) {
type = Optional.empty();
sourceTypeCache.put(fqName, type);
} else {
type = Optional.of(toType(data));
if (Classpath.isBinary(data.getClasspathEntry().getCpe())) {
binaryTypeCache.put(fqName, type);
} else {
sourceTypeCache.put(fqName, type);
}
}
} catch (Exception e) {
log.error("{}", e);
}
}
return type.orElse(null);

2
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jdtls/Wrappers.java
View File

@@ -90,7 +90,7 @@ public class Wrappers {
@Override
public String getFQName() {
String key = data.getName();
return key.substring(0, key.length() - 1).replace('/', '.');
return JavaUtils.typeBindingKeyToFqName(key);
}
};