fix tests

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/JassDocService.java

@@ -157,10 +157,16 @@ public static void setTestLookup(@Nullable Function<LookupKey, @Nullable String>
     }
 
     public @Nullable String documentationFor(String symbolName, SymbolKind symbolKind, String sourceFile) {
+        Function<LookupKey, @Nullable String> override = testLookup;
+        LookupKey key = new LookupKey(symbolName, symbolKind, sourceFile);
+        if (override != null) {
+            Optional<String> computed = Optional.ofNullable(trimToNull(override.apply(key)));
+            Optional<String> prev = lookupCache.putIfAbsent(key, computed);
+            return (prev != null ? prev : computed).orElse(null);
+        }
         if (!isJassBuiltinSource(sourceFile)) {
             return null;
         }
-        LookupKey key = new LookupKey(symbolName, symbolKind, sourceFile);
         Optional<String> cached = lookupCache.computeIfAbsent(key, this::lookupDocumentation);
         return cached.orElse(null);
     }
@@ -170,10 +176,16 @@ public static void setTestLookup(@Nullable Function<LookupKey, @Nullable String>
      * if DB is not ready, triggers async init and returns null immediately.
      */
     public @Nullable String documentationForQuick(String symbolName, SymbolKind symbolKind, String sourceFile) {
+        LookupKey key = new LookupKey(symbolName, symbolKind, sourceFile);
+        Function<LookupKey, @Nullable String> override = testLookup;
+        if (override != null) {
+            Optional<String> computed = Optional.ofNullable(trimToNull(override.apply(key)));
+            Optional<String> prev = lookupCache.putIfAbsent(key, computed);
+            return (prev != null ? prev : computed).orElse(null);
+        }
         if (!isJassBuiltinSource(sourceFile)) {
             return null;
         }
-        LookupKey key = new LookupKey(symbolName, symbolKind, sourceFile);
         Optional<String> cached = lookupCache.get(key);
         if (cached != null) {
             return cached.orElse(null);

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/GetCompletions.java

@@ -217,20 +217,20 @@ private void enrichTopDocumentation(List<CompletionItem> completions) {
             }
             String comment = null;
             boolean jassDoc = false;
-            if (target instanceof NameDef) {
-                NameDef n = (NameDef) target;
-                comment = n.attrComment();
-                if (comment == null || comment.isEmpty()) {
-                    comment = JassDocService.getInstance().documentationForVariableQuick(n);
-                    jassDoc = comment != null && !comment.isEmpty();
-                }
-            } else if (target instanceof FunctionDefinition) {
+            if (target instanceof FunctionDefinition) {
                 FunctionDefinition f = (FunctionDefinition) target;
                 comment = f.attrComment();
                 if (comment == null || comment.isEmpty()) {
                     comment = JassDocService.getInstance().documentationForFunctionQuick(f);
                     jassDoc = comment != null && !comment.isEmpty();
                 }
+            } else if (target instanceof NameDef) {
+                NameDef n = (NameDef) target;
+                comment = n.attrComment();
+                if (comment == null || comment.isEmpty()) {
+                    comment = JassDocService.getInstance().documentationForVariableQuick(n);
+                    jassDoc = comment != null && !comment.isEmpty();
+                }
             }
             if (comment == null || comment.isEmpty()) {
                 continue;

de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/LspNativeFeaturesTests.java

@@ -473,7 +473,14 @@ public void completionUsesJassDocFallbackForBuiltinFunction() throws IOException
             assertNotNull(completions);
             String doc = completions.getItems().stream()
                 .filter(i -> "DisplayTextToPlayer".equals(i.getLabel()))
-                .map(i -> i.getDocumentation() != null ? i.getDocumentation().getLeft() : null)
+                .map(i -> {
+                    if (i.getDocumentation() == null) {
+                        return null;
+                    }
+                    return i.getDocumentation().isLeft()
+                        ? i.getDocumentation().getLeft()
+                        : i.getDocumentation().getRight().getValue();
+                })
                 .filter(Objects::nonNull)
                 .findFirst()
                 .orElse("");