Improved suggestions for classes, variables and resources

core/src/main/java/com/vml/es/aem/acm/core/code/CodeRepository.java

@@ -20,7 +20,8 @@ public class CodeRepository {
  public @interface Config {
  @AttributeDefinition(
  name = "Class Links",
- description = "Mapping of class prefixes to their corresponding documentation URLs in the format 'package=url'.")
+ description =
+ "Mapping of class prefixes to their corresponding documentation URLs in the format 'package=url'.")
  String[] classLinks() default {
  "com.vml.es.aem.acm.core=https://github.com/wttech/acm/blob/main/core/src/main/java",
  "org.apache.sling.api=https://github.com/apache/sling-org-apache-sling-api/tree/master/src/main/java"

ui.frontend/src/utils/api.types.ts

@@ -157,14 +157,16 @@ export type ExecutionOutput<E> = {
 
 export type AssistCodeOutput = {
  code: string;
- suggestions: {
- k: string; // kind
- l: string; // label
- it: string; // insert text
- i: string; // info
- }[];
+ suggestions: Suggestion[];
 };
 
+export type Suggestion = {
+ k: "variable" | "resource" | "snippet" | "class"; // kind
+ l: string; // label
+ it: string; // insert text
+ i: string; // info
+}
+
 export type SnippetOutput = {
  list: Snippet[];
 };

ui.frontend/src/utils/monaco/groovy/completions/aem-code.ts

@@ -2,8 +2,9 @@ import { Monaco } from '@monaco-editor/react';
 import * as monaco from 'monaco-editor';
 import { MarkdownString } from 'monaco-editor/esm/vs/base/common/htmlContent';
 import { apiRequest } from '../../../api.ts';
-import { AssistCodeOutput } from '../../../api.types.ts';
+import {AssistCodeOutput, Suggestion} from '../../../api.types.ts';
 import { LANGUAGE_ID } from '../../groovy.ts';
+import {languages} from "monaco-editor/esm/vs/editor/editor.api"
 
 export function registerAemCodeCompletions(instance: Monaco) {
  registerWordCompletion(instance);
@@ -38,18 +39,14 @@ function registerWordCompletion(instance: Monaco) {
  });
  const assistance = response.data.data;
  const suggestions = (assistance?.suggestions ?? []).map((suggestion) => ({
- label: suggestion.l ?? suggestion.it,
+ label: composeLabel(suggestion),
  insertText: suggestion.it ?? suggestion.l,
  insertTextRules: monacoInsertTextRules(suggestion.k),
  kind: monacoKind(suggestion.k),
  detail: suggestion.k,
  documentation: new MarkdownString(suggestion.i),
  range: new monaco.Range(position.lineNumber, wordAtPosition?.startColumn || position.column, position.lineNumber, wordAtPosition?.endColumn || position.column),
-
- // TODO below does not work, Monaco bug? (we want to prioritize exact class name matches)
- // sortText: sortText(suggestion.v, wordText)
- }));
-
+ }))
  return { suggestions: suggestions, incomplete: true };
  } catch (error) {
  console.error('Code assistance error:', error);
@@ -76,7 +73,7 @@ function registerResourceCompletion(instance: Monaco) {
  });
  const assistance = response.data.data;
  const suggestions = (assistance?.suggestions ?? []).map((suggestion) => ({
- label: suggestion.it ?? suggestion.l,
+ label: composeLabel(suggestion),
  insertText: removePathPrefix(path, suggestion.it ?? suggestion.l), // subtract path prefix
  kind: monacoKind(suggestion.k),
  detail: suggestion.k,
@@ -154,12 +151,25 @@ function removePathPrefix(path: string, v: string) {
  return v;
 }
 
-/*
-function sortText(label: string, word: string): string {
- const lastSegment = label.split('.').pop() || '';
- const isExactMatch = lastSegment === word;
- const isPartialMatch = lastSegment.includes(word);
- const score = (isExactMatch ? '0' : isPartialMatch ? '1' : '2');
- return score + "_" + label;
+function composeLabel(suggestion: Suggestion) {
+ if (suggestion.k == "class") {
+ return {
+ label: suggestion.it ? suggestion.it.split('.').at(-1) : suggestion.l.split('.').at(-1),
+ description: suggestion.it ?? suggestion.l
+ } as languages.CompletionItemLabel
+ } else if (suggestion.k == "variable") {
+ return {
+ label: suggestion.it ? suggestion.it.split('.').at(-1) : suggestion.l.split('.').at(-1),
+ description: suggestion.i.replace("Type: ", "")
+ } as languages.CompletionItemLabel
+ } else if (suggestion.k == "resource") {
+ return {
+ label: suggestion.it ? suggestion.it.split("/").at(-1) : suggestion.l.split("/").at(-1),
+ description: suggestion.it
+ } as languages.CompletionItemLabel
+ }
+ return {
+ label: suggestion.l,
+ description: suggestion.it
+ } as languages.CompletionItemLabel
 }
-*/