Skip to content

Commit

Permalink
Merge pull request #7121 from dbalek/dbalek/micronaut-finder-methods-…
Browse files Browse the repository at this point in the history 
…cc-update2

Micronaut: Code completion for repository finder methods improved.
  • Loading branch information
@dbalek
dbalek committed Mar 1, 2024
2 parents 447bc15 + 876c914 commit 8d6c4b8
Show file tree
Hide file tree
Showing 4 changed files with 199 additions and 46 deletions.
55 changes: 50 additions & 5 deletions ...onaut/src/org/netbeans/modules/micronaut/completion/MicronautDataCompletionCollector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,20 +145,65 @@ public Completion createFinderMethodNameItem(String prefix, String name, int off
return CompletionCollector.newBuilder(prefix + name).kind(Completion.Kind.Method).sortText(String.format("%04d%s", 10, name)).build();
}
@Override
public Completion createFinderMethodParam(CompilationInfo info, String name, TypeMirror type, List<TypeElement> annotations, int offset) {
String returnType = Utils.getTypeName(info, type, false, false).toString();
public Completion createFinderMethodParam(CompilationInfo info, VariableElement variableElement, int offset) {
String name = variableElement.getSimpleName().toString();
TypeMirror type = variableElement.asType();
String typeName = Utils.getTypeName(info, type, false, false).toString();
Set<ElementHandle<TypeElement>> handles = new HashSet<>();
StringBuilder sb = new StringBuilder();
for (TypeElement ann : annotations) {
for (TypeElement ann : Utils.getRelevantAnnotations(variableElement)) {
sb.append('@').append(ann.getSimpleName()).append(' ');
handles.add(ElementHandle.create(ann));
}
if (type.getKind() == TypeKind.DECLARED) {
handles.add(ElementHandle.create((TypeElement) ((DeclaredType) type).asElement()));
}
sb.append(returnType).append(' ').append(name);
sb.append(typeName).append(' ').append(name);
Builder builder = CompletionCollector.newBuilder(name).kind(Completion.Kind.Property).sortText(String.format("%04d%s", 10, name))
.insertText(sb.toString()).labelDescription(returnType);
.insertText(sb.toString()).labelDescription(typeName);
if (!handles.isEmpty()) {
builder.additionalTextEdits(() -> modify2TextEdits(JavaSource.forFileObject(info.getFileObject()), copy -> {
copy.toPhase(JavaSource.Phase.ELEMENTS_RESOLVED);
Set<TypeElement> toImport = handles.stream().map(handle -> handle.resolve(copy)).filter(te -> te != null).collect(Collectors.toSet());
copy.rewrite(copy.getCompilationUnit(), GeneratorUtilities.get(copy).addImports(copy.getCompilationUnit(), toImport));
}));
}
return builder.build();
}
@Override
public Completion createFinderMethodParams(CompilationInfo info, List<VariableElement> variableElements, int offset) {
StringBuilder label = new StringBuilder();
StringBuilder insertText = new StringBuilder();
StringBuilder sortParams = new StringBuilder();
Set<ElementHandle<TypeElement>> handles = new HashSet<>();
label.append('(');
int cnt = 0;
Iterator<VariableElement> it = variableElements.iterator();
while (it.hasNext()) {
cnt++;
VariableElement variableElement = it.next();
String name = variableElement.getSimpleName().toString();
TypeMirror type = variableElement.asType();
String typeName = Utils.getTypeName(info, type, false, false).toString();
for (TypeElement ann : Utils.getRelevantAnnotations(variableElement)) {
insertText.append('@').append(ann.getSimpleName()).append(' ');
handles.add(ElementHandle.create(ann));
}
if (type.getKind() == TypeKind.DECLARED) {
handles.add(ElementHandle.create((TypeElement) ((DeclaredType) type).asElement()));
}
label.append(typeName).append(' ').append(name);
insertText.append(typeName).append(' ').append("${").append(cnt).append(":").append(name).append("}");
sortParams.append(typeName);
if (it.hasNext()) {
label.append(", ");
insertText.append(", ");
sortParams.append(",");
}
}
label.append(')');
Builder builder = CompletionCollector.newBuilder(label.toString()).kind(Completion.Kind.Property).sortText(String.format("%04d#%02d%s", 5, cnt, sortParams.toString()))
.insertText(insertText.toString()).insertTextFormat(Completion.TextFormat.Snippet);
if (!handles.isEmpty()) {
builder.additionalTextEdits(() -> modify2TextEdits(JavaSource.forFileObject(info.getFileObject()), copy -> {
copy.toPhase(JavaSource.Phase.ELEMENTS_RESOLVED);
Expand Down
75 changes: 72 additions & 3 deletions ...ronaut/src/org/netbeans/modules/micronaut/completion/MicronautDataCompletionProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ private static class MicronautDataCompletionQuery extends AsyncCompletionQuery {
private static final String PACKAGE_COLOR = getHTMLColor(64, 150, 64);
private static final String CLASS_COLOR = getHTMLColor(150, 64, 64);
private static final String INTERFACE_COLOR = getHTMLColor(128, 128, 128);
private static final String PARAMETERS_COLOR = getHTMLColor(192, 192, 192);
private static final String PARAMETER_NAME_COLOR = getHTMLColor(224, 160, 65);
private static final String ATTRIBUTE_VALUE_COLOR = getHTMLColor(128, 128, 128);
private static final String PROPERTY_COLOR = getHTMLColor(64, 198, 88);
Expand Down Expand Up @@ -237,11 +238,13 @@ public CompletionItem createFinderMethodNameItem(String prefix, String name, int
}

@Override
public CompletionItem createFinderMethodParam(CompilationInfo info, String name, TypeMirror type, List<TypeElement> annotations, int offset) {
public CompletionItem createFinderMethodParam(CompilationInfo info, VariableElement variableElement, int offset) {
String name = variableElement.getSimpleName().toString();
TypeMirror type = variableElement.asType();
String returnType = Utils.getTypeName(info, type, false, false).toString();
Set<ElementHandle<TypeElement>> handles = new HashSet<>();
StringBuilder sb = new StringBuilder();
for (TypeElement ann : annotations) {
for (TypeElement ann : Utils.getRelevantAnnotations(variableElement)) {
sb.append('@').append(ann.getSimpleName()).append(' ');
handles.add(ElementHandle.create(ann));
}
Expand All @@ -252,7 +255,7 @@ public CompletionItem createFinderMethodParam(CompilationInfo info, String name,
return CompletionUtilities.newCompletionItemBuilder(name)
.startOffset(offset)
.iconResource(MICRONAUT_ICON)
.leftHtmlText("<b>" + name + "</b>")
.leftHtmlText(PARAMETER_NAME_COLOR + name + COLOR_END)
.rightHtmlText(returnType)
.sortPriority(10)
.sortText(name)
Expand Down Expand Up @@ -282,6 +285,72 @@ public void run(ResultIterator resultIterator) throws Exception {
.build();
}

@Override
public CompletionItem createFinderMethodParams(CompilationInfo info, List<VariableElement> variableElements, int offset) {
StringBuilder label = new StringBuilder();
StringBuilder insertText = new StringBuilder();
StringBuilder sortParams = new StringBuilder();
Set<ElementHandle<TypeElement>> handles = new HashSet<>();
label.append(PARAMETERS_COLOR).append('(').append(COLOR_END);
sortParams.append('(');
int cnt = 0;
Iterator<VariableElement> it = variableElements.iterator();
while (it.hasNext()) {
cnt++;
VariableElement variableElement = it.next();
String name = variableElement.getSimpleName().toString();
TypeMirror type = variableElement.asType();
String typeName = Utils.getTypeName(info, type, false, false).toString();
for (TypeElement ann : Utils.getRelevantAnnotations(variableElement)) {
insertText.append('@').append(ann.getSimpleName()).append(' ');
handles.add(ElementHandle.create(ann));
}
if (type.getKind() == TypeKind.DECLARED) {
handles.add(ElementHandle.create((TypeElement) ((DeclaredType) type).asElement()));
}
label.append(typeName).append(' ').append(PARAMETER_NAME_COLOR).append(name).append(COLOR_END);
insertText.append(typeName).append(' ').append("${PAR#").append(cnt).append(" default=\"").append(name).append("\"}");
sortParams.append(typeName);
if (it.hasNext()) {
label.append(", ");
insertText.append(", ");
sortParams.append(",");
}
}
label.append(PARAMETERS_COLOR).append(')').append(COLOR_END);
sortParams.append(')');
return CompletionUtilities.newCompletionItemBuilder("(...)")
.startOffset(offset)
.iconResource(MICRONAUT_ICON)
.leftHtmlText(label.toString())
.sortPriority(5)
.sortText(sortParams.toString())
.onSelect(ctx -> {
final Document doc = ctx.getComponent().getDocument();
try {
doc.remove(offset, ctx.getComponent().getCaretPosition() - offset);
} catch (BadLocationException ex) {
Exceptions.printStackTrace(ex);
}
CodeTemplateManager.get(doc).createTemporary(insertText.toString()).insert(ctx.getComponent());;
try {
ModificationResult mr = ModificationResult.runModificationTask(Collections.singletonList(Source.create(doc)), new UserTask() {
@Override
public void run(ResultIterator resultIterator) throws Exception {
WorkingCopy copy = WorkingCopy.get(resultIterator.getParserResult());
copy.toPhase(JavaSource.Phase.ELEMENTS_RESOLVED);
Set<TypeElement> toImport = handles.stream().map(handle -> handle.resolve(copy)).filter(te -> te != null).collect(Collectors.toSet());
copy.rewrite(copy.getCompilationUnit(), GeneratorUtilities.get(copy).addImports(copy.getCompilationUnit(), toImport));
}
});
mr.commit();
} catch (IOException | ParseException ex) {
Exceptions.printStackTrace(ex);
}
})
.build();
}

@Override
public CompletionItem createSQLItem(CompletionItem item) {
return item;
Expand Down
Loading

0 comments on commit 8d6c4b8

Please sign in to comment.