#10: add initial support for Intellij

Reviewed-on: #36

Clients/Intellij/.idea/misc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_23" default="true" project-jdk-name="openjdk-23" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="openjdk-23" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

Clients/Intellij/build.gradle

@@ -1,28 +0,0 @@
-plugins {
-    id 'java'
-    id 'org.jetbrains.intellij.platform' version '2.2.1'
-
-}
-
-group = 'org.example'
-version = '1.0-SNAPSHOT'
-
-repositories {
-    mavenCentral()
-    maven { url "https://jitpack.io" }
-
-    intellijPlatform {
-        defaultRepositories()
-    }
-}
-
-
-dependencies {
-    testImplementation platform('org.junit:junit-bom:5.10.0')
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    implementation "com.github.Ballerina-Platform.lsp4intellij:lsp4intellij:master-SNAPSHOT"
-}
-
-test {
-    useJUnitPlatform()
-}

Clients/Intellij/build.gradle.kts

@@ -0,0 +1,41 @@
+plugins {
+    id("org.jetbrains.intellij") version "1.17.3"
+    kotlin("jvm") version "1.9.0"
+}
+
+group = "com.example"
+version = "1.0.0"
+
+repositories {
+    mavenCentral()
+    maven { url = uri("https://jitpack.io") }
+}
+
+dependencies {
+    implementation(kotlin("stdlib"))
+    implementation("com.github.ballerina-platform:lsp4intellij:0.9.0")
+}
+
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+
+intellij {
+    version.set("2023.3")
+}
+
+tasks {
+    patchPluginXml {
+        sinceBuild.set("233")
+        untilBuild.set("233.*")
+    }
+}

Clients/Intellij/src/main/kotlin/kotlin/com/example/lsp/PreloadActivityTX.java

@@ -0,0 +1,14 @@
+package kotlin.com.example.lsp;
+
+import com.intellij.openapi.application.PreloadingActivity;
+import com.intellij.openapi.progress.ProgressIndicator;
+import org.wso2.lsp4intellij.IntellijLanguageClient;
+import org.wso2.lsp4intellij.client.languageserver.serverdefinition.RawCommandServerDefinition;
+
+public class PreloadActivityTX extends PreloadingActivity {
+    @Override
+    public void preload(ProgressIndicator indicator) {
+        String[] command = new String[]{"java", "-jar", "/JavaTXLanguageServer-1.0-SNAPSHOT-jar-with-dependencies.jar"};
+        IntellijLanguageClient.addServerDefinition(new RawCommandServerDefinition("jav", command));
+    }
+}

Clients/Intellij/src/resources/META-INF/plugin.xml

@@ -13,7 +13,7 @@ see also jetbrains documentation: https://plugins.jetbrains.com/docs/intellij/pl
 
     <extensions defaultExtensionNs="com.intellij">
         <!-- register a preloading activity. You need to init IntellijLanguageClient with your config, see readme -->
-        <preloadingActivity implementation="your.plugin.MyPreloadingActivity" id="your.plugin.MyPreloadingActivity"/>
+        <preloadingActivity implementation="kotlin.com.example.lsp.PreloadActivityTX" id="kotlin.com.example.lsp.PreloadActivityTX"/>
 
         <!-- register intellijLanguageClient as a Service OR as a plugin component (see readme)... -->
         <applicationService serviceImplementation="org.wso2.lsp4intellij.IntellijLanguageClient"/>

Clients/VisualStudioCode/vsc-extension-quickstart.md

@@ -1 +1,44 @@
-LSP-Client for Java-TX
+# Welcome to your VS Code Extension
+
+## What's in the folder
+
+* This folder contains all of the files necessary for your extension.
+* `package.json` - this is the manifest file in which you declare your extension and command.
+  * The sample plugin registers a command and defines its title and command name. With this information VS Code can show the command in the command palette. It doesn’t yet need to load the plugin.
+* `src/extension.ts` - this is the main file where you will provide the implementation of your command.
+  * The file exports one function, `activate`, which is called the very first time your extension is activated (in this case by executing the command). Inside the `activate` function we call `registerCommand`.
+  * We pass the function containing the implementation of the command as the second parameter to `registerCommand`.
+
+## Get up and running straight away
+
+* Press `F5` to open a new window with your extension loaded.
+* Run your command from the command palette by pressing (`Ctrl+Shift+P` or `Cmd+Shift+P` on Mac) and typing `Hello World`.
+* Set breakpoints in your code inside `src/extension.ts` to debug your extension.
+* Find output from your extension in the debug console.
+
+## Make changes
+
+* You can relaunch the extension from the debug toolbar after changing code in `src/extension.ts`.
+* You can also reload (`Ctrl+R` or `Cmd+R` on Mac) the VS Code window with your extension to load your changes.
+
+## Explore the API
+
+* You can open the full set of our API when you open the file `node_modules/@types/vscode/index.d.ts`.
+
+## Run tests
+
+* Install the [Extension Test Runner](https://marketplace.visualstudio.com/items?itemName=ms-vscode.extension-test-runner)
+* Run the "watch" task via the **Tasks: Run Task** command. Make sure this is running, or tests might not be discovered.
+* Open the Testing view from the activity bar and click the Run Test" button, or use the hotkey `Ctrl/Cmd + ; A`
+* See the output of the test result in the Test Results view.
+* Make changes to `src/test/extension.test.ts` or create new test files inside the `test` folder.
+  * The provided test runner will only consider files matching the name pattern `**.test.ts`.
+  * You can create folders inside the `test` folder to structure your tests any way you want.
+
+## Go further
+
+* [Follow UX guidelines](https://code.visualstudio.com/api/ux-guidelines/overview) to create extensions that seamlessly integrate with VS Code's native interface and patterns.
+* Reduce the extension size and improve the startup time by [bundling your extension](https://code.visualstudio.com/api/working-with-extensions/bundling-extension).
+* [Publish your extension](https://code.visualstudio.com/api/working-with-extensions/publishing-extension) on the VS Code extension marketplace.
+* Automate builds by setting up [Continuous Integration](https://code.visualstudio.com/api/working-with-extensions/continuous-integration).
+* Integrate to the [report issue](https://code.visualstudio.com/api/get-started/wrapping-up#issue-reporting) flow to get issue and feature requests reported by users.

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

@@ -1,7 +1,6 @@
 package de.dhbw;
 
 import com.google.common.base.Stopwatch;
-import de.dhbw.handler.UpdatePositionHandler;
 import de.dhbw.helper.CodeSnippetOptions;
 import de.dhbw.helper.TextHelper;
 import de.dhbw.helper.TypeResolver;
@@ -37,6 +36,7 @@ import java.util.stream.Stream;
  */
 public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.TextDocumentService {
 
+
     private static final Logger logger = LogManager.getLogger(JavaTXTextDocumentService.class);
     LanguageClient client;
     HashMap<String, List<InlayHint>> globalInlayHintMap = new HashMap<>();
@@ -84,6 +84,7 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
             completions.add(item);
         }
 
+
         return CompletableFuture.completedFuture(Either.forLeft(completions));
     }
 
@@ -131,6 +132,7 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
 
     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;
 
@@ -179,8 +181,6 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
         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;
@@ -194,7 +194,6 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
                 preciseChanges.putAll(lineDiffs);
 
                 textChanges.put(index, difference(currentTextLines.get(index), newTextLine).stream().map(el -> el.replaceAll(" ", "")).toList());
-                client.logMessage(new MessageParams(MessageType.Info, "For Line " + index + " difference of " + (newTextLine.length() - currentTextLines.get(index).length())));
                 offsetPerLine.add(newTextLine.length() - currentTextLines.get(index).length());
             }
 
@@ -225,58 +224,77 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
             );
         }).toList();
 
-        client.publishDiagnostics(new PublishDiagnosticsParams(params.getTextDocument().getUri(), diagnosticsList));
 
+//        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<>();
+            ArrayList<Diagnostic> diagnostics = new ArrayList<>();
-        var sWatch = Stopwatch.createUnstarted();
+            var sWatch = Stopwatch.createUnstarted();
-        sWatch.start();
+            sWatch.start();
 
-        try {
+            try {
-            if (textDocuments.get(params.getTextDocument().getUri()) == null) {
+                if (textDocuments.get(params.getTextDocument().getUri()) == null) {
-                log("[didSave] Input of Text Document is null in TextDocument-Hashmap.", MessageType.Error);
+                    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);
-                inlayHint.getPosition().setCharacter(inlayHint.getPosition().getCharacter() + offsetPerLine.get(inlayHint.getPosition().getLine()));
-                typeHint.add(inlayHint);
-
-
-                //Diagnostics of Types
-                for (var type : variable.getPossibleTypes()) {
-                    Diagnostic diagnostic = getDiagnostic(variable, params.getTextDocument().getUri(), type);
-                    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()));
-                    diagnostics.add(diagnostic);
                 }
+                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);
             }
-
-
-            globalDiagnosticsMap.put(params.getTextDocument().getUri(), diagnostics);
-            globalInlayHintMap.put(params.getTextDocument().getUri(), typeHint);
-//            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);
@@ -288,8 +306,6 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
             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())));
     }

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

@@ -1,96 +0,0 @@
-package de.dhbw.handler;
-
-import de.dhbw.model.LSPVariable;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-import org.eclipse.lsp4j.Diagnostic;
-import org.eclipse.lsp4j.InlayHint;
-import org.eclipse.lsp4j.Position;
-import org.eclipse.lsp4j.Range;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class UpdatePositionHandler {
-
-    public static List<InlayHint> adjustInlayHintPositions(List<InlayHint> oldHints, List<String> newTextLines) {
-        List<InlayHint> adjusted = new ArrayList<>();
-
-        for (InlayHint hint : oldHints) {
-            Position oldPos = hint.getPosition();
-            int oldLine = oldPos.getLine();
-            String variableName = extractVariableNameFromHint(hint); // z. B. durch .getLabel()
-
-            int searchStart = Math.max(0, oldLine - 3);
-            int searchEnd = Math.min(newTextLines.size(), oldLine + 3);
-
-            boolean found = false;
-
-            for (int i = searchStart; i < searchEnd; i++) {
-                String lineText = newTextLines.get(i);
-                int column = lineText.indexOf(variableName);
-                if (column >= 0) {
-                    Position newPos = new Position(i, column + variableName.length());
-                    InlayHint adjustedHint = new InlayHint(newPos, hint.getLabel());
-                    adjustedHint.setKind(hint.getKind());
-                    adjustedHint.setPaddingLeft(false);
-                    adjustedHint.setPaddingRight(true);
-                    adjusted.add(adjustedHint);
-                    found = true;
-                    break;
-                }
-            }
-
-            if (!found) {
-                adjusted.add(hint); // fallback: alte Position beibehalten
-            }
-        }
-
-        return adjusted;
-    }
-
-    private static String extractVariableNameFromHint(InlayHint hint) {
-        // Beispiel: wenn dein Hint-Label z. B. "String ↤" ist, brauchst du Logik, um den Namen zu bestimmen
-        // Wenn du nur Typen zeigst, kannst du Position - Name aus anderer Quelle kombinieren
-        // Temporär: nutze z. B. eine Custom-Property
-        return hint.getLabel().getLeft(); // Pseudocode, je nach Labelstruktur anpassen
-    }
-
-    public static List<Diagnostic> adjustDiagnosticPositions(List<Diagnostic> oldDiagnostics, List<String> newTextLines) {
-        List<Diagnostic> adjusted = new ArrayList<>();
-
-        for (Diagnostic diag : oldDiagnostics) {
-            String keyword = extractKeywordFromDiagnostic(diag); // z. B. "inferred type"
-
-            int oldLine = diag.getRange().getStart().getLine();
-            int searchStart = Math.max(0, oldLine - 3);
-            int searchEnd = Math.min(newTextLines.size(), oldLine + 3);
-
-            boolean found = false;
-            for (int i = searchStart; i < searchEnd; i++) {
-                String lineText = newTextLines.get(i);
-                int col = lineText.indexOf(keyword);
-                if (col >= 0) {
-                    Range newRange = new Range(new Position(i, col), new Position(i, col + keyword.length()));
-                    Diagnostic adjustedDiag = new Diagnostic(newRange, diag.getMessage(), diag.getSeverity(), diag.getCode().getLeft(), diag.getSource());
-                    adjusted.add(adjustedDiag);
-                    found = true;
-                    break;
-                }
-            }
-
-            if (!found) {
-                adjusted.add(diag); // fallback
-            }
-        }
-
-        return adjusted;
-    }
-
-    private static String extractKeywordFromDiagnostic(Diagnostic diag) {
-        // z. B. mit Regex oder fixer Konvention aus message
-        return "type"; // Beispiel
-    }
-
-}
-

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

@@ -29,6 +29,7 @@ public class TextHelper {
 
         for (int i = startChar; i < linesInChar.length; i++) {
 
+
             if(linesInChar[i].contains("{")){
                 index = i;
                 found = true;
@@ -74,6 +75,7 @@ public class TextHelper {
             }
         }
 
+
         return index-1;
     }
 

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

@@ -33,8 +33,6 @@ public class TypeResolver {
 
     private static final Logger logger = LogManager.getLogger(TypeResolver.class);
 
-    private List<LSPVariable> currentTypes = new ArrayList<>();
-
     private final boolean ENABLE_GENERICS = false;
 
     private LanguageServerTransferObject current;
@@ -64,8 +62,19 @@ public class TypeResolver {
     public TypeResolver() {
     }
 
-    public void updatePositions(String path, String input){
+
-        LanguageServerTransferObject obj = new LanguageServerInterface().getResultSetAndAbstractSyntax(path, input);
+    private LanguageServerTransferObject getCacheOrCalculate(String input, String path) throws IOException, ClassNotFoundException, URISyntaxException {
+        logger.info("Trying to find cached Compiler-Answer for input with key [" + input.hashCode() + "].");
+        LanguageServerInterface languageServer = new LanguageServerInterface();
+        if (dataCache.containsKey(input.hashCode())) {
+            logger.info("Found Cache for the Input with key [" + input.hashCode() + "].");
+            return dataCache.get(input.hashCode());
+        } else {
+            logger.info("Could not find Cache for Input with key [" + input.hashCode() + "]. Using Compiler Interface and Saving the Answer in Cache.");
+            var transferObject = languageServer.getResultSetAndAbstractSyntax(path, input);
+            dataCache.put(input.hashCode(), transferObject);
+            return transferObject;
+        }
     }
 
     public boolean isTypeImported(String input, String type) {
@@ -216,6 +225,17 @@ public class TypeResolver {
 
         ArrayList<LSPVariable> methodsWithParametersLSPVariableList = new ArrayList<>();
 
+        for (var constructor : transferObj.getAst().KlassenVektor.getFirst().getConstructors()) {
+            for (var constructorParam : constructor.getParameterList().getFormalparalist()) {
+                var types = getAvailableTypes(transferObj.getResultSets(), constructorParam.getType());
+                methodsWithParametersLSPVariableList.add(new LSPParameter("", types, constructorParam.getOffset().getLine(), constructorParam.getOffset().getCharPositionInLine(), constructorParam.getOffset().getStopIndex(), constructorParam.getType()));
+            }
+        }
+
+        for (var fieldDecl : transferObj.getAst().KlassenVektor.getFirst().getFieldDecl()) {
+            var types = getAvailableTypes(transferObj.getResultSets(), fieldDecl.getReturnType());
+            methodsWithParametersLSPVariableList.add(new LSPParameter("", types, fieldDecl.getOffset().getLine(), fieldDecl.getOffset().getCharPositionInLine(), fieldDecl.getOffset().getStopIndex(), fieldDecl.getReturnType()));
+        }
 
         if (!transferObj.getResultSets().isEmpty()) {
             //TODO: Hier noch irgendwie die Klasse rausfinden oder durchgehen.
@@ -279,21 +299,10 @@ public class TypeResolver {
             }
         }
 
-        currentTypes.addAll(methodsWithParametersLSPVariableList);
         return methodsWithParametersLSPVariableList;
     }
 
 
-    public void updateTypehints(String input, String path) throws IOException, URISyntaxException, ClassNotFoundException {
-        LanguageServerTransferObject transferObj;
-        LanguageServerInterface languageServer = new LanguageServerInterface();
-        transferObj = languageServer.getResultSetAndAbstractSyntax(path, input);
-        var ast = transferObj.getAst();
-
-
-
-    }
-
     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()) {