feat: infere Lambdas in Methods

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/JavaTXTextDocumentService.java

@@ -1,12 +1,9 @@
 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;
@@ -42,6 +39,7 @@ 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<>();
@@ -52,7 +50,7 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
 
     public JavaTXTextDocumentService() {
         this.textHelper = new TextHelper();
-        this.parserService = new ParserService();
+        this.inlayHintAdjusterDiffUtils = new InlayHintAdjusterDiffUtils();
         this.cacheService = new CacheService();
         this.clientService = new ClientService(null);
         this.typeResolver = new TypeResolver();
@@ -60,9 +58,10 @@ 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.changeHandler = new ChangeHandler(textDocumentService, parserService, conversionHelper, clientService, typeResolver, cacheService, logService);
+        this.saveHandler = new SaveHandler(typeResolver, textDocumentService, logService, cacheService, conversionHelper, clientService, parserService);
+        this.changeHandler = new ChangeHandler(textDocumentService, parserService, conversionHelper, clientService, typeResolver, cacheService, logService, inlayHintAdjusterDiffUtils);
     }
 
     public void setClient(LanguageClient client) {

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

@@ -23,8 +23,9 @@ 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) {
+    public ChangeHandler(TextDocumentService textDocumentService, ParserService parserService, ConversionHelper conversionHelper, ClientService clientService, TypeResolver typeResolver, CacheService cacheService, LogService logService, InlayHintAdjusterDiffUtils inlayHintAdjusterDiffUtils) {
         this.textDocumentService = textDocumentService;
         this.parserService = parserService;
         this.conversionHelper = conversionHelper;
@@ -32,6 +33,7 @@ public class ChangeHandler {
         this.typeResolver = typeResolver;
         this.cacheService = cacheService;
         this.logService = logService;
+        this.inlayHintAdjusterDiffUtils = inlayHintAdjusterDiffUtils;
     }
 
     public void didChange(DidChangeTextDocumentParams params) {
@@ -62,7 +64,6 @@ public class ChangeHandler {
 
         String input = summedUp.get();
 
-        checkParser(input, params.getTextDocument().getUri());
 
         typeResolver.reduceCurrent(preciseChanges, cacheService.getVariables());
 
@@ -74,7 +75,7 @@ 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());
@@ -90,13 +91,18 @@ 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);
         }
 
 
@@ -114,13 +120,29 @@ 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);
+
 
     }
 
-    private void checkParser(String input, String uri) {
-        List<Diagnostic> diagnosticsList = conversionHelper.parseErrorToDiagnostic(parserService.getParserErrors(input));
-        clientService.publishDiagnostics(uri, diagnosticsList);
+
+
+
+    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){

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

@@ -60,7 +60,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

@@ -14,7 +14,7 @@ import java.util.List;
 
 public class InlayHintAdjusterDiffUtils {
 
-    public static List<InlayHint> adjustInlayHintsByLineDiff(String oldText, String newText, List<InlayHint> oldHints) {
+    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));
 

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

@@ -2,10 +2,7 @@ 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;
@@ -22,14 +19,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) {
@@ -56,7 +55,11 @@ 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);
 
 
         } catch (Exception e) {

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/GenericUtils.java

@@ -56,7 +56,9 @@ public class GenericUtils {
 
         genericsResult.forEach(conSet -> {
             if (method.getReturnType().toString().toLowerCase().contains("tph ")) {
-                genericTypes.add(conSet.resolveTarget(method.getReturnType()).name().replaceAll("GTV ", ""));
+                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/TypeResolver.java

@@ -25,7 +25,7 @@ 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 LanguageServerTransferObject current;
 

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