feat: also reset TPH Names when getting normal Interface Response

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

@@ -37,7 +37,6 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
     private final ChangeHandler changeHandler;
     private final TextHelper textHelper;
     private final CodeActionHandler codeActionHandler;
-    private final InlayHintAdjusterDiffUtils inlayHintAdjusterDiffUtils;
 
     LanguageClient client;
     HashMap<String, String> textDocuments = new HashMap<>();
@@ -48,7 +47,6 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
 
     public JavaTXTextDocumentService() {
         this.textHelper = new TextHelper();
-        this.inlayHintAdjusterDiffUtils = new InlayHintAdjusterDiffUtils();
         this.cacheService = new CacheService();
         this.clientService = new ClientService(null);
         this.typeResolver = new TypeResolver();
@@ -59,7 +57,7 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
         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, parserService);
-        this.changeHandler = new ChangeHandler(textDocumentService, parserService, conversionHelper, clientService, typeResolver, cacheService, logService, inlayHintAdjusterDiffUtils);
+        this.changeHandler = new ChangeHandler(textDocumentService, parserService, conversionHelper, clientService, typeResolver, cacheService, logService);
     }
 
     public void setClient(LanguageClient client) {

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

@@ -26,9 +26,8 @@ public class ChangeHandler {
     private final TypeResolver typeResolver;
     private final CacheService cacheService;
     private final LogService logService;
-    private final InlayHintAdjusterDiffUtils inlayHintAdjusterDiffUtils;
 
-    public ChangeHandler(TextDocumentService textDocumentService, ParserService parserService, ConversionHelper conversionHelper, ClientService clientService, TypeResolver typeResolver, CacheService cacheService, LogService logService, InlayHintAdjusterDiffUtils inlayHintAdjusterDiffUtils) {
+    public ChangeHandler(TextDocumentService textDocumentService, ParserService parserService, ConversionHelper conversionHelper, ClientService clientService, TypeResolver typeResolver, CacheService cacheService, LogService logService) {
         this.textDocumentService = textDocumentService;
         this.parserService = parserService;
         this.conversionHelper = conversionHelper;
@@ -36,7 +35,6 @@ public class ChangeHandler {
         this.typeResolver = typeResolver;
         this.cacheService = cacheService;
         this.logService = logService;
-        this.inlayHintAdjusterDiffUtils = inlayHintAdjusterDiffUtils;
     }
 
     public void didChange(DidChangeTextDocumentParams params) {
@@ -50,13 +48,11 @@ public class ChangeHandler {
         DocumentChanges documentChanges = textDocumentService.calculateDifference(currentText, summedUp.get());
         HashMap<LineCharPosition, String> preciseChanges = documentChanges.getPreciseChanges();
         HashMap<Integer, List<String>> textChanges;
-        ArrayList<Integer> offsetPerLine = documentChanges.getOffsetPerLine();
 
 
         //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());
+            DocumentChanges changesFromOldSave = textDocumentService.calculateDifference(cacheService.getLastSavedFiles().get(params.getTextDocument().getUri()), summedUp.get());;
-            offsetPerLine = changesFromOldSave.getOffsetPerLine();
             textChanges = changesFromOldSave.getTextChanges();
             preciseChanges = changesFromOldSave.getPreciseChanges();
             logService.log(textChanges.values().stream().map(el -> String.join(", ", el)).collect(Collectors.joining("\n")));
@@ -78,6 +74,7 @@ public class ChangeHandler {
             bw.write(summedUp.get());
             bw.close();
             typeResolver.updateAst(tempFile.toURI().getPath());
+            tempFile.delete();
         }catch (Exception e){
             logService.log(e.getMessage());
         }
@@ -147,31 +144,4 @@ public class ChangeHandler {
 
 
     }
-
-
-
-
-    private void updatePositions(DidChangeTextDocumentParams params, ArrayList<Integer> offsetPerLine, String old, String newText){
-        cacheService.getGlobalInlayHintMap().put(params.getTextDocument().getUri(), inlayHintAdjusterDiffUtils.adjustInlayHintsByLineDiff(old, newText, cacheService.getGlobalInlayHintMap().get(params.getTextDocument().getUri())));
-
-        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();
-    }
-
-    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/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 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/helper/PositionAdjustmentHelper.java

@@ -1,18 +0,0 @@
-package de.dhbw.helper;
-
-import de.dhbwstuttgart.syntaxtree.Method;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-import org.eclipse.lsp4j.InlayHint;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.List;
-
-public class PositionAdjustmentHelper {
-
-    private final TypeResolver typeResolver;
-
-    public PositionAdjustmentHelper(TypeResolver typeResolver) {
-        this.typeResolver = typeResolver;
-    }
-}

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

@@ -58,7 +58,7 @@ public class TypeResolver {
 
     public void getCompilerInput(String path, String input) throws IOException, URISyntaxException, ClassNotFoundException {
         LanguageServerInterface languageServer = new LanguageServerInterface();
-        var transferObj = languageServer.getResultSetAndAbstractSyntax(path);
+        var transferObj = languageServer.getResultSetAndAbastractSyntax(path, RESET_TO_LETTER);
         current = transferObj;
     }