Release 0.0.38

Author: rcosta358

README.md

@@ -1,6 +1,6 @@
 # LiquidJava VS Code Extension
 
-The **LiquidJava VS Code extension** adds support for **refinement types**, extending the Java standard type system directly inside VS Code, using the [LiquidJava](https://github.com/CatarinaGamboa/liquidjava) verifier. It provides error diagnostics and syntax highlighting for refinements.
+The **LiquidJava VS Code extension** adds support for **refinement types**, extending the Java standard type system directly inside VS Code, using the [LiquidJava](https://github.com/liquid-java/liquidjava) verifier. It provides error diagnostics and syntax highlighting for refinements.
 
 ## Getting Started
 
@@ -14,7 +14,7 @@ To try out the extension on an example project without setting up your local env
 
 The codespace will open in your browser and automatically install the LiquidJava extension shortly.
 
-   [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/CatarinaGamboa/liquidjava-examples)
+   [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/liquid-java/liquidjava-examples)
 
 ### Local Setup
 

client/README.md

@@ -1,6 +1,6 @@
 # LiquidJava - Extending Java with Liquid Types
 
-![](https://raw.githubusercontent.com/CatarinaGamboa/liquidjava/refs/heads/main/docs/design/figs/banner.gif)
+![](https://raw.githubusercontent.com/liquid-java/liquidjava/refs/heads/main/docs/design/figs/banner.gif)
 
 ### Extend your Java code with Liquid Types and catch bugs earlier!
 
@@ -15,7 +15,7 @@ a = -8; // type error!
 ### Installation
 
 This extension depends on the [Language Support for Java(TM) by Red Hat](https://marketplace.visualstudio.com/items?itemName=redhat.java) VS Code extension.
-Additionally, to use LiquidJava in your project, you'll need the following dependency, which includes the LiquidJava API annotations:
+Additionally, to use LiquidJava in your project, you'll need the following dependency, which includes the LiquidJava annotations:
 
 #### Maven
 ```xml
@@ -45,7 +45,7 @@ Liquid types, or refinement types, extend a language with **logical predicates**
 
 #### Refinements
 
-To refine a variable, parameter or return value, use the annotation `@Refinement` with a predicate as argument. The predicate must be a boolean expression that uses the name of the variable being refined (or `_`) to refer to its value. Some examples include:
+To refine a variable, parameter or return value, use the `@Refinement` annotation with a predicate as an argument. The predicate must be a boolean expression that uses the name of the variable being refined (or `_`) to refer to its value. Some examples include:
 
 ```java
 // x must be greater than 0
@@ -137,8 +137,10 @@ s.pop(); // type error!
 
 ```
 
-You can find more examples of how to use LiquidJava on the [LiquidJava Website](https://catarinagamboa.github.io/liquidjava.html). For more information, check the following repositories:
-- [liquidjava](https://github.com/CatarinaGamboa/liquidjava): Main repository with API, verifier and some examples
-- [vscode-liquidjava](https://github.com/CatarinaGamboa/vscode-liquidjava): Source code of this VS Code extension
-- [liquidjava-examples](https://github.com/CatarinaGamboa/liquidjava-examples): Repository with more usage examples of LiquidJava
-- [liquid-java-external-libs](https://github.com/CatarinaGamboa/liquid-java-external-libs): Examples of how to use LiquidJava with external libraries
+You can find more examples of how to use LiquidJava on the [LiquidJava Website](https://liquid-java.github.io). To learn how to use LiquidJava, you can also follow the [LiquidJava tutorial](https://github.com/liquid-java/liquidjava-tutorial).
+
+For more information, check the following repositories:
+- [liquidjava](https://github.com/liquid-java/liquidjava): Includes the API, verifier and some examples
+- [vscode-liquidjava](https://github.com/liquid-java/vscode-liquidjava): Source code of this VS Code extension
+- [liquidjava-examples](https://github.com/liquid-java/liquidjava-examples): Examples of how to use LiquidJava
+- [liquid-java-external-libs](https://github.com/liquid-java/liquid-java-external-libs): Examples of how to use LiquidJava to refine external libraries

client/package.json

@@ -1,14 +1,14 @@
 {
 	"name": "liquid-java",
 	"displayName": "LiquidJava",
-	"description": "LiquidJava - Extending Java with Liquid Types",
-	"version": "0.0.37",
+	"description": "Extending Java with Liquid Types",
+	"version": "0.0.38",
 	"publisher": "AlcidesFonseca",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/CatarinaGamboa/vscode-liquidjava"
+		"url": "https://github.com/liquid-java/vscode-liquidjava"
 	},
-	"homepage": "https://catarinagamboa.github.io/liquidjava",
+	"homepage": "https://liquid-java.github.io",
 	"engines": {
 		"vscode": "^1.70.0"
 	},
@@ -27,6 +27,8 @@
 	"keywords": [
 		"java",
 		"liquidjava",
+		"liquid java",
+		"liquid-java",
 		"liquid types",
 		"refinement types",
 		"static analysis",

client/server/language-server-liquidjava.jar

@@ -12,16 +12,15 @@ public class App {
 
     final static int DEFAULT_PORT = 50000;
 
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) {
         final int port = args.length > 0 ? Integer.parseInt(args[0]) : DEFAULT_PORT;
         System.out.println("Starting server on port: " + port);
         new App().startNetworkedLanguageServer(port);
     }
 
     /**
      * Starts the language server on the given port in a new thread
-     * 
-     * @param port
+     * @param port the port to start the server on
      */
     private void startNetworkedLanguageServer(int port) {
         new Thread(() -> {
@@ -34,7 +33,7 @@ private void startNetworkedLanguageServer(int port) {
                         OutputStream out = socket.getOutputStream();
                         LJLanguageServer server = new LJLanguageServer();
                         Launcher<LanguageClient> launcher = LSPLauncher.createServerLauncher(server, in, out);
-                        server.connect(launcher.getRemoteProxy(), launcher.getRemoteEndpoint());
+                        server.connect(launcher.getRemoteProxy());
                         launcher.startListening();
                     } catch (IOException e) {
                         System.out.println("Error: " + e.getMessage());

server/src/main/java/App.java

@@ -1,4 +1,3 @@
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -34,13 +33,13 @@ public static List<PublishDiagnosticsParams> generateDiagnostics(String uri) {
             if (diagnostics.foundError()) {
                 System.out.println("Failed verification");
                 List<LJDiagnostic> errors = new ArrayList<>(diagnostics.getErrors());
-                result.addAll(getDiagnostics(uri, errors, DiagnosticSeverity.Error));
+                result.addAll(getDiagnostics(errors, DiagnosticSeverity.Error));
             } else {
                 System.out.println("Passed verification");
             }
             if (diagnostics.foundWarning()) {
                 List<LJDiagnostic> warnings = new ArrayList<>(diagnostics.getWarnings());
-                result.addAll(getDiagnostics(uri, warnings, DiagnosticSeverity.Warning));
+                result.addAll(getDiagnostics(warnings, DiagnosticSeverity.Warning));
             }
             return result.isEmpty() ? List.of(getEmptyDiagnostics(uri)) : result;
         } catch (Exception e) {
@@ -51,10 +50,9 @@ public static List<PublishDiagnosticsParams> generateDiagnostics(String uri) {
 
     /**
      * Generates error and warning diagnostics
-     * @param uri the uri used for the verification
      * @return diagnostics
      */
-    public static List<PublishDiagnosticsParams> getDiagnostics(String uri, List<LJDiagnostic> diagnostics,
+    public static List<PublishDiagnosticsParams> getDiagnostics(List<LJDiagnostic> diagnostics,
             DiagnosticSeverity severity) {
         return diagnostics.stream().map(d -> {
             String filePath = FILE_PREFIX + d.getFile();
@@ -77,7 +75,7 @@ public static PublishDiagnosticsParams getEmptyDiagnostics(String uri) {
     /**
      * Extracts the base path from the given full path
      * e.g. file://path/to/project/src/main/path/to/File.java => /path/to/project/src/main
-     * @param fullPath
+     * @param fullPath the full path
      * @return base path
      */
     private static String extractBasePath(String fullPath) {
@@ -91,21 +89,16 @@ private static String extractBasePath(String fullPath) {
 
     /**
      * Converts a UTF-8 encoded string to a regular string
-     * @param source
+     * @param source the UTF-8 encoded string
      * @return converted string
      */
     private static String convertUTFtoCharacters(String source) {
-        try {
-            return java.net.URLDecoder.decode(source, StandardCharsets.UTF_8.name());
-        } catch (UnsupportedEncodingException e) {
-            // not going to happen - value came from JDK's own StandardCharsets
-            return null;
-        }
+        return java.net.URLDecoder.decode(source, StandardCharsets.UTF_8);
     }
 
     /**
      * Gets the Range from the given ErrorPosition If the position is null, returns a default Range at (0,0)-(0,0)
-     * @param pos
+     * @param pos the ErrorPosition
      * @return Range
      */
     private static Range getRangeFromErrorPosition(ErrorPosition pos) {

server/src/main/java/LJDiagnostics.java

@@ -1,7 +1,5 @@
 import java.io.File;
 import java.net.URI;
-import java.util.HashSet;
-import java.util.Set;
 
 import org.eclipse.lsp4j.DidChangeConfigurationParams;
 import org.eclipse.lsp4j.DidChangeTextDocumentParams;
@@ -15,51 +13,36 @@
 
 public class LJDiagnosticsService implements TextDocumentService, WorkspaceService {
     private LanguageClient client;
-    private Set<String> checkedUris = new HashSet<>();
 
     /**
      * Sets the language client
-     * 
-     * @param client
+     * @param client the language client
      */
     public void setClient(LanguageClient client) {
         this.client = client;
     }
 
     /**
      * Generates diagnostics for the given URI and publishes them to the client
-     * 
-     * @param uri
+     * @param uri the URI of the document
      */
     public void generateDiagnostics(String uri) {
         var paramsList = LJDiagnostics.generateDiagnostics(uri);
         paramsList.forEach(params -> {
             this.client.publishDiagnostics(params);
-            this.checkedUris.add(params.getUri());
         });
     }
 
-    /**
-     * Clears all published diagnostics
-     */
-    public void clearDiagnostics() {
-        this.checkedUris.forEach(uri -> this.client.publishDiagnostics(LJDiagnostics.getEmptyDiagnostics(uri)));
-        this.checkedUris.clear();
-    }
-
     /**
      * Clear a diagnostic for a specific URI
-     * 
-     * @param uri
+     * @param uri the URI of the document
      */
     public void clearDiagnostic(String uri) {
         this.client.publishDiagnostics(LJDiagnostics.getEmptyDiagnostics(uri));
-        this.checkedUris.remove(uri);
     }
 
     /**
      * Checks diagnostics when a document is opened
-     * 
      * @param params
      */
     @Override
@@ -70,19 +53,18 @@ public void didOpen(DidOpenTextDocumentParams params) {
 
     /**
      * Checks diagnostics when a document is saved
-     * 
      * @param params
      */
     @Override
     public void didSave(DidSaveTextDocumentParams params) {
         System.out.println("Document saved — checking diagnostics");
-        clearDiagnostics();
-        generateDiagnostics(params.getTextDocument().getUri());
+        String uri = params.getTextDocument().getUri();
+        clearDiagnostic(uri);
+        generateDiagnostics(uri);
     }
 
     /**
      * Clears diagnostics for a deleted document
-     * 
      * @param params
      */
     @Override

server/src/main/java/LJDiagnosticsService.java

@@ -6,7 +6,6 @@
 import org.eclipse.lsp4j.TextDocumentSyncKind;
 import org.eclipse.lsp4j.WorkspaceFoldersOptions;
 import org.eclipse.lsp4j.WorkspaceServerCapabilities;
-import org.eclipse.lsp4j.jsonrpc.RemoteEndpoint;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.lsp4j.services.LanguageServer;
@@ -15,21 +14,19 @@
 
 public class LJLanguageServer implements LanguageServer {
 
-    private LJDiagnosticsService diagnosticsService;
+    private final LJDiagnosticsService diagnosticsService;
 
     public LJLanguageServer() {
         this.diagnosticsService = new LJDiagnosticsService();
     }
 
     /**
      * Initializes the language server with the given parameters
-     * 
-     * @param params
-     * 
+     * @param params the initialize parameters
      * @return CompletableFuture with the InitializeResult
      */
     public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
-        CompletableFuture<InitializeResult> completableFuture = new CompletableFuture<InitializeResult>();
+        CompletableFuture<InitializeResult> completableFuture = new CompletableFuture<>();
         ServerCapabilities capabilities = new ServerCapabilities();
         WorkspaceServerCapabilities workspaceServerCapabilities = new WorkspaceServerCapabilities();
         WorkspaceFoldersOptions workspaceFoldersOptions = new WorkspaceFoldersOptions();
@@ -65,10 +62,11 @@ public WorkspaceService getWorkspaceService() {
         return diagnosticsService;
     }
 
-    public void connect(LanguageClient remoteProxy, RemoteEndpoint remoteEndpoint) {
+    public void connect(LanguageClient remoteProxy) {
         diagnosticsService.setClient(remoteProxy);
     }
 
+    @SuppressWarnings("unused")
     @JsonNotification("$/setTraceNotification")
     public void setTrace(Object params) {
         // suppress notification