Update README.md

Clients/VisualStudioCode/package.json

@@ -3,7 +3,7 @@
   "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.9",
+  "version": "0.0.14",
   "engines": {
     "vscode": "^1.94.0"
   },

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

@@ -80,6 +80,8 @@ public class ChangeHandler {
 
         if (!syntaxErrors.isEmpty()) {
             clientService.publishDiagnostics(params.getTextDocument().getUri(), syntaxErrors);
+        }else {
+            clientService.updateClient();
         }
         logService.log("Found [" + syntaxErrors.size() + "] Syntax Errors in Document.");
 
@@ -164,7 +166,7 @@ public class ChangeHandler {
                         bw.close();
 
                         try {
-                            ArrayList<LSPVariable> variables = typeResolver.infereInput(tempFile2.toURI().toString(), input, true);
+                            ArrayList<LSPVariable> variables = typeResolver.infereInput(tempFile2.toURI().toString(), input);
                             cacheService.setVariables(variables);
 
                             DiagnosticsAndTypehints diagnosticsAndTypehints = conversionHelper.variablesToDiagnosticsAndTypehintsWithInput(variables, input);
@@ -175,10 +177,9 @@ public class ChangeHandler {
                             cacheService.updateGlobalMaps(diagnostics, typeHint, params.getTextDocument().getUri());
 
                             List<Diagnostic> allDiagnostics = new ArrayList<>(diagnostics);
-                            allDiagnostics.addAll(parserService.getDiagnosticsOfErrors(input, params.getTextDocument().getUri()));
 
                             clientService.publishDiagnostics(params.getTextDocument().getUri(), allDiagnostics);
-                        } catch (Exception f) {
+                        } catch (Exception | VerifyError f) {
                             logService.log("[didSave] Error trying to get Inlay-Hints and Diagnostics for Client: " + f.getMessage(), MessageType.Error);
 
                             for (StackTraceElement elem : f.getStackTrace()) {
@@ -190,10 +191,6 @@ public class ChangeHandler {
                         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());
 

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

@@ -105,43 +105,50 @@ public class CodeActionHandler {
         String documentUri = params.getTextDocument().getUri();
         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
+        if (typeResolver.getInserts() != null) {
-        Map<String, List<PlaceholderVariable>> typeInsertsOverlapping = getOverlapping(typeResolver.getInserts(), rangeOfInsert.getStart().getLine() + 1, rangeOfInsert.getStart().getCharacter(), rangeOfInsert.getEnd().getCharacter());
+            //All Diagnostics that are in range of the hover -> All Diagnostics of the selected Variable and thus all Types of the Variable
-        logService.log("Inserts are:");
+            Map<String, List<PlaceholderVariable>> typeInsertsOverlapping = getOverlapping(typeResolver.getInserts(), rangeOfInsert.getStart().getLine() + 1, rangeOfInsert.getStart().getCharacter(), rangeOfInsert.getEnd().getCharacter());
-        typeResolver.getInserts().forEach((key, value) -> logService.log(key));
+            logService.log("Inserts are:");
-        logService.log("Size is: " + typeInsertsOverlapping.size());
+            typeResolver.getInserts().forEach((key, value) -> logService.log(key));
-        logService.log("Range is: " + rangeOfInsert.getStart().getLine() + " -> " + rangeOfInsert.getStart().getCharacter() + " - " + rangeOfInsert.getEnd().getCharacter());
+            logService.log("Size is: " + typeInsertsOverlapping.size());
-        List<Either<Command, CodeAction>> actions = new ArrayList<>();
+            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 typeInsertList : typeInsertsOverlapping.values()) {
-            for (var typeInsert : typeInsertList) {
+                for (var typeInsert : typeInsertList) {
-                try {
+                    try {
-                    logService.log("NEW TEXT OF FILE BEFORE INSERT IS:");
+                        logService.log("NEW TEXT OF FILE BEFORE INSERT IS:");
-                    logService.log(textDocumentService.getFileOfUri(documentUri));
+                        logService.log(textDocumentService.getFileOfUri(documentUri));
-                    String typeWithReplacedVariable = typeInsert.insert(textDocumentService.getFileOfUri(documentUri));
+                        String typeWithReplacedVariable = typeInsert.insert(textDocumentService.getFileOfUri(documentUri));
 
-                    ArrayList<TextEdit> listOfChanges = new ArrayList<>();
+                        ArrayList<TextEdit> listOfChanges = new ArrayList<>();
 
-                    listOfChanges.add(new TextEdit(wholeDocumentRange(textDocumentService.getFileOfUri(documentUri)), typeWithReplacedVariable));
+                        listOfChanges.add(new TextEdit(wholeDocumentRange(textDocumentService.getFileOfUri(documentUri)), typeWithReplacedVariable));
 
-                    var isTypeImported = false;
+                        var isTypeImported = false;
 
-                    Map<String, List<TextEdit>> changes = new HashMap<>();
+                        Map<String, List<TextEdit>> changes = new HashMap<>();
-                    changes.put(documentUri, listOfChanges);
+                        changes.put(documentUri, listOfChanges);
 
-                    WorkspaceEdit edit = new WorkspaceEdit();
+                        WorkspaceEdit edit = new WorkspaceEdit();
-                    edit.setChanges(changes);
+                        edit.setChanges(changes);
 
-                    CodeAction action = new CodeAction("Insert " + conversionHelper.cleanType(typeInsert.getInsertString()));
+                        CodeAction action = new CodeAction("Insert " + conversionHelper.cleanType(typeInsert.getInsertString()));
-                    action.setKind(CodeActionKind.QuickFix);
+                        action.setKind(CodeActionKind.QuickFix);
-                    action.setEdit(edit);
+                        action.setEdit(edit);
-                    actions.add(Either.forRight(action));
+
-                } catch (Exception e) {
+                        if(!actions.stream().map(el -> el.getRight().getTitle()).toList().contains(action.getTitle())){
-                    logService.log("Error creating Actions, returning empty List. The Error was: " + e.getMessage(), MessageType.Error);
+                            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;
         }
-        return actions;
+
+        return new ArrayList<>();
     }
 
     public List<Either<Command, CodeAction>> handleCodeAction(CodeActionParams params) {

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

@@ -1,6 +1,7 @@
 package de.dhbw.handler;
 
 import com.google.common.base.Stopwatch;
+import com.google.common.base.Verify;
 import de.dhbw.model.DiagnosticsAndTypehints;
 import de.dhbw.service.*;
 import de.dhbw.helper.ConversionHelper;
@@ -51,19 +52,20 @@ public class SaveHandler {
             List<Diagnostic> syntaxErrors = parserService.getDiagnosticsOfErrors(fileInput, didSaveTextDocumentParams.getTextDocument().getUri());
             if (!syntaxErrors.isEmpty()) {
                 clientService.publishDiagnostics(didSaveTextDocumentParams.getTextDocument().getUri(), syntaxErrors);
+            }else {
+                clientService.updateClient();
             }
             logService.log("Found [" + syntaxErrors.size() + "] Syntax Errors in Document.");
 
             if (syntaxErrors.isEmpty()) {
 
                 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(didSaveTextDocumentParams.getTextDocument().getUri(), fileInput, false);
+                ArrayList<LSPVariable> variables = typeResolver.infereInput(didSaveTextDocumentParams.getTextDocument().getUri(), fileInput);
                 cacheService.setVariables(variables);
 
                 DiagnosticsAndTypehints diagnosticsAndTypehints = conversionHelper.variablesToDiagnosticsAndTypehints(variables, didSaveTextDocumentParams.getTextDocument().getUri());
@@ -79,16 +81,13 @@ public class SaveHandler {
 
             }
 
-        } catch (Exception e) {
+        } catch (Exception | VerifyError 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<>(), didSaveTextDocumentParams.getTextDocument().getUri());
-
+        }
-        } finally {
+        finally {
             sWatch.stop();
             logService.log("[didSave] Finished Calculating in [" + sWatch.elapsed().toSeconds() + "s]", MessageType.Info);
         }

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

@@ -140,7 +140,7 @@ public class TypeResolver {
         return variables;
     }
 
-    public ArrayList<LSPVariable> infereInput(String pathString, String input, boolean a) throws IOException, ClassNotFoundException, URISyntaxException {
+    public ArrayList<LSPVariable> infereInput(String pathString, String input) throws IOException, ClassNotFoundException, URISyntaxException {
         System.setOut(new PrintStream(OutputStream.nullOutputStream()));
 
         LanguageServerInterface languageServerInterface = new LanguageServerInterface();

README.md

@@ -63,7 +63,8 @@ The Language Server in itself can be used for any Client. The Clients task is to
 If you make changes in the Compiler Interface, you have to change the jar and therefore the Dependency in the Java TX Language Server
 You can follow this steps:
 1. package the JavaTX Compiler
-2. take the Jar-File and copy it into the /lib Folder
+2. create a lib Folder at ./LangaugeServer -> ./LanguageServer/lib
+2. take the Jar-File and copy it into the /lib Folder at 
 3. execute this Maven command to add the Jar in your local Repository: ```mvn install:install-file   -Dfile=lib/JavaTXcompiler-0.1-jar-with-dependencies.jar   -DgroupId=de.dhbwstuttgart   -DartifactId=JavaTXcompiler   -Dversion=0.1   -Dpackaging=jar```
 4. run ```maven clean```, ```validate``` and ```install``` to load the new Dependency
 5. you can now package the Language Server or change the code accordingly.