feat: update

LanguageServer/src/main/java/de/dhbw/handler/ChangeHandler.java

@@ -92,7 +92,7 @@ public class ChangeHandler {
                 logService.log("[didChange] Input of Text Document is null in TextDocument-Hashmap.", MessageType.Error);
             }
 
-            ArrayList<LSPVariable> typesOfMethodAndParameters = typeResolver.infereInput(currentInput, params.getTextDocument().getUri());
+            ArrayList<LSPVariable> typesOfMethodAndParameters = typeResolver.infereInput(params.getTextDocument().getUri());
 
 
             DiagnosticsAndTypehints diagnosticsAndTypehints = conversionHelper.variablesToDiagnosticsAndTypehints(typesOfMethodAndParameters, params.getTextDocument().getUri());

LanguageServer/src/main/java/de/dhbw/handler/SaveHandler.java

@@ -46,7 +46,7 @@ public class SaveHandler {
                 logService.log("[didSave] Input of Text Document is null in TextDocument-Hashmap.", MessageType.Error);
             }
 
-            ArrayList<LSPVariable> variables = typeResolver.infereInput(fileInput, didSaveTextDocumentParams.getTextDocument().getUri());
+            ArrayList<LSPVariable> variables = typeResolver.infereInput(didSaveTextDocumentParams.getTextDocument().getUri());
             cacheService.setVariables(variables);
 
             DiagnosticsAndTypehints diagnosticsAndTypehints = conversionHelper.variablesToDiagnosticsAndTypehints(variables, didSaveTextDocumentParams.getTextDocument().getUri());
@@ -64,7 +64,11 @@ public class SaveHandler {
 
         } catch (Exception e) {
             logService.log("[didSave] Error trying to get Inlay-Hints and Diagnostics for Client: " + e.getMessage(), MessageType.Error);
-            clientService.showMessage(MessageType.Error, e.getMessage());
+
+            for(StackTraceElement elem : e.getStackTrace()){
+                logService.log(elem.toString());
+            }
+            clientService.showMessage(MessageType.Error, e.getMessage() == null ? "null" : e.getMessage());
             cacheService.updateGlobalMaps(new ArrayList<>(), new ArrayList<>(), didSaveTextDocumentParams.getTextDocument().getUri());
 
         } finally {

LanguageServer/src/main/java/de/dhbw/helper/TypeResolver.java

@@ -2,14 +2,21 @@ package de.dhbw.helper;
 
 
 import de.dhbw.model.*;
+import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.languageServerInterface.LanguageServerInterface;
 import de.dhbwstuttgart.languageServerInterface.model.LanguageServerTransferObject;
+import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
+import de.dhbwstuttgart.typedeployment.TypeInsert;
+import de.dhbwstuttgart.typedeployment.TypeInsertFactory;
+import de.dhbwstuttgart.typeinference.result.ResultSet;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 
 import java.io.IOException;
+import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.file.Path;
 import java.util.*;
 
 
@@ -71,6 +78,56 @@ public class TypeResolver {
         return current;
     }
 
+
+    public ArrayList<LSPVariable> infereInput(String pathString) throws IOException, ClassNotFoundException, URISyntaxException {
+        var uri = new URI(pathString);
+        var path = Path.of(uri);
+        var file = path.toFile();
+        var compiler = new JavaTXCompiler(file, false);
+        var parsedSource = compiler.sourceFiles.get(file);
+        var tiResults = compiler.typeInference(file);
+        Set<TypeInsert> tips = new HashSet<>();
+
+        for (var sf : compiler.sourceFiles.values()) {
+            Map<JavaClassName, byte[]> bytecode = compiler.generateBytecode(sf, tiResults);
+        }
+
+
+        for (int i = 0; i < tiResults.size(); i++) {
+            ResultSet tiResult = tiResults.get(i);
+            tips.addAll(TypeInsertFactory.createTypeInsertPoints(parsedSource, tiResult, compiler.getGeneratedGenerics().get(compiler.sourceFiles.get(file)).get(i)));
+        }
+
+        current = new LanguageServerTransferObject(tiResults, parsedSource, "", compiler.getGeneratedGenerics());
+
+
+        HashMap<String, List<TypeInsert>> insertsOnLines = new HashMap<>();
+
+        for (TypeInsert insert : tips) {
+            if (!insertsOnLines.containsKey(insert.point.point.getLine() + " " + insert.point.point.getCharPositionInLine())) {
+                insertsOnLines.put(insert.point.point.getLine() + " " + insert.point.point.getCharPositionInLine(), new ArrayList<>(List.of(insert)));
+            } else {
+                insertsOnLines.get(insert.point.point.getLine() + " " + insert.point.point.getCharPositionInLine()).add(insert);
+            }
+        }
+
+        ArrayList<LSPVariable> variables = new ArrayList<>(insertsOnLines.entrySet().stream().map(el -> new LSPVariable("test", new ArrayList<>(el.getValue().stream().map(typeinsert -> new Type(typeinsert.getInsertString(), typeinsert.point.isGenericClassInsertPoint())).toList()), el.getValue().getFirst().point.point.getLine(), el.getValue().getFirst().point.point.getCharPositionInLine(), el.getValue().get(0).point.point.getStopIndex(), el.getValue().get(0).getResultPair().getLeft())).toList());
+
+        for (var variable : variables) {
+            Set<Type> set = new HashSet<>(variable.getPossibleTypes().stream().map(el -> new Type(el.getType().replaceAll(" ", ""), el.isGeneric())).toList());
+            variable.getPossibleTypes().clear();
+            variable.getPossibleTypes().addAll(set);
+            logger.info(variable.getLine() + ":" + variable.getCharPosition());
+            for (Type t : variable.getPossibleTypes()) {
+                logger.info(t.getType());
+            }
+
+        }
+
+        return variables;
+    }
+
+
     /**
      * Zum Erhalt für sowohl Parameter als auch Methoden.
      */

LanguageServer/src/main/java/de/dhbw/model/Type.java

@@ -24,4 +24,15 @@ public class Type {
     public boolean isGeneric() {
         return generic;
     }
+
+
+    @Override
+    public boolean equals(Object obj) {
+        return type.equals(obj.toString());
+    }
+
+    @Override
+    public String toString() {
+        return type;
+    }
 }