fixed bug #175 Predefined prompts lookup fails if two prompts have key with same prefix (#176)

* fixed bug #175 Predefined prompts lookup fails if two prompts have key with same prefix

* fixed project info concatenated to the prompt without any separation

Author: stefanofornari

src/main/java/io/github/jeddict/ai/hints/AssistantChatManager.java

@@ -87,6 +87,7 @@
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -737,14 +738,23 @@ public void actionPerformed(ActionEvent ae) {
                     String question = questionPane.getText();
                     Map<String, String> prompts = PreferencesManager.getInstance().getPrompts();
 
-                    for (Map.Entry<String, String> entry : prompts.entrySet()) {
-                        String promptKey = entry.getKey();
-                        String promptValue = entry.getValue();
+                    //
+                    // To make sure the longest matching shortcut matches (i.e.
+                    // 'shortcutlong' is 'shortcut' is defined as well) let's
+                    // sort the shurtcuts in descending order; this guarantees
+                    // 'shortcut2' is matched before "shortcut" in the for loop
+                    //
+                    ArrayList<String> promptKeys = new ArrayList();
+                    promptKeys.addAll(prompts.keySet());
+                    promptKeys.sort(Comparator.reverseOrder());
 
-                        String toReplace = "/" + promptKey;
+                    for (String key: promptKeys) {
+                        String prompt = prompts.get(key);
+
+                        String toReplace = "/" + key;
 
                         if (question.contains(toReplace)) {
-                            question = question.replace(toReplace, promptValue);
+                            question = question.replace(toReplace, prompt);
                         }
                     }
                     if (!question.isEmpty()) {

src/main/java/io/github/jeddict/ai/lang/JeddictChatModelBuilder.java

@@ -226,7 +226,7 @@ private String generateInternal(Project project, String prompt, List<String> ima
                     JOptionPane.ERROR_MESSAGE);
         }
         if (project != null) {
-            prompt = prompt + ProjectMetadataInfo.get(project);
+            prompt = prompt + "\n" + ProjectMetadataInfo.get(project);
         }
         String systemMessage = null;
         String globalRules = PreferencesManager.getInstance().getGlobalRules();