feat: fix characters

Clients/Intellij/installation.md

@@ -0,0 +1,13 @@
+# Installation des Intellij Language Clients
+
+Um den Language Client für Intellij installieren zu können, kann die Erweiterung
+[LSP4IJ](https://plugins.jetbrains.com/plugin/23257-lsp4ij) installiert werden.
+
+## Installation
+1. Installiere [LSP4IJ](https://plugins.jetbrains.com/plugin/23257-lsp4ij)
+2. Öffne den Language Server Tab
+3. Füge einen neuen Language-Server hinzu
+4. Vergebe einen Namen und füge folgenden Command hinzu: `java -jar "<path/to/LanguageServer.jar>`
+5. Füge unter Mappings -> File name patterns *.jav und Language ID java_tx hinzu
+6. öffne eine Datei mit Dateiendung .jav
+7. Fertig

Clients/VisualStudioCode/package.json

@@ -1,8 +1,9 @@
 {
-  "name": "lspclient",
-  "displayName": "LSPClient",
-  "description": "",
-  "version": "0.0.1",
+  "icon": "TX.png",
+  "name": "java-tx-language-extension",
+  "displayName": "Java-TX Language Extension",
+  "description": "The Language Extension for Java-TX with Typehints and Syntax Checks",
+  "version": "0.0.2",
   "engines": {
     "vscode": "^1.94.0"
   },

LanguageServer/src/main/java/de/dhbw/JavaTXLanguageServer.java

@@ -8,7 +8,6 @@ import org.eclipse.lsp4j.services.TextDocumentService;
 import org.eclipse.lsp4j.services.WorkspaceService;
 import org.eclipse.lsp4j.services.LanguageServer;
 
-import java.net.URI;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 /**

LanguageServer/src/main/java/de/dhbw/JavaTXTextDocumentService.java

@@ -1,20 +1,15 @@
 package de.dhbw;
 
-import de.dhbw.handler.ChangeHandler;
-import de.dhbw.handler.CodeActionHandler;
-import de.dhbw.handler.FormattingHandler;
+import de.dhbw.handler.*;
 import de.dhbw.service.CacheService;
 import de.dhbw.service.ClientService;
 import de.dhbw.service.LogService;
-import de.dhbw.handler.SaveHandler;
 import de.dhbw.helper.CodeSnippetOptions;
 import de.dhbw.helper.ConversionHelper;
 import de.dhbw.helper.TextHelper;
 import de.dhbw.helper.TypeResolver;
 import de.dhbw.model.SnippetWithName;
 import de.dhbw.service.ParserService;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
 import org.eclipse.lsp4j.*;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.services.LanguageClient;
@@ -52,7 +47,6 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
 
     public JavaTXTextDocumentService() {
         this.textHelper = new TextHelper();
-        this.parserService = new ParserService();
         this.cacheService = new CacheService();
         this.clientService = new ClientService(null);
         this.typeResolver = new TypeResolver();
@@ -60,8 +54,9 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
         this.conversionHelper = new ConversionHelper(textHelper, textDocumentService);
         this.logService = new LogService(clientService);
         this.formattingHandler = new FormattingHandler(textDocumentService);
+        this.parserService = new ParserService(conversionHelper, clientService, cacheService);
         this.codeActionHandler = new CodeActionHandler(textHelper, textDocumentService, cacheService, typeResolver, logService);
-        this.saveHandler = new SaveHandler(typeResolver, textDocumentService, logService, cacheService, conversionHelper, clientService);
+        this.saveHandler = new SaveHandler(typeResolver, textDocumentService, logService, cacheService, conversionHelper, clientService, parserService);
         this.changeHandler = new ChangeHandler(textDocumentService, parserService, conversionHelper, clientService, typeResolver, cacheService, logService);
     }
 
@@ -294,7 +289,7 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
         logService.log("Code-Action Context was: " + params.getContext().getTriggerKind().name(), MessageType.Info);
 
         return CompletableFuture.supplyAsync(() -> {
-            return codeActionHandler.handleCodeAction(params);
+            return codeActionHandler.handleNewCodeAction(params);
         });
     }
 

LanguageServer/src/main/java/de/dhbw/JavaTXWorkspaceService.java

@@ -3,13 +3,8 @@ package de.dhbw;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.eclipse.lsp4j.*;
-import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.services.WorkspaceService;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-
 /**
  *
  * Handles Actions in Workspace

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

@@ -10,8 +10,13 @@ import de.dhbw.model.LineCharPosition;
 import de.dhbw.service.*;
 import org.eclipse.lsp4j.*;
 
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 public class ChangeHandler {
 
@@ -33,23 +38,86 @@ public class ChangeHandler {
         this.logService = logService;
     }
 
+
+    public static String findAddedWord(String str1, String str2) {
+        String[] words1 = str1.split("\\s+");
+        String[] words2 = str2.split("\\s+");
+
+        int i = 0, j = 0;
+        while (i < words1.length && j < words2.length) {
+            if (words1[i].equals(words2[j])) {
+                i++;
+                j++;
+            } else {
+                return words2[j]; // Unterschied gefunden
+            }
+        }
+
+        // Falls das neue Wort am Ende steht
+        if (j < words2.length) {
+            return words2[j];
+        }
+
+        return null; // Kein Unterschied gefunden
+    }
+
     public void didChange(DidChangeTextDocumentParams params) {
         String currentText = textDocumentService.getFileOfUri(params.getTextDocument().getUri());
 
-        DocumentChanges documentChanges = textDocumentService.calculateDifference(currentText, params.getContentChanges().getFirst().getText());
-        HashMap<LineCharPosition, String> preciseChanges = documentChanges.getPreciseChanges();
-        ArrayList<Integer> offsetPerLine = documentChanges.getOffsetPerLine();
-        HashMap<Integer, List<String>> textChanges = documentChanges.getTextChanges();
-
         AtomicReference<String> summedUp = new AtomicReference<>("");
         params.getContentChanges().forEach(el -> summedUp.set(summedUp.get() + el.getText()));
         textDocumentService.saveFileWithUri(params.getTextDocument().getUri(), summedUp.get());
 
+        DocumentChanges documentChanges = textDocumentService.calculateDifference(currentText, summedUp.get());
+        HashMap<LineCharPosition, String> preciseChanges = documentChanges.getPreciseChanges();
+        HashMap<Integer, List<String>> textChanges;
+
+
+        String type = findAddedWord(currentText, summedUp.get());
+        logService.log("ADDED TYPE IS: " + type);
+
+        //Have to check of old saved Input because the result set and Inlay Hints will be updated according to the old AST which contains the old Positions
+        if (cacheService.getLastSavedFiles().containsKey(params.getTextDocument().getUri())) {
+            DocumentChanges changesFromOldSave = textDocumentService.calculateDifference(cacheService.getLastSavedFiles().get(params.getTextDocument().getUri()), summedUp.get());
+            ;
+            textChanges = changesFromOldSave.getTextChanges();
+            preciseChanges = changesFromOldSave.getPreciseChanges();
+            logService.log(textChanges.values().stream().map(el -> String.join(", ", el)).collect(Collectors.joining("\n")));
+        } else {
+            textChanges = documentChanges.getTextChanges();
+        }
+
+
         String input = summedUp.get();
 
-        checkParser(input, params.getTextDocument().getUri());
 
-        typeResolver.reduceCurrent(preciseChanges, cacheService.getVariables(), clientService.getClient());
+        logService.log("Variables are: " + cacheService.getVariables().size());
+
+
+        AtomicBoolean needToCalculate = new AtomicBoolean(false);
+
+        cacheService.getVariables().forEach(
+                el -> el.getPossibleTypes().forEach(pos -> needToCalculate.set(needToCalculate.get() || pos.getType().equalsIgnoreCase(type)))
+        );
+
+
+
+        if (false) {
+            typeResolver.reduceCurrent(preciseChanges, cacheService.getVariables());
+            try {
+                File tempDir = new File(System.getProperty("java.io.tmpdir"));
+                File tempFile = File.createTempFile("newText", ".tmp", tempDir);
+                FileWriter fileWriter = new FileWriter(tempFile, true);
+                System.out.println(tempFile.getAbsolutePath());
+                BufferedWriter bw = new BufferedWriter(fileWriter);
+                bw.write(summedUp.get());
+                bw.close();
+                typeResolver.updateAst(tempFile.toURI().getPath());
+                tempFile.delete();
+            } catch (Exception e) {
+                logService.log(e.getMessage());
+            }
+
 
             var sWatch = Stopwatch.createUnstarted();
             sWatch.start();
@@ -59,10 +127,10 @@ public class ChangeHandler {
                 String currentInput = textDocumentService.getFileOfUri(params.getTextDocument().getUri());
 
                 if (currentInput == null) {
-                logService.log("[didSave] Input of Text Document is null in TextDocument-Hashmap.", MessageType.Error);
+                    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.infereChangeInput(params.getTextDocument().getUri());
 
 
                 DiagnosticsAndTypehints diagnosticsAndTypehints = conversionHelper.variablesToDiagnosticsAndTypehints(typesOfMethodAndParameters, params.getTextDocument().getUri());
@@ -75,17 +143,22 @@ public class ChangeHandler {
 
 
             } catch (Exception e) {
-            logService.log("[didSave] Error trying to get Inlay-Hints and Diagnostics for Client: " + e.getMessage(), MessageType.Error);
+                logService.log("[didChange] Error trying to get Inlay-Hints and Diagnostics for Client: " + e.getMessage(), MessageType.Error);
+
+                for (var stackTrace : e.getStackTrace()) {
+                    logService.log(stackTrace.toString());
+                }
+
                 clientService.showMessage(MessageType.Error, e.getMessage());
                 cacheService.updateGlobalMaps(new ArrayList<>(), new ArrayList<>(), params.getTextDocument().getUri());
 
             } finally {
                 sWatch.stop();
-            logService.log("[didSave] Finished Calculating in [" + sWatch.elapsed().toSeconds() + "s]", MessageType.Info);
+                logService.log("[didChange] Finished Calculating in [" + sWatch.elapsed().toSeconds() + "s]", MessageType.Info);
             }
 
 
-        updatePositions(params, offsetPerLine);
+            //updatePositions(params, offsetPerLine);
 
 
             cacheService.getGlobalInlayHintMap().put(params.getTextDocument().getUri(), cacheService.getGlobalInlayHintMap().get(params.getTextDocument().getUri()).stream().filter(el -> {
@@ -99,25 +172,75 @@ public class ChangeHandler {
                 return !textChanges.get(el.getRange().getStart().getLine()).contains(el.getMessage().replaceAll(" ", ""));
             }).toList());
 
-        clientService.publishDiagnostics(params.getTextDocument().getUri(), cacheService.getGlobalDiagnosticsMap().get(params.getTextDocument().getUri()));
+            List<Diagnostic> typeDiagnostics = cacheService.getGlobalDiagnosticsMap().get(params.getTextDocument().getUri());
+            List<Diagnostic> parserErrors = parserService.getDiagnosticsOfErrors(input, params.getTextDocument().getUri());
+
+            ArrayList<Diagnostic> allDiagnostics = new ArrayList<>(typeDiagnostics);
+            allDiagnostics.addAll(parserErrors);
+
+            clientService.publishDiagnostics(params.getTextDocument().getUri(), allDiagnostics);
+        } else {
+            var sWatch = Stopwatch.createUnstarted();
+            sWatch.start();
+
+            try {
+
+                String fileInput = input;
+                logService.log("Input ist:");
+                logService.log(fileInput);
+//                cacheService.getLastSavedFiles().put(didSaveTextDocumentParams.getTextDocument().getUri(), fileInput);
+//                typeResolver.getCompilerInput(didSaveTextDocumentParams.getTextDocument().getUri(), fileInput);
+
+                try {
+                    File tempDir2 = new File(System.getProperty("java.io.tmpdir"));
+                    File tempFile2 = File.createTempFile("newText", ".tmp", tempDir2);
+                    FileWriter fileWriter = new FileWriter(tempFile2, true);
+                    BufferedWriter bw = new BufferedWriter(fileWriter);
+                    bw.write(fileInput);
+                    bw.close();
+
+
+                    if (fileInput == null) {
+                        logService.log("[didSave] Input of Text Document is null in TextDocument-Hashmap.", MessageType.Error);
+                    }
+
+                    ArrayList<LSPVariable> variables = typeResolver.infereInput(tempFile2.toURI().toString(), fileInput, false);
+                    cacheService.setVariables(variables);
+
+                    DiagnosticsAndTypehints diagnosticsAndTypehints = conversionHelper.variablesToDiagnosticsAndTypehintsWithInput(variables, input);
+
+                    List<InlayHint> typeHint = diagnosticsAndTypehints.getInlayHints();
+                    List<Diagnostic> diagnostics = diagnosticsAndTypehints.getDiagnostics();
+
+                    cacheService.updateGlobalMaps(diagnostics, typeHint, params.getTextDocument().getUri());
+
+                    List<Diagnostic> allDiagnostics = new ArrayList<>(diagnostics);
+                    allDiagnostics.addAll(parserService.getDiagnosticsOfErrors(fileInput, params.getTextDocument().getUri()));
+
+                    clientService.publishDiagnostics(params.getTextDocument().getUri(), allDiagnostics);
+
+                    tempFile2.delete();
+                } catch (Exception e) {
+                    logService.log("[didSave] Error trying to get Inlay-Hints and Diagnostics for Client: " + e.getMessage(), MessageType.Error);
+
+                    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<>(), params.getTextDocument().getUri());
+
+                } finally {
+                    sWatch.stop();
+                    logService.log("[didSave] Finished Calculating in [" + sWatch.elapsed().toSeconds() + "s]", MessageType.Info);
 
                 }
 
-    private void checkParser(String input, String uri) {
-        List<Diagnostic> diagnosticsList = conversionHelper.parseErrorToDiagnostic(parserService.getParserErrors(input));
-        clientService.publishDiagnostics(uri, diagnosticsList);
+            } catch (Exception e) {
+                logService.log(e.getMessage());
             }
 
-    private void updatePositions(DidChangeTextDocumentParams params, ArrayList<Integer> offsetPerLine){
-        for (var inlayHint : cacheService.getGlobalInlayHintMap().get(params.getTextDocument().getUri())) {
-            inlayHint.getPosition().setCharacter(inlayHint.getPosition().getCharacter() + offsetPerLine.get(inlayHint.getPosition().getLine()));
+        }
     }
 
-        for (var diagnostic : cacheService.getGlobalDiagnosticsMap().get(params.getTextDocument().getUri())) {
-            diagnostic.getRange().getStart().setCharacter(diagnostic.getRange().getStart().getCharacter() + offsetPerLine.get(diagnostic.getRange().getStart().getLine()));
-            diagnostic.getRange().getEnd().setCharacter(diagnostic.getRange().getEnd().getCharacter() + offsetPerLine.get(diagnostic.getRange().getEnd().getLine()));
-        }
 
-        clientService.updateClient();
-    }
 }

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

@@ -5,6 +5,7 @@ import de.dhbw.helper.TypeResolver;
 import de.dhbw.service.CacheService;
 import de.dhbw.service.LogService;
 import de.dhbw.service.TextDocumentService;
+import de.dhbwstuttgart.typedeployment.TypeInsert;
 import org.eclipse.lsp4j.*;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 
@@ -12,6 +13,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class CodeActionHandler {
 
@@ -29,6 +31,117 @@ public class CodeActionHandler {
         this.logService = logService;
     }
 
+    public static Range wholeDocumentRange(String text) {
+        if (text == null || text.isEmpty()) {
+            return new Range(new Position(0, 0), new Position(0, 0));
+        }
+
+        int lastLine = 0;
+        int lastBreak = -1; // Index des letzten Zeilenumbruchszeichens, das zum Zeilenende gehört
+
+        final int n = text.length();
+        for (int i = 0; i < n; i++) {
+            char c = text.charAt(i);
+            if (c == '\n') {
+                lastLine++;
+                lastBreak = i;
+            } else if (c == '\r') {
+                // Unterscheide \r\n von alleine stehendem \r
+                if (i + 1 < n && text.charAt(i + 1) == '\n') {
+                    lastLine++;
+                    lastBreak = i + 1;
+                    i++; // \n überspringen
+                } else {
+                    lastLine++;
+                    lastBreak = i;
+                }
+            }
+        }
+
+        int lastLineStart = lastBreak + 1;
+        int endChar = n - lastLineStart; // Länge der letzten Zeile in UTF-16 Code Units
+
+        return new Range(new Position(0, 0), new Position(lastLine, endChar));
+    }
+
+
+    public static <V> Map<String, V> getOverlapping(
+            Map<String, V> map,
+            int line,
+            int startChar,
+            int endChar
+    ) {
+        if (startChar > endChar) {
+            int t = startChar;
+            startChar = endChar;
+            endChar = t;
+        }
+
+        final int s = startChar, e = endChar;
+
+        return map.entrySet().stream()
+                .filter(entry -> {
+                    String key = entry.getKey();
+                    String[] parts = key.split("\\s+");
+                    if (parts.length != 2) return false;
+                    try {
+                        int kLine = Integer.parseInt(parts[0]);
+                        int kChar = Integer.parseInt(parts[1]);
+                        return kLine == line && kChar >= s && kChar <= e;
+                    } catch (NumberFormatException ex) {
+                        // Key nicht im erwarteten Format
+                        return false;
+                    }
+                })
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+
+
+    public List<Either<Command, CodeAction>> handleNewCodeAction(CodeActionParams params) {
+
+        String documentUri = params.getTextDocument().getUri();
+
+
+        List<Diagnostic> diagnosticInCurrentDocument = params.getContext().getDiagnostics();
+        Range rangeOfInsert = params.getRange();
+
+        //All Diagnostics that are in range of the hover -> All Diagnostics of the selected Variable and thus all Types of the Variable
+        Map<String, List<TypeInsert>> typeInsertsOverlapping = getOverlapping(typeResolver.getInserts(), rangeOfInsert.getStart().getLine()+1, rangeOfInsert.getStart().getCharacter(), rangeOfInsert.getEnd().getCharacter());
+        logService.log("Inserts are:");
+        typeResolver.getInserts().forEach((key, value) -> logService.log(key));
+        logService.log("Size is: " + typeInsertsOverlapping.size());
+        logService.log("Range is: " + rangeOfInsert.getStart().getLine() + " -> " + rangeOfInsert.getStart().getCharacter() + " - " + rangeOfInsert.getEnd().getCharacter());
+        List<Either<Command, CodeAction>> actions = new ArrayList<>();
+
+        for (var typeInsertList : typeInsertsOverlapping.values()) {
+            for (var typeInsert : typeInsertList) {
+                try {
+                    String typeWithReplacedVariable = typeInsert.insert(textDocumentService.getFileOfUri(documentUri));
+
+                    ArrayList<TextEdit> listOfChanges = new ArrayList<>();
+
+                    listOfChanges.add(new TextEdit(wholeDocumentRange(textDocumentService.getFileOfUri(documentUri)), typeWithReplacedVariable));
+
+                    var isTypeImported = false;
+
+                    Map<String, List<TextEdit>> changes = new HashMap<>();
+                    changes.put(documentUri, listOfChanges);
+
+                    WorkspaceEdit edit = new WorkspaceEdit();
+                    edit.setChanges(changes);
+
+                    CodeAction action = new CodeAction("Insert " + typeInsert.getInsertString());
+                    action.setKind(CodeActionKind.QuickFix);
+                    action.setEdit(edit);
+                    actions.add(Either.forRight(action));
+                } catch (Exception e) {
+                    logService.log("Error creating Actions, returning empty List. The Error was: " + e.getMessage(), MessageType.Error);
+                }
+            }
+        }
+        return actions;
+    }
+
     public List<Either<Command, CodeAction>> handleCodeAction(CodeActionParams params) {
 
         String documentUri = params.getTextDocument().getUri();
@@ -60,7 +173,7 @@ public class CodeActionHandler {
                 if (typeDiagnostic.getCode().getLeft().equals("GENERIC")) {
                     for (var diagnostic : cacheService.getGlobalDiagnosticsMap().get(documentUri)) {
 
-                        if (diagnostic.getMessage().contains(typeDiagnostic.getMessage()) || typeDiagnostic.getMessage().contains(diagnostic.getMessage())) {
+                        if (diagnostic.getCode().getLeft().equals("GENERIC")) {
                             String genericType = diagnostic.getMessage() +
                                     " " +
                                     textHelper.getTextOfChars(

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

@@ -1,55 +0,0 @@
-package de.dhbw.handler;
-
-import com.github.difflib.DiffUtils;
-import com.github.difflib.patch.AbstractDelta;
-import com.github.difflib.patch.DeltaType;
-import com.github.difflib.patch.Patch;
-
-import org.eclipse.lsp4j.InlayHint;
-import org.eclipse.lsp4j.Position;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class InlayHintAdjusterDiffUtils {
-
-    public static List<InlayHint> adjustInlayHintsByLineDiff(String oldText, String newText, List<InlayHint> oldHints) {
-        List<String> oldLines = Arrays.asList(oldText.split("\n", -1));
-        List<String> newLines = Arrays.asList(newText.split("\n", -1));
-
-        Patch<String> patch = DiffUtils.diff(oldLines, newLines);
-        List<AbstractDelta<String>> deltas = patch.getDeltas();
-
-        List<InlayHint> adjusted = new ArrayList<>();
-        for (InlayHint hint : oldHints) {
-            int oldLine = hint.getPosition().getLine();
-            int lineShift = calculateLineShift(deltas, oldLine);
-            int newLine = Math.max(0, oldLine + lineShift);
-
-            adjusted.add(new InlayHint(new Position(newLine, hint.getPosition().getCharacter()), hint.getLabel()));
-        }
-
-        return adjusted;
-    }
-
-    private static int calculateLineShift(List<AbstractDelta<String>> deltas, int oldLine) {
-        int shift = 0;
-        for (AbstractDelta<String> delta : deltas) {
-            int deltaLine = delta.getSource().getPosition();
-            int linesRemoved = delta.getSource().size();
-            int linesAdded = delta.getTarget().size();
-
-            if (oldLine > deltaLine) {
-                if (delta.getType() == DeltaType.INSERT) {
-                    shift += linesAdded;
-                } else if (delta.getType() == DeltaType.DELETE) {
-                    shift -= linesRemoved;
-                } else if (delta.getType() == DeltaType.CHANGE) {
-                    shift += linesAdded - linesRemoved;
-                }
-            }
-        }
-        return shift;
-    }
-}

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

@@ -2,15 +2,16 @@ package de.dhbw.handler;
 
 import com.google.common.base.Stopwatch;
 import de.dhbw.model.DiagnosticsAndTypehints;
-import de.dhbw.service.CacheService;
-import de.dhbw.service.ClientService;
-import de.dhbw.service.LogService;
-import de.dhbw.service.TextDocumentService;
+import de.dhbw.service.*;
 import de.dhbw.helper.ConversionHelper;
 import de.dhbw.helper.TypeResolver;
 import de.dhbw.model.LSPVariable;
+import de.dhbwstuttgart.languageServerInterface.LanguageServerInterface;
 import org.eclipse.lsp4j.*;
 
+import java.net.URI;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,14 +23,16 @@ public class SaveHandler {
     private final CacheService cacheService;
     private final ConversionHelper conversionHelper;
     private final ClientService clientService;
+    private final ParserService parserService;
 
-    public SaveHandler(TypeResolver typeResolver, TextDocumentService textDocumentService, LogService logService, CacheService cacheService, ConversionHelper conversionHelper, ClientService clientService) {
+    public SaveHandler(TypeResolver typeResolver, TextDocumentService textDocumentService, LogService logService, CacheService cacheService, ConversionHelper conversionHelper, ClientService clientService, ParserService parserService) {
         this.typeResolver = typeResolver;
         this.textDocumentService = textDocumentService;
         this.logService = logService;
         this.cacheService = cacheService;
         this.conversionHelper = conversionHelper;
         this.clientService = clientService;
+        this.parserService = parserService;
     }
 
     public void handleSave(DidSaveTextDocumentParams didSaveTextDocumentParams) {
@@ -40,13 +43,14 @@ public class SaveHandler {
         try {
 
             String fileInput = textDocumentService.getFileOfUri(didSaveTextDocumentParams.getTextDocument().getUri());
-            typeResolver.getCompilerInput(didSaveTextDocumentParams.getTextDocument().getUri(), fileInput);
+            cacheService.getLastSavedFiles().put(didSaveTextDocumentParams.getTextDocument().getUri(), fileInput);
+            //typeResolver.getCompilerInput(didSaveTextDocumentParams.getTextDocument().getUri(), fileInput);
 
             if (fileInput == null) {
                 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(), fileInput, false);
             cacheService.setVariables(variables);
 
             DiagnosticsAndTypehints diagnosticsAndTypehints = conversionHelper.variablesToDiagnosticsAndTypehints(variables, didSaveTextDocumentParams.getTextDocument().getUri());
@@ -55,12 +59,28 @@ public class SaveHandler {
             List<Diagnostic> diagnostics = diagnosticsAndTypehints.getDiagnostics();
 
             cacheService.updateGlobalMaps(diagnostics, typeHint, didSaveTextDocumentParams.getTextDocument().getUri());
-            clientService.publishDiagnostics(didSaveTextDocumentParams.getTextDocument().getUri(), diagnostics);
 
+            List<Diagnostic> allDiagnostics = new ArrayList<>(diagnostics);
+            allDiagnostics.addAll(parserService.getDiagnosticsOfErrors(fileInput, didSaveTextDocumentParams.getTextDocument().getUri()));
+
+            clientService.publishDiagnostics(didSaveTextDocumentParams.getTextDocument().getUri(), allDiagnostics);
+
+//            LanguageServerInterface languageServerInterface = new LanguageServerInterface();
+//            Path path = Paths.get(new URI(didSaveTextDocumentParams.getTextDocument().getUri())).getParent();
+//            logService.log("Path is: " + path.toString());
+//
+//            try{
+//                path.toFile().mkdirs();
+//            }catch (Exception e){}
+//            languageServerInterface.generateBytecode(path.toUri());
 
         } 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/ASTTransformationHelper.java

@@ -4,6 +4,10 @@ import de.dhbw.model.*;
 import de.dhbwstuttgart.languageServerInterface.model.LanguageServerTransferObject;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.Pattern;
+import de.dhbwstuttgart.syntaxtree.statement.Assign;
+import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
+import de.dhbwstuttgart.syntaxtree.statement.Statement;
+import org.apache.log4j.Logger;
 
 
 import java.util.ArrayList;
@@ -12,6 +16,7 @@ import java.util.stream.Collectors;
 
 public class ASTTransformationHelper {
 
+    private static final Logger log = Logger.getLogger(ASTTransformationHelper.class);
     private final DuplicationUtils duplicationUtils;
     private final TypeUtils typeUtils;
     private final GenericUtils genericUtils;
@@ -45,6 +50,10 @@ public class ASTTransformationHelper {
             methodsWithParametersLSPVariableList.add(new LSPParameter("", types, fieldDecl.getOffset().getLine(), fieldDecl.getOffset().getCharPositionInLine(), fieldDecl.getOffset().getStopIndex(), fieldDecl.getReturnType()));
         }
 
+        if (transferObject.getAst().KlassenVektor.getFirst().getfieldInitializations().isPresent()) {
+            methodsWithParametersLSPVariableList.addAll(lambdaExpressionToVariable(transferObject.getAst().KlassenVektor.getFirst().getfieldInitializations().get().block.statements, transferObject));
+        }
+
         return methodsWithParametersLSPVariableList;
     }
 
@@ -52,16 +61,16 @@ public class ASTTransformationHelper {
 
         List<LSPClass> methodsWithParametersLSPVariableList = new ArrayList<>();
 
-        for (var method : transferObject.getAst().getAllMethods()) {
-            for (var clazz : transferObject.getAst().getClasses()) {
-                ArrayList<Type> genericTypes = genericUtils.getClassGenerics(transferObject.getGeneratedGenerics(), method, clazz);
-                TextHelper helper = new TextHelper();
-                if (!genericTypes.isEmpty()) {
-                    methodsWithParametersLSPVariableList.add(new LSPClass("test", genericTypes, clazz.getOffset().getLine(), helper.getClassPositionForGeneric(clazz.getOffset().getLine() - 1, input, clazz.getOffset().getStopIndex()), clazz.getOffset().getStopIndex(), clazz.getReturnType()));
-                }
-            }
-
-        }
+//        for (var method : transferObject.getAst().getAllMethods()) {
+//            for (var clazz : transferObject.getAst().getClasses()) {
+//                ArrayList<Type> genericTypes = genericUtils.getClassGenerics(transferObject.getGeneratedGenerics(), method, clazz);
+//                TextHelper helper = new TextHelper();
+//                if (!genericTypes.isEmpty()) {
+//                    methodsWithParametersLSPVariableList.add(new LSPClass("test", genericTypes, clazz.getOffset().getLine(), helper.getClassPositionForGeneric(clazz.getOffset().getLine() - 1, input, clazz.getOffset().getStopIndex()), clazz.getOffset().getStopIndex(), clazz.getReturnType()));
+//                }
+//            }
+//
+//        }
 
         return methodsWithParametersLSPVariableList;
     }
@@ -76,10 +85,33 @@ public class ASTTransformationHelper {
             for (var param : method.getParameterList()) {
                 methodsWithParametersLSPVariableList.addAll(parameterToVariable(transferObj, param, method, ENABLE_GENERICS));
             }
+            methodsWithParametersLSPVariableList.addAll(lambdaExpressionToVariable(method.block.statements, transferObj));
         }
         return methodsWithParametersLSPVariableList;
     }
 
+
+    private List<LSPParameter> lambdaExpressionToVariable(List<Statement> statements, LanguageServerTransferObject transferObj) {
+        List<LSPParameter> methodsWithParametersLSPVariableList = new ArrayList<>();
+
+        for (var statement : statements) {
+
+            if (statement instanceof Assign assign) {
+
+                if (assign.rightSide instanceof LambdaExpression lambdaExpression)
+
+                    for (var param : lambdaExpression.params.getFormalparalist()) {
+                        var types = typeUtils.getAvailableTypes(transferObj.getResultSets(), param.getType());
+                        methodsWithParametersLSPVariableList.add(new LSPParameter("", types, param.getOffset().getLine(), param.getOffset().getCharPositionInLine(), param.getOffset().getStopIndex(), param.getType()));
+
+                    }
+
+            }
+        }
+
+        return methodsWithParametersLSPVariableList;
+    }
+
     private List<LSPMethod> methodToVariable(LanguageServerTransferObject transferObj, Method method, boolean ENABLE_GENERICS) {
         List<LSPMethod> methodsWithParametersLSPVariableList = new ArrayList<>();
 

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

@@ -5,7 +5,6 @@ import de.dhbw.service.TextDocumentService;
 import de.dhbw.model.LSPVariable;
 import de.dhbw.model.Type;
 import de.dhbwstuttgart.languageServerInterface.model.ParserError;
-import jdk.jshell.Diag;
 import org.eclipse.lsp4j.*;
 
 import java.util.ArrayList;
@@ -55,6 +54,23 @@ public class ConversionHelper {
         return diagnostic;
     }
 
+    public Diagnostic getDiagnosticWithInput(LSPVariable variable, String input, Type type) {
+        Range errorRange = new Range(
+                new Position(variable.getLine() - 1, variable.getCharPosition()),               // Startposition
+                new Position(variable.getLine() - 1, textHelper.getEndingCharOfStartingChar(variable.getLine() - 1, variable.getCharPosition(), input))    // Endposition
+        );
+        Diagnostic diagnostic = new Diagnostic(
+                errorRange,
+                //TODO: REMOVE! Temporary Fix because GTV, like TPH can be thrown away in the TypeResolver
+                type.getType().replaceAll("GTV ", ""),
+                DiagnosticSeverity.Hint,
+                "JavaTX Language Server"
+        );
+        diagnostic.setCode(type.isGeneric() ? "GENERIC" : "TYPE");
+
+        return diagnostic;
+    }
+
     public List<Diagnostic> parseErrorToDiagnostic(List<ParserError> parserErrors){
         return parserErrors.stream().map(el -> {
             Range errorRange = new Range(
@@ -85,6 +101,23 @@ public class ConversionHelper {
             }
         }
 
+        return new DiagnosticsAndTypehints(diagnostics, typeHint);
+    }
+    public DiagnosticsAndTypehints variablesToDiagnosticsAndTypehintsWithInput(ArrayList<LSPVariable> typesOfMethodAndParameters, String input){
+        List<InlayHint> typeHint = new ArrayList<>();
+        ArrayList<Diagnostic> diagnostics = new ArrayList<>();
+
+        for (var variable : typesOfMethodAndParameters) {
+
+            InlayHint inlayHint = getInlayHint(variable);
+            typeHint.add(inlayHint);
+
+            for (var type : variable.getPossibleTypes()) {
+                Diagnostic diagnostic = getDiagnosticWithInput(variable, input, type);
+                diagnostics.add(diagnostic);
+            }
+        }
+
         return new DiagnosticsAndTypehints(diagnostics, typeHint);
     }
 }

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

@@ -56,8 +56,10 @@ public class GenericUtils {
 
         genericsResult.forEach(conSet -> {
             if (method.getReturnType().toString().toLowerCase().contains("tph ")) {
+                if (conSet.resolveTarget(method.getReturnType()) != null && conSet.resolveTarget(method.getReturnType()).name() != null && conSet.resolveTarget(method.getReturnType()).name().contains("GTV")) {
                     genericTypes.add(conSet.resolveTarget(method.getReturnType()).name().replaceAll("GTV ", ""));
                 }
+            }
         });
 
 

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

@@ -2,8 +2,6 @@ package de.dhbw.helper;
 
 import org.apache.log4j.Logger;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class TextHelper {
@@ -59,7 +57,7 @@ public class TextHelper {
 
         if(lines.length < line){
             log.warn("Returning hardcoded Value because the requested Line [" + line + "] does not exist in Text Document.");
-            return startChar+3;
+            return startChar;
         }
 
         String[] linesInChar = lines[line].split("");

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

@@ -2,16 +2,27 @@ 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.syntaxtree.factory.NameGenerator;
+import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
+import de.dhbwstuttgart.target.generate.GenericsResult;
+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 org.eclipse.lsp4j.MessageParams;
-import org.eclipse.lsp4j.MessageType;
-import org.eclipse.lsp4j.services.LanguageClient;
 
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.*;
 
 
@@ -25,7 +36,17 @@ public class TypeResolver {
     private final TypeUtils typeUtils;
     private final GenericUtils genericUtils;
     private final DuplicationUtils duplicationUtils;
-    private final boolean ENABLE_GENERICS = false;
+    private final boolean ENABLE_GENERICS = true;
+    private List<GenericsResult> generatedGenerics = null;
+    private HashMap<String, List<TypeInsert>> inserts;
+
+
+    public HashMap<String, List<TypeInsert>> getInserts() {
+        return inserts;
+    }
+
+    //Somehow you have to reset to the Letter N to keep the naming of the TPHs consistent
+    private final String RESET_TO_LETTER = "A";
 
     private LanguageServerTransferObject current;
 
@@ -57,19 +78,115 @@ public class TypeResolver {
 
     public void getCompilerInput(String path, String input) throws IOException, URISyntaxException, ClassNotFoundException {
         LanguageServerInterface languageServer = new LanguageServerInterface();
-        var transferObj = languageServer.getResultSetAndAbstractSyntax(path, input);
+        var transferObj = languageServer.getResultSetAndAbastractSyntax(path, RESET_TO_LETTER);
         current = transferObj;
     }
 
     public LanguageServerTransferObject updateIfNotPresent(String path, String input) throws IOException, URISyntaxException, ClassNotFoundException {
         if (current == null) {
             LanguageServerInterface languageServer = new LanguageServerInterface();
-            LanguageServerTransferObject transferObj = languageServer.getResultSetAndAbstractSyntax(path, input);
+            LanguageServerTransferObject transferObj = languageServer.getResultSetAndAbstractSyntax(path);
             return transferObj;
         }
         return current;
     }
 
+    public ArrayList<LSPVariable> infereChangeInput(String pathString) throws IOException, ClassNotFoundException, URISyntaxException {
+        Set<TypeInsert> tips = new HashSet<>();
+
+        for (int i = 0; i < current.getResultSets().size(); i++) {
+            ResultSet tiResult = current.getResultSets().get(i);
+            tips.addAll(TypeInsertFactory.createTypeInsertPoints(current.getAst(), tiResult, generatedGenerics.get(i)));
+
+        }
+
+        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;
+    }
+
+    public ArrayList<LSPVariable> infereInput(String pathString, String input, boolean a) throws IOException, ClassNotFoundException, URISyntaxException {
+        System.setOut(new PrintStream(OutputStream.nullOutputStream()));
+
+        var uri = new URI(pathString);
+        var path = Path.of(uri);
+        var file = path.toFile();
+        NameGenerator.resetTo("A");
+        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);
+            logger.info("Path for Class-File is: " + path.getParent().resolve("out").toFile());
+            Files.createDirectories(path.getParent().resolve("out"));
+            compiler.writeClassFile(bytecode, path.getParent().resolve("out").toFile(), false);
+
+        }
+
+        generatedGenerics = compiler.getGeneratedGenerics().get(compiler.sourceFiles.get(file));
+        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)));
+        }
+        System.setOut(System.out);
+        this.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);
+            }
+        }
+
+        inserts = insertsOnLines;
+
+        insertsOnLines.forEach((key, value) -> value.forEach(type -> logger.info(type.insert(input))));
+
+        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.
      */
@@ -100,18 +217,47 @@ public class TypeResolver {
         return methodsWithParametersLSPVariableList;
     }
 
+    public ArrayList<LSPVariable> infereInput(String input, String path, SourceFile sourceFile) throws IOException, ClassNotFoundException, URISyntaxException {
+        logger.info("Infering Types for Input.");
+
+        current = updateIfNotPresent(path, input);
+        LanguageServerTransferObject transferObj = current;
+
+        transferObj = new LanguageServerTransferObject(transferObj.getResultSets(), sourceFile, "", transferObj.getGeneratedGenerics());
+
+
+        ArrayList<LSPVariable> methodsWithParametersLSPVariableList = new ArrayList<>();
+
+
+        methodsWithParametersLSPVariableList.addAll(astTransformationHelper.constructorToVariable(transferObj));
+        methodsWithParametersLSPVariableList.addAll(astTransformationHelper.fieldDeclToVariable(transferObj));
+
+
+        if (!transferObj.getResultSets().isEmpty()) {
+            //TODO: Hier noch irgendwie die Klasse rausfinden oder durchgehen.
+
+            if (ENABLE_GENERICS) {
+                methodsWithParametersLSPVariableList.addAll(astTransformationHelper.addGenericClassPosition(transferObj, input));
+            }
+
+            methodsWithParametersLSPVariableList.addAll(astTransformationHelper.methodsWithParameterToVariable(transferObj, ENABLE_GENERICS));
+        }
+
+        return methodsWithParametersLSPVariableList;
+    }
+
+
+    public void reduceCurrent(HashMap<LineCharPosition, String> combinedList, List<LSPVariable> variables) {
 
-    public void reduceCurrent(HashMap<LineCharPosition, String> combinedList, List<LSPVariable> variables, LanguageClient client) {
-        client.logMessage(new MessageParams(MessageType.Info, "Lenght is: " + combinedList.size()));
         for (var lines : combinedList.entrySet()) {
             var contentChange = lines.getValue();
             for (LSPVariable variable : variables) {
                 for (Type typeOfVariable : variable.getPossibleTypes()) {
-                    client.logMessage(new MessageParams(MessageType.Info, "\"" + typeOfVariable.getType() + " : " + variable.getLine() + "\"<          > \"" + contentChange + " : " + lines.getKey() + "\""));
+
                     if (typeOfVariable.getType().equalsIgnoreCase(contentChange.replaceAll(" ", ""))) {
                         if (variable.getLine() - 1 == lines.getKey().line && variable.getCharPosition() == lines.getKey().charPosition) {
                             current.getResultSets().removeIf(el -> !el.resolveType(variable.getOriginalTphName()).resolvedType.toString().equalsIgnoreCase(contentChange.replaceAll(" ", "")));
-                            client.logMessage(new MessageParams(MessageType.Info, "Removing Resultset"));
+
                             return;
                         }
                     }
@@ -119,4 +265,19 @@ public class TypeResolver {
             }
         }
     }
+
+    public SourceFile getNewAst(String uri) throws IOException, URISyntaxException, ClassNotFoundException {
+        LanguageServerInterface languageServerInterface = new LanguageServerInterface();
+        return languageServerInterface.getAst(uri, RESET_TO_LETTER);
+    }
+
+    public void updateAst(String uri) throws IOException, URISyntaxException, ClassNotFoundException {
+        logger.info("Old AST:");
+        logger.info(ASTPrinter.print(this.current.getAst()));
+        this.current = new LanguageServerTransferObject(current.getResultSets(), getNewAst(uri), "", current.getGeneratedGenerics());
+
+        logger.info("NEW AST:");
+        logger.info(ASTPrinter.print(current.getAst()));
+    }
+
 }

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

@@ -3,7 +3,6 @@ package de.dhbw.helper;
 import de.dhbw.model.Type;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.target.generate.GenericsResult;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 
 import java.util.ArrayList;

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;
+    }
 }

LanguageServer/src/main/java/de/dhbw/service/CacheService.java

@@ -4,6 +4,7 @@ import de.dhbw.helper.CodeSnippetOptions;
 import de.dhbw.helper.TextHelper;
 import de.dhbw.helper.TypeResolver;
 import de.dhbw.model.LSPVariable;
+import de.dhbwstuttgart.typedeployment.TypeInsert;
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.InlayHint;
 
@@ -14,6 +15,7 @@ import java.util.List;
 
 public class CacheService {
     private HashMap<String, List<InlayHint>> globalInlayHintMap = new HashMap<>();
+    private HashMap<String, String> lastSavedFiles = new HashMap<>();
     private Boolean currentlyCalculating = false;
     private HashMap<String, List<Diagnostic>> globalDiagnosticsMap = new HashMap<>();
     private HashMap<String, String> textDocuments = new HashMap<>();
@@ -24,6 +26,15 @@ public class CacheService {
     private Path fileRoot = null;
     private Boolean singleFileOpened = false;
     private List<LSPVariable> variables = new ArrayList<>();
+    private List<TypeInsert> typeInserts;
+
+    public List<TypeInsert> getTypeInserts() {
+        return typeInserts;
+    }
+
+    public void setTypeInserts(List<TypeInsert> typeInserts) {
+        this.typeInserts = typeInserts;
+    }
 
     public void updateGlobalMaps(List<Diagnostic> diagnostics, List<InlayHint> typeHint, String uri) {
         globalDiagnosticsMap.put(uri, diagnostics);
@@ -42,6 +53,14 @@ public class CacheService {
         return singleFileOpened;
     }
 
+    public HashMap<String, String> getLastSavedFiles() {
+        return lastSavedFiles;
+    }
+
+    public void setLastSavedFiles(HashMap<String, String> lastSavedFiles) {
+        this.lastSavedFiles = lastSavedFiles;
+    }
+
     public CodeSnippetOptions getCodeSnippetOptions() {
         return codeSnippetOptions;
     }

LanguageServer/src/main/java/de/dhbw/service/ParserService.java

@@ -1,14 +1,35 @@
 package de.dhbw.service;
 
+import de.dhbw.helper.ConversionHelper;
 import de.dhbwstuttgart.languageServerInterface.ParserInterface;
 import de.dhbwstuttgart.languageServerInterface.model.ParserError;
+import org.eclipse.lsp4j.Diagnostic;
 
 import java.util.List;
 
 public class ParserService {
 
+    private final ConversionHelper conversionHelper;
+    private final ClientService clientService;
+
+
+    public ParserService(ConversionHelper conversionHelper, ClientService clientService, CacheService cacheService) {
+        this.conversionHelper = conversionHelper;
+        this.clientService = clientService;
+    }
+
     public List<ParserError> getParserErrors(String input){
         ParserInterface parserInterface = new ParserInterface();
         return parserInterface.getParseErrors(input);
     }
+
+    public void checkParser(String input, String uri) {
+        List<Diagnostic> diagnosticsList = conversionHelper.parseErrorToDiagnostic(getParserErrors(input));
+        clientService.publishDiagnostics(uri, diagnosticsList);
+    }
+
+    public List<Diagnostic> getDiagnosticsOfErrors(String input, String uri) {
+        return conversionHelper.parseErrorToDiagnostic(getParserErrors(input));
+
+    }
 }

LanguageServer/src/test/java/CodeSnippetOptionsTest.java

@@ -1,6 +1,5 @@
 
 import de.dhbw.helper.CodeSnippetOptions;
-import de.dhbw.model.SnippetWithName;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;

LanguageServer/src/test/java/CompilerInterfaceTest.java

@@ -1,6 +1,7 @@
 
 import de.dhbw.helper.TextHelper;
 import de.dhbw.helper.TypeResolver;
+import de.dhbwstuttgart.languageServerInterface.LanguageServerInterface;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -49,18 +50,16 @@ public class CompilerInterfaceTest {
     }
 
     @Test
-    public void testConstraintTypes() throws IOException, ClassNotFoundException {
-//        LanguageServerInterface languageServer = new LanguageServerInterface();
-//        TypeResolver typeResolver = new TypeResolver();
-//
-//
-//        var res = typeResolver.infereInput("import java.lang.Integer; public class test{\n" +
-//                "    \n" +
-//                "    public main(testa){\n" +
-//                "   return testa;\n" +
-//                "    }\n" +
-//                "}");
-//        res.forEach(el -> el.getPossibleTypes().forEach(el2 -> System.out.println(el2.getType() + " " + (el2.isGeneric() ? "GENERIC" : "NO GENERIC"))));
+    public void testConstraintTypes() throws IOException, ClassNotFoundException, URISyntaxException {
+        LanguageServerInterface languageServer = new LanguageServerInterface();
+        TypeResolver typeResolver = new TypeResolver();
+
+
+        var res = languageServer.getResultSetAndAbstractSyntax("/home/ruben/Documents/JavaTXLanguageServer/test/test.jav");
+
+        var res2 = languageServer.getResultSetAndAbstractSyntax("/home/ruben/Documents/JavaTXLanguageServer/test/test.jav");
+
+        System.out.println("");
     }
 
     @Test

LanguageServer/src/test/java/JavaTXLanguageDocumentServiceTest.java

@@ -1,7 +1,3 @@
-import de.dhbw.JavaTXTextDocumentService;
-import de.dhbw.helper.CodeSnippetOptions;
-import org.eclipse.lsp4j.DidSaveTextDocumentParams;
-import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.junit.Ignore;
 import org.junit.jupiter.api.Test;
 

test/test.jav

@@ -0,0 +1,5 @@
+public class t{
+    public test(){
+        return 1;
+    }
+}