feat: reduce Resultset when selecting a Type

Clients/VisualStudioCode/.vscodeignore

@@ -9,3 +9,7 @@ vsc-extension-quickstart.md
 **/*.map
 **/*.ts
 **/.vscode-test.*
+
+!JavaTXLanguageServer-1.0-SNAPSHOT-jar-with-dependencies.jar
+
+!JavaTXLanguageServer-1.0-SNAPSHOT-jar-with-dependencies.jar

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

@@ -5,6 +5,7 @@ import de.dhbw.helper.CodeSnippetOptions;
 import de.dhbw.helper.TextHelper;
 import de.dhbw.helper.TypeResolver;
 import de.dhbw.model.LSPVariable;
+import de.dhbw.model.LineCharPosition;
 import de.dhbw.model.SnippetWithName;
 import de.dhbw.model.Type;
 import de.dhbwstuttgart.languageServerInterface.LanguageServerInterface;
@@ -14,6 +15,7 @@ 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.jsonrpc.messages.Message;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.lsp4j.services.TextDocumentService;
 
@@ -26,6 +28,7 @@ import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
@@ -45,6 +48,8 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
     Boolean dontShowHints = false;
     TypeResolver typeResolver = new TypeResolver();
     Path fileRoot = null;
+    Boolean singleFileOpened = false;
+    List<LSPVariable> variables = new ArrayList<>();
 
     public void setClient(LanguageClient client) {
         this.client = client;
@@ -52,6 +57,9 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
 
     public void setFileRoot(List<WorkspaceFolder> root) {
 
+        if (root == null) {
+            singleFileOpened = true;
+        }
         //TODO: Nicht nur das erste Element nehmen sondern alle beachten
         fileRoot = Path.of(URI.create(root.get(0).getUri()));
     }
@@ -92,6 +100,68 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
         textDocuments.put(params.getTextDocument().getUri(), params.getTextDocument().getText());
     }
 
+
+    public ArrayList<String> difference(String first, String second) {
+        ArrayList<String> result = new ArrayList<>();
+
+        int i = 0, j = 0;
+        int startDiff = -1;
+
+        while (j < second.length()) {
+            if (i < first.length() && first.charAt(i) == second.charAt(j)) {
+                if (startDiff != -1) {
+                    result.add(second.substring(startDiff, j));
+                    startDiff = -1;
+                }
+                i++;
+                j++;
+            } else {
+                if (startDiff == -1) {
+                    startDiff = j;
+                }
+                j++;
+            }
+        }
+
+        if (startDiff != -1) {
+            result.add(second.substring(startDiff));
+        }
+
+        return result;
+    }
+
+    public Map<LineCharPosition, String> differenceLinePos(String first, String second, int line) {
+        Map<LineCharPosition, String> result = new HashMap<>();
+
+        int i = 0, j = 0;
+        int startDiff = -1;
+
+        while (j < second.length()) {
+            if (i < first.length() && first.charAt(i) == second.charAt(j)) {
+                if (startDiff != -1) {
+                    String diff = second.substring(startDiff, j);
+                    result.put(new LineCharPosition(line, startDiff), diff);
+                    startDiff = -1;
+                }
+                i++;
+                j++;
+            } else {
+                if (startDiff == -1) {
+                    startDiff = j;
+                }
+                j++;
+            }
+        }
+
+        if (startDiff != -1) {
+            String diff = second.substring(startDiff);
+            result.put(new LineCharPosition(line, startDiff), diff);
+        }
+
+        return result;
+    }
+
+
     /**
      * Handles didChange-Event.
      * updates textDocument-State on Server and run Syntax-Check. If an Error is found it will get displayed as a Diagnostic.
@@ -102,6 +172,35 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
     public void didChange(DidChangeTextDocumentParams params) {
         log("[didChange] Client triggered didChange Event.", MessageType.Info);
 
+
+        //TODO: Regenerate if Line-Count does not match -> Return new AST and see where the Positions are instead of calculating them from changes in Text-Document. Even possible?
+
+        String currentText = textDocuments.get(params.getTextDocument().getUri());
+        ArrayList<String> currentTextLines = new ArrayList<>(Arrays.stream(currentText.split("\n")).toList());
+        HashMap<LineCharPosition, String> preciseChanges = new HashMap<>();
+        String newText = params.getContentChanges().getFirst().getText();
+        ArrayList<String> newTextLines = new ArrayList<>(Arrays.stream(newText.split("\n")).toList());
+
+        ArrayList<Integer> offsetPerLine = new ArrayList<>();
+        HashMap<Integer, List<String>> textChanges = new HashMap<>();
+        int index = 0;
+        for (String newTextLine : newTextLines) {
+            if (!(currentTextLines.size() > index)) {
+                offsetPerLine.add(0);
+            } else {
+
+
+                Map<LineCharPosition, String> lineDiffs = differenceLinePos(currentTextLines.get(index), newTextLine, index);
+                preciseChanges.putAll(lineDiffs);
+
+                textChanges.put(index, difference(currentTextLines.get(index), newTextLine).stream().map(el -> el.replaceAll(" ", "")).toList());
+                offsetPerLine.add(newTextLine.length() - currentTextLines.get(index).length());
+            }
+
+            index++;
+        }
+
+
         AtomicReference<String> summedUp = new AtomicReference<>("");
         params.getContentChanges().forEach(el -> summedUp.set(summedUp.get() + el.getText()));
         textDocuments.put(params.getTextDocument().getUri(), summedUp.get());
@@ -112,7 +211,7 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
 
         List<ParserError> parserErrors = parserInterface.getParseErrors(input);
 
-        List<Diagnostic> diagnostics = parserErrors.stream().map(el -> {
+        List<Diagnostic> diagnosticsList = parserErrors.stream().map(el -> {
             Range errorRange = new Range(
                     new Position(el.getLine() - 1, el.getCharPositionInLine()),        // Startposition
                     new Position(el.getLine() - 1, el.getEndCharPosition())            // Endposition
@@ -126,9 +225,89 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
         }).toList();
 
 
-        PublishDiagnosticsParams diagnosticsParams = new PublishDiagnosticsParams(params.getTextDocument().getUri(), diagnostics);
-        client.publishDiagnostics(diagnosticsParams);
+//        PublishDiagnosticsParams diagnosticsParams = new PublishDiagnosticsParams(params.getTextDocument().getUri(), diagnostics);
+//        client.publishDiagnostics(diagnosticsParams);
 
+
+        List<String> combinedList = new ArrayList<>();
+
+        for (List<String> list : textChanges.values()) {
+            combinedList.addAll(list);
+        }
+
+        typeResolver.reduceCurrent(preciseChanges, variables, client);
+        //Reduce and display Typehints and Diagnostics
+
+        if (!currentlyCalculating) {
+            currentlyCalculating = true;
+
+            ArrayList<Diagnostic> diagnostics = new ArrayList<>();
+            var sWatch = Stopwatch.createUnstarted();
+            sWatch.start();
+
+            try {
+                if (textDocuments.get(params.getTextDocument().getUri()) == null) {
+                    log("[didSave] Input of Text Document is null in TextDocument-Hashmap.", MessageType.Error);
+                }
+                ArrayList<LSPVariable> typesOfMethodAndParameters = typeResolver.infereInput(textDocuments.get(params.getTextDocument().getUri()), params.getTextDocument().getUri());
+
+                List<InlayHint> typeHint = new ArrayList<>();
+
+                for (var variable : typesOfMethodAndParameters) {
+
+                    InlayHint inlayHint = getInlayHint(variable);
+                    typeHint.add(inlayHint);
+
+
+                    //Diagnostics of Types
+                    for (var type : variable.getPossibleTypes()) {
+                        Diagnostic diagnostic = getDiagnostic(variable, params.getTextDocument().getUri(), type);
+                        diagnostics.add(diagnostic);
+                    }
+                }
+
+                updateGlobalMaps(diagnostics, typeHint, params.getTextDocument().getUri());
+
+
+            } catch (Exception e) {
+                log("[didSave] Error trying to get Inlay-Hints and Diagnostics for Client: " + e.getMessage(), MessageType.Error);
+                client.showMessage(new MessageParams(MessageType.Error, e.getMessage()));
+                updateGlobalMaps(new ArrayList<>(), new ArrayList<>(), params.getTextDocument().getUri());
+
+            } finally {
+                currentlyCalculating = false;
+                sWatch.stop();
+                log("[didSave] Finished Calculating in [" + sWatch.elapsed().toSeconds() + "s]", MessageType.Info);
+            }
+        }
+
+        for (var inlayHint : globalInlayHintMap.get(params.getTextDocument().getUri())) {
+            inlayHint.getPosition().setCharacter(inlayHint.getPosition().getCharacter() + offsetPerLine.get(inlayHint.getPosition().getLine()));
+        }
+
+        for (var inlayHint : globalDiagnosticsMap.get(params.getTextDocument().getUri())) {
+            inlayHint.getRange().getStart().setCharacter(inlayHint.getRange().getStart().getCharacter() + offsetPerLine.get(inlayHint.getRange().getStart().getLine()));
+            inlayHint.getRange().getEnd().setCharacter(inlayHint.getRange().getEnd().getCharacter() + offsetPerLine.get(inlayHint.getRange().getEnd().getLine()));
+        }
+
+        for (var textChangeLine : textChanges.entrySet()) {
+            log(textChangeLine.getKey() + " - " + String.join(",", textChangeLine.getValue()), MessageType.Info);
+        }
+
+
+        globalInlayHintMap.put(params.getTextDocument().getUri(), globalInlayHintMap.get(params.getTextDocument().getUri()).stream().filter(el -> {
+            //TODO: Hier das Label aufspalten an | weil die Typehints immer mit und getrennt sind und so jeder Typhint für sich durchlaufen werden kann.
+            log(el.getLabel().getLeft().replaceAll(" ", "") + "<>" + String.join(",", textChanges.get(el.getPosition().getLine())) + ": " + (!textChanges.get(el.getPosition().getLine()).contains(el.getLabel().getLeft().replaceAll(" ", "")) ? "true" : "false"), MessageType.Info);
+            return !textChanges.get(el.getPosition().getLine()).contains(el.getLabel().getLeft().replaceAll(" ", ""));
+        }).toList());
+
+        globalDiagnosticsMap.put(params.getTextDocument().getUri(), globalDiagnosticsMap.get(params.getTextDocument().getUri()).stream().filter(el -> {
+            log(el.getMessage().replaceAll(" ", "") + "<>" + String.join(",", textChanges.get(el.getRange().getStart().getLine())) + ": " + (!textChanges.get(el.getRange().getStart().getLine()).contains(el.getMessage().replaceAll(" ", "")) ? "true" : "false"), MessageType.Info);
+            return !textChanges.get(el.getRange().getStart().getLine()).contains(el.getMessage().replaceAll(" ", ""));
+        }).toList());
+
+        updateClient(client);
+        client.publishDiagnostics(new PublishDiagnosticsParams(params.getTextDocument().getUri(), globalDiagnosticsMap.get(params.getTextDocument().getUri())));
     }
 
     /**
@@ -245,8 +424,6 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
 
         startLoading("compile-task", "Inferring types...", client);
 
-        LanguageServerInterface languageServerInterface = new LanguageServerInterface();
-
         if (!currentlyCalculating) {
             currentlyCalculating = true;
 
@@ -255,12 +432,13 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
             sWatch.start();
 
             try {
-
+                typeResolver.getCompilerInput(didSaveTextDocumentParams.getTextDocument().getUri(), textDocuments.get(didSaveTextDocumentParams.getTextDocument().getUri()));
                 if (textDocuments.get(didSaveTextDocumentParams.getTextDocument().getUri()) == null) {
                     log("[didSave] Input of Text Document is null in TextDocument-Hashmap.", MessageType.Error);
                 }
                 ArrayList<LSPVariable> typesOfMethodAndParameters = typeResolver.infereInput(textDocuments.get(didSaveTextDocumentParams.getTextDocument().getUri()), didSaveTextDocumentParams.getTextDocument().getUri());
 
+                variables = typesOfMethodAndParameters;
                 List<InlayHint> typeHint = new ArrayList<>();
 
                 for (var variable : typesOfMethodAndParameters) {
@@ -303,12 +481,14 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
 
         ArrayList<File> files = new ArrayList<>();
 
+        if (fileRoot != null) {
             try (Stream<Path> stream = Files.walk(Paths.get(fileRoot.toUri()))) {
                 stream.filter(Files::isRegularFile)
                         .forEach(el -> files.add(el.toFile()));
             } catch (IOException e) {
             }
         }
+    }
 
     @Override
     public CompletableFuture<List<InlayHint>> inlayHint(InlayHintParams params) {
@@ -445,7 +625,11 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
 
     @Override
     public CompletableFuture<List<Either<Command, CodeAction>>> codeAction(CodeActionParams params) {
+
         log("[codeAction] Client requested Insert at Line [" + params.getRange().getStart().getLine() + "] and from Char [" + params.getRange().getStart().getCharacter() + "] to [" + params.getRange().getEnd().getCharacter() + "].", MessageType.Info);
+
+        log("Code-Action Context was: " + params.getContext().getTriggerKind().name(), MessageType.Info);
+
         List<Either<Command, CodeAction>> actions = new ArrayList<>();
 
 
@@ -457,6 +641,8 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
                 .filter(diagnostic -> rangesOverlap(diagnostic.getRange(), requestedRange)).toList();
 
         Range rangeOfInsert = params.getRange();
+
+
         String documentUri = params.getTextDocument().getUri();
 
 
@@ -519,8 +705,6 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
             }
         }
 
-
-        dontShowHints = true;
         return CompletableFuture.supplyAsync(() -> {
             return actions;
         });

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

@@ -12,11 +12,15 @@ import de.dhbwstuttgart.target.generate.GenericsResult;
 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.Range;
+import org.eclipse.lsp4j.TextDocumentContentChangeEvent;
+import org.eclipse.lsp4j.services.LanguageClient;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 
@@ -29,6 +33,17 @@ public class TypeResolver {
 
     private static final Logger logger = LogManager.getLogger(TypeResolver.class);
 
+    private final boolean ENABLE_GENERICS = false;
+
+    private LanguageServerTransferObject current;
+
+    public LanguageServerTransferObject getCurrent() {
+        return current;
+    }
+
+    public void reduceCurrent() {
+        current.getResultSets().removeFirst();
+    }
 
     private List<ResultSet> currentResults = new ArrayList<>();
 
@@ -186,18 +201,35 @@ public class TypeResolver {
         return genericTypes;
     }
 
+    public void getCompilerInput(String path, String input) throws IOException, URISyntaxException, ClassNotFoundException {
+        LanguageServerInterface languageServer = new LanguageServerInterface();
+        var transferObj = languageServer.getResultSetAndAbstractSyntax(path, input);
+        current = transferObj;
+    }
+
     /**
      * Zum Erhalt für sowohl Parameter als auch Methoden.
      */
     public ArrayList<LSPVariable> infereInput(String input, String path) throws IOException, ClassNotFoundException, URISyntaxException {
         logger.info("Infering Types for Input.");
 
+        LanguageServerTransferObject transferObj;
+
+        if (current == null) {
             LanguageServerInterface languageServer = new LanguageServerInterface();
-        var transferObj = languageServer.getResultSetAndAbstractSyntax(path, input);
+            transferObj = languageServer.getResultSetAndAbstractSyntax(path, input);
+            current = transferObj;
+        } else {
+            transferObj = current;
+        }
+
         ArrayList<LSPVariable> methodsWithParametersLSPVariableList = new ArrayList<>();
 
 
+        if (!transferObj.getResultSets().isEmpty()) {
             //TODO: Hier noch irgendwie die Klasse rausfinden oder durchgehen.
+
+            if (ENABLE_GENERICS) {
                 //GENERICS OF CLASS
                 for (var method : transferObj.getAst().getAllMethods()) {
 
@@ -206,25 +238,30 @@ public class TypeResolver {
                         ArrayList<Type> genericTypes = getClassGenerics(transferObj.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()));
+                            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 : transferObj.getAst().getAllMethods()) {
                 var types = getAvailableTypes(transferObj.getResultSets(), method);
                 var generics = getAvailableGenericTypes(transferObj.getGeneratedGenerics().values().stream().flatMap(List::stream).collect(Collectors.toList()), method);
 
                 if (!filterOutDuplicates(types).isEmpty()) {
-                methodsWithParametersLSPVariableList.add(new LSPMethod(method.name, filterOutDuplicates(types), method.getOffset().getLine(), method.getOffset().getCharPositionInLine(), method.getOffset().getStopIndex()));
+                    methodsWithParametersLSPVariableList.add(new LSPMethod(method.name, filterOutDuplicates(types), method.getOffset().getLine(), method.getOffset().getCharPositionInLine(), method.getOffset().getStopIndex(), method.getReturnType()));
                 }
+
+                if (ENABLE_GENERICS) {
                     if (!generics.isEmpty()) {
                         ArrayList<Type> typesThatAreGeneric = filterOutDuplicates(generics, types);
                         typesThatAreGeneric.forEach(el -> el.setType("<" + el.getType() + "> " + el.getType()));
                         //TODO: Muss Global und wird mehrmals so gemacht. Das if hier ist eigentlich falsch wegen unnötiger Berechnungszeit
                         if (!filterOutDuplicates(typesThatAreGeneric).isEmpty()) {
-                    methodsWithParametersLSPVariableList.add(new LSPMethod(method.name, filterOutDuplicates(typesThatAreGeneric), method.getOffset().getLine(), method.getOffset().getCharPositionInLine(), method.getOffset().getStopIndex()));
+                            methodsWithParametersLSPVariableList.add(new LSPMethod(method.name, filterOutDuplicates(typesThatAreGeneric), method.getOffset().getLine(), method.getOffset().getCharPositionInLine(), method.getOffset().getStopIndex(), method.getReturnType()));
+                        }
                     }
                 }
 
@@ -233,16 +270,19 @@ public class TypeResolver {
                     ArrayList<Type> genericParam = getAvailableGenericTypes(transferObj.getGeneratedGenerics().values().stream().flatMap(List::stream).collect(Collectors.toList()), param.getType());
 
                     if (!typeParam.isEmpty()) {
-                    methodsWithParametersLSPVariableList.add(new LSPParameter(method.name, filterOutDuplicates(typeParam), param.getOffset().getLine(), param.getOffset().getCharPositionInLine(), param.getOffset().getStopIndex()));
+                        methodsWithParametersLSPVariableList.add(new LSPParameter(method.name, filterOutDuplicates(typeParam), param.getOffset().getLine(), param.getOffset().getCharPositionInLine(), param.getOffset().getStopIndex(), param.getType()));
                     }
 
+                    if (ENABLE_GENERICS) {
                         if (!genericParam.isEmpty()) {
                             ArrayList<Type> typesThatAreGeneric = filterOutDuplicates(genericParam, typeParam);
 
 
                             if (!filterOutDuplicates(typesThatAreGeneric).isEmpty()) {
-                        methodsWithParametersLSPVariableList.add(new LSPParameter(method.name, filterOutDuplicates(typesThatAreGeneric), method.getOffset().getLine(), param.getOffset().getCharPositionInLine(), param.getOffset().getStopIndex()));
-                        methodsWithParametersLSPVariableList.add(new LSPParameter(method.name, new ArrayList<>(filterOutDuplicates(typesThatAreGeneric).stream().map(el -> new Type("<" + el.getType() + ">", true)).toList()), method.getOffset().getLine(), method.getOffset().getCharPositionInLine(), method.getOffset().getStopIndex()));
+                                methodsWithParametersLSPVariableList.add(new LSPParameter(method.name, filterOutDuplicates(typesThatAreGeneric), method.getOffset().getLine(), param.getOffset().getCharPositionInLine(), param.getOffset().getStopIndex(), param.getType()));
+                                methodsWithParametersLSPVariableList.add(new LSPParameter(method.name, new ArrayList<>(filterOutDuplicates(typesThatAreGeneric).stream().map(el -> new Type("<" + el.getType() + ">", true)).toList()), method.getOffset().getLine(), method.getOffset().getCharPositionInLine(), method.getOffset().getStopIndex(), method.getReturnType()));
+                            }
+                        }
                     }
                 }
             }
@@ -252,4 +292,22 @@ public class TypeResolver {
     }
 
 
+    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;
+                        }
+                    }
+                }
+            }
+        }
+    }
 }

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

@@ -1,9 +1,11 @@
 package de.dhbw.model;
 
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+
 import java.util.ArrayList;
 
 public class LSPClass extends LSPVariable{
-    public LSPClass(String name, ArrayList<Type> possibleTypes, int line, int charPosition, int endPosition) {
-        super(name, possibleTypes, line, charPosition, endPosition);
+    public LSPClass(String name, ArrayList<Type> possibleTypes, int line, int charPosition, int endPosition, RefTypeOrTPHOrWildcardOrGeneric originalTphName) {
+        super(name, possibleTypes, line, charPosition, endPosition, originalTphName);
     }
 }

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

@@ -1,9 +1,11 @@
 package de.dhbw.model;
 
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+
 import java.util.ArrayList;
 
 public class LSPMethod extends LSPVariable {
-    public LSPMethod(String name, ArrayList<Type> type, int line, int charPosition, int endPosition) {
-        super(name, type, line, charPosition, endPosition);
+    public LSPMethod(String name, ArrayList<Type> type, int line, int charPosition, int endPosition, RefTypeOrTPHOrWildcardOrGeneric originalTphName) {
+        super(name, type, line, charPosition, endPosition, originalTphName);
     }
 }

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

@@ -1,10 +1,12 @@
 package de.dhbw.model;
 
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+
 import java.util.ArrayList;
 
-public class LSPParameter extends LSPMethod {
+public class LSPParameter extends LSPVariable {
 
-    public LSPParameter(String name, ArrayList<Type> type, int line, int charPosition, int endPosition) {
-        super(name, type, line, charPosition, endPosition);
+    public LSPParameter(String name, ArrayList<Type> type, int line, int charPosition, int endPosition, RefTypeOrTPHOrWildcardOrGeneric originalTphName) {
+        super(name, type, line, charPosition, endPosition, originalTphName);
     }
 }

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

@@ -1,20 +1,33 @@
 package de.dhbw.model;
 
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+
 import java.util.ArrayList;
 
-public class LSPVariable {    String name;
+public class LSPVariable {
+    String name;
     ArrayList<Type> possibleTypes;
     int line;
     int charPosition;
     int endPosition;
     boolean needsInference;
+    RefTypeOrTPHOrWildcardOrGeneric originalTphName;
 
-    public LSPVariable(String name, ArrayList<Type> possibleTypes, int line, int charPosition, int endPosition) {
+    public LSPVariable(String name, ArrayList<Type> possibleTypes, int line, int charPosition, int endPosition, RefTypeOrTPHOrWildcardOrGeneric originalTphName) {
         this.name = name;
         this.possibleTypes = possibleTypes;
         this.line = line;
         this.charPosition = charPosition;
         this.endPosition = endPosition;
+        this.originalTphName = originalTphName;
+    }
+
+    public RefTypeOrTPHOrWildcardOrGeneric getOriginalTphName() {
+        return originalTphName;
+    }
+
+    public void setOriginalTphName(RefTypeOrTPHOrWildcardOrGeneric originalTphName) {
+        this.originalTphName = originalTphName;
     }
 
     public int getEndPosition() {

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

@@ -0,0 +1,25 @@
+package de.dhbw.model;
+
+public class LineCharPosition {
+    public final int line;
+    public final int charPosition;
+
+    public LineCharPosition(int line, int charPosition) {
+        this.line = line;
+        this.charPosition = charPosition;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof LineCharPosition)) return false;
+        LineCharPosition that = (LineCharPosition) o;
+        return line == that.line && charPosition == that.charPosition;
+    }
+
+
+    @Override
+    public String toString() {
+        return "Line " + line + ", Char " + charPosition;
+    }
+}

LanguageServer/src/test/java/CompilerInterfaceTest.java

@@ -1,30 +1,39 @@
 
 import de.dhbw.helper.TextHelper;
 import de.dhbw.helper.TypeResolver;
-import de.dhbwstuttgart.languageServerInterface.LanguageServerInterface;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.util.ArrayList;
+import java.net.URISyntaxException;
 
 public class CompilerInterfaceTest {
 
     @Test
-    public void testAbstractSyntaxAsString() throws IOException, ClassNotFoundException {
-//        LanguageServerInterface languageServer = new LanguageServerInterface();
-//        var res = languageServer.getResultSetAndAbstractSyntax("import java.lang.Integer;\n import java.lang.String;\n" +
-//                "public class test{\n" +
-//                "public main(test){" +
-//                "if(0>1){" +
-//                "return \"w\";" +
-//                "}" +
-//                "Integer i = 0;" +
-//                "return i;" +
-//                "}" +
-//                "}", "TEST");
-//
-//        System.out.println("TEST OUTPUT:");
+    public void testAbstractSyntaxAsString() throws IOException, ClassNotFoundException, URISyntaxException {
+        TypeResolver typeResolver = new TypeResolver();
+        var res = typeResolver.infereInput("import java.lang.Integer;\n import java.lang.String;\n" +
+                "public class test{\n" +
+                "public main(test){" +
+                "if(0>1){" +
+                "return \"w\";" +
+                "}" +
+                "Integer i = 0;" +
+                "return i;" +
+                "}" +
+                "}", "c%3A/Users/ruben/Neuer%20Ordner%20%282%29/LSP-Vortrag/images/test.jav");
+
+        var res2 = typeResolver.infereInput("import java.lang.Integer;\n import java.lang.String;\n" +
+                "public class test{\n" +
+                "public main(test){" +
+                "if(0>1){" +
+                "return \"w\";" +
+                "}" +
+                "Integer i = 0;" +
+                "return i;" +
+                "}" +
+                "}", "c%3A/Users/ruben/Neuer%20Ordner%20%282%29/LSP-Vortrag/images/test.jav");
+        System.out.println("TEST OUTPUT:");
 //
 //        ArrayList<String> allTypes = new ArrayList<>();
 //
@@ -114,7 +123,7 @@ public class CompilerInterfaceTest {
     @Test
     public void testCharEnding() throws IOException, ClassNotFoundException {
         TextHelper textHelper = new TextHelper();
-        var endingChar = textHelper.getEndingCharOfStartingChar(3,13,"import java.lang.Integer;\n" +
+        var endingChar = textHelper.getEndingCharOfStartingChar(3, 13, "import java.lang.Integer;\n" +
                 "import java.lang.String; \n" +
                 "public class test{\n" +
                 "    public main(test, test2){\n" +

LanguageServer/src/test/java/JavaTXLanguageDocumentServiceTest.java

@@ -11,6 +11,7 @@ public class JavaTXLanguageDocumentServiceTest {
     @Test
     @Ignore
     public void testWordExtraction() {
-        JavaTXTextDocumentService service = new JavaTXTextDocumentService();
+//        JavaTXTextDocumentService service = new JavaTXTextDocumentService();
+//         service.didSave(new DidSaveTextDocumentParams(new TextDocumentIdentifier("file:///c%3A/Users/ruben/Neuer%20Ordner%20%282%29/LSP-Vortrag/images/test.jav")));
     }
 }