wttech · krystian-panek-vmltech · May 7, 2025 · May 7, 2025 · May 7, 2025 · Copilot
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/snippet/Snippet.java b/core/src/main/java/com/vml/es/aem/acm/core/snippet/Snippet.java
@@ -45,11 +45,11 @@ public String getId() {
     }
 
     public String getContent() throws AcmException {
-        return definition.getContent();
+        return StringUtils.trim(definition.getContent());
-        return StringUtils.trim(definition.getContent());
+        return StringUtils.trimToEmpty(definition.getContent());
-        return StringUtils.trim(definition.getContent());
+        return StringUtils.trimToEmpty(definition.getContent());
     }
 
     public String getDocumentation() throws AcmException {
-        return definition.getDocumentation();
+        return StringUtils.trim(definition.getDocumentation());
     }
 
     @JsonIgnore
@@ -74,7 +74,7 @@ public String getName() {
     }
 
     public String getGroup() {
-        String result = definition.getGroup();
+        String result = StringUtils.trim(definition.getGroup());
         if (StringUtils.isBlank(result)) {
             result = StringUtils.substringBeforeLast(getPath(), "/");
            }

diff --git a/...rc/main/content/jcr_root/conf/acm/settings/script/manual/example/ACM-1_classes_jms.groovy b/...rc/main/content/jcr_root/conf/acm/settings/script/manual/example/ACM-1_classes_jms.groovy
@@ -1,3 +1,13 @@
+/**
+ * Generate a list of all system classes in the current JVM.
+ * This version of the script is designed to be run in the context of AEM running on Java 9+.
+ *
+ * Arguments allow to:
+ * - print the list (for debugging purposes),
+ * - save it directly in the repository in expected path.
+ *
+ * @author Krystian Panek <krystian.panek@vml.com>
+ */
 import com.vml.es.aem.acm.core.assist.JavaClassDictionary
 
 import java.lang.module.ModuleFinder

diff --git a/.../main/content/jcr_root/conf/acm/settings/script/manual/example/ACM-1_classes_rtjar.groovy b/.../main/content/jcr_root/conf/acm/settings/script/manual/example/ACM-1_classes_rtjar.groovy
@@ -1,3 +1,13 @@
+/**
+ * Generate a list of all system classes in the current JVM.
+ * This version of the script is designed to be run in the context of AEM running on Java 8.
+ *
+ * Arguments allow to:
+ * - print the list (for debugging purposes),
+ * - save it directly in the repository in expected path.
+ *
+ * @author Krystian Panek <krystian.panek@vml.com>
+ */
 import com.vml.es.aem.acm.core.assist.JavaClassDictionary
 import java.util.function.Consumer
 import java.util.jar.JarFile

diff --git a/...main/content/jcr_root/conf/acm/settings/script/manual/example/ACME-200_hello-world.groovy b/...main/content/jcr_root/conf/acm/settings/script/manual/example/ACME-200_hello-world.groovy
@@ -1,3 +1,10 @@
+/**
+ * Prints "Hello World!" to the console.
+ *
+ * This is a minimal example of AEM Content Manager script.
+ *
+ * @author Krystian Panek <krystian.panek@vml.com>
+ */
 boolean canRun() {
     return condition.always()
 }

diff --git a/...c/main/content/jcr_root/conf/acm/settings/script/manual/example/ACME-201_arguments.groovy b/...c/main/content/jcr_root/conf/acm/settings/script/manual/example/ACME-201_arguments.groovy
@@ -1,3 +1,10 @@
+/**
+ * Prints animal information to the console based on user input.
+ *
+ * This is an example of AEM Content Manager script with arguments.
+ *
+ * @author Krystian Panek <krystian.panek@vml.com>
+ */
 void describeRun() {
     args.string("animalName") { value = "Whiskers" ; validator = "(v, a) => a.animalType === 'cat' ? (v && v.startsWith('W') || 'Cat name must start with W!') : true" }
     args.select("animalType") { value = "cat"; options = ["cat", "dog", "bird", "fish", "hamster", "rabbit", "turtle", "lizard", "snake", "frog"] }

diff --git a/ui.frontend/src/utils/monaco/groovy/completions.ts b/ui.frontend/src/utils/monaco/groovy/completions.ts
@@ -1,8 +1,10 @@
 import { Monaco } from '@monaco-editor/react';
 import { registerAemCodeCompletions } from './completions/aem-code.ts';
+import { registerCoreCompletions } from './completions/core.ts';
 import { registerSelfCodeCompletions } from './completions/self-code.ts';
 
 export function registerCompletions(instance: Monaco) {
+  registerCoreCompletions(instance);
   registerSelfCodeCompletions(instance);
   registerAemCodeCompletions(instance);
 }
diff --git a/ui.frontend/src/utils/monaco/groovy/completions/aem-code.ts b/ui.frontend/src/utils/monaco/groovy/completions/aem-code.ts
@@ -93,16 +93,16 @@ function registerResourceCompletion(instance: Monaco) {
 
 function monacoKind(kind: string): monaco.languages.CompletionItemKind {
   switch (kind.toLowerCase()) {
-    case 'class':
+    case SuggestionKind.CLASS:
       return monaco.languages.CompletionItemKind.Class;
+    case SuggestionKind.VARIABLE:
+      return monaco.languages.CompletionItemKind.Variable;
+    case SuggestionKind.SNIPPET:
+      return monaco.languages.CompletionItemKind.Snippet;
     case 'method':
       return monaco.languages.CompletionItemKind.Method;
     case 'function':
       return monaco.languages.CompletionItemKind.Function;
-    case 'variable':
-      return monaco.languages.CompletionItemKind.Variable;
-    case 'snippet':
-      return monaco.languages.CompletionItemKind.Snippet;
     default:
       return monaco.languages.CompletionItemKind.Text;
   }

diff --git a/ui.frontend/src/utils/monaco/groovy/completions/core.ts b/ui.frontend/src/utils/monaco/groovy/completions/core.ts
@@ -0,0 +1,85 @@
+import { Monaco } from '@monaco-editor/react';
+import * as monaco from 'monaco-editor';
+import { LANGUAGE_ID } from '../../groovy.ts';
+import {MarkdownString} from "monaco-editor/esm/vs/base/common/htmlContent";
+
+export function registerCoreCompletions(instance: Monaco) {
+  registerScriptCompletions(instance);
+}
+
+/**
+ * Completions for class 'groovy.lang.Script' which is the base class for all Groovy scripts.
+ */
+export function registerScriptCompletions(instance: Monaco) {
+  instance.languages.registerCompletionItemProvider(LANGUAGE_ID, {
+    provideCompletionItems: (model: monaco.editor.ITextModel, position: monaco.Position) => {
+      const modelPosition = model.getWordUntilPosition(position);
+      const range = new monaco.Range(position.lineNumber, modelPosition.startColumn, position.lineNumber, modelPosition.endColumn);
+      const suggestions: monaco.languages.CompletionItem[] = [
+        {
+          label: 'println()',
+          insertText: 'println()',
+          documentation: new MarkdownString('Prints a line to the console.'),
+          kind: monaco.languages.CompletionItemKind.Function,
+          range,
+        },
+        {
+          label: 'print()',
+          kind: monaco.languages.CompletionItemKind.Function,
+          insertText: 'print()',
+          documentation: new MarkdownString('Prints to the console without a newline.'),
+          range,
+        },
+        {
+          label: 'println(Object value)',
+          kind: monaco.languages.CompletionItemKind.Function,
+          insertText: 'println(${1:value})',
+          insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+          documentation: new MarkdownString(`
+Prints the given value to the console, followed by a newline.
+    
+For example:
+
+\`\`\`groovy
+println("Hello, World!")
+\`\`\`
+`),
+          range,
+        },
+        {
+          label: 'printf(String format, Object value)',
+          kind: monaco.languages.CompletionItemKind.Function,
+          insertText: 'printf(${1:format}, ${2:value})',
+          insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+          documentation: new MarkdownString(`
+Prints a formatted string to the console.
+
+For example:
+
+\`\`\`groovy
+printf("Hello %s!", "John")
+\`\`\`
+`),
+          range,
+        },
+        {
+          label: 'printf(String format, Object[] values)',
+          kind: monaco.languages.CompletionItemKind.Function,
+          insertText: 'printf(${1:format}, ${2:values})',
+          insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+          documentation: new MarkdownString(`
+Prints a formatted string with multiple values to the console.
+
+For example:
+\`\`\`groovy
+printf("Hello %s! You have %d new message(s)!", "John", 5)
+\`\`\`
+`),
+          range,
+        }
+      ];
+
+      return { suggestions };
+    },
+  });
+}