Fix Path Resolution (#26)

This PR fixes the Windows file URI formatting and refactors path
resolution by using the VS Code workspace root API to get the source
directory instead of parsing file URIs for each opened/modified file.

Author: rcosta358

client/server/language-server-liquidjava.jar

@@ -21,19 +21,18 @@
 public class LJDiagnosticsHandler {
 
     private static final String FILE_PREFIX = "file://";
-    private static final String SRC_SUFFIX = "/src/";
     private static final String SOURCE = "liquidjava";
 
     /**
      * Generates LJDiagnostics for the given URI
-     * @param uri
+     * @param uri the document URI
+     * @param path the file path
      * @return LJDiagnostics
      */
-    public static LJDiagnostics getLJDiagnostics(String uri) {
+    public static LJDiagnostics getLJDiagnostics(String uri, String path) {
         List<LJError> errors = new ArrayList<>();
         List<LJWarning> warnings = new ArrayList<>();
-        
-        String path = convertUTFtoCharacters(extractBasePath(uri));
+    
         CommandLineLauncher.launch(path);
         Diagnostics diagnostics = Diagnostics.getInstance();
         if (diagnostics.foundWarning()) {
@@ -70,7 +69,7 @@ public static List<PublishDiagnosticsParams> getDiagnostics(List<LJDiagnostic> d
         // group diagnostics by file
         Map<String, List<Diagnostic>> diagnosticsByFile = diagnostics.stream()
             .collect(Collectors.groupingBy(
-                d -> FILE_PREFIX + d.getFile(),
+                d -> toFileUri(d.getFile()),
                 Collectors.mapping(d -> {
                     Range range = getRangeFromErrorPosition(d.getPosition());
                     String message = String.format("%s: %s", d.getTitle(), d.getMessage());
@@ -84,6 +83,21 @@ public static List<PublishDiagnosticsParams> getDiagnostics(List<LJDiagnostic> d
             .toList();
     }
 
+    /**
+     * Converts a file path to a file:// URI
+     * @param filePath the file path
+     * @return the file URI
+     */
+    private static String toFileUri(String filePath) {
+        String normalized = filePath.replace("\\", "/");
+        // Windows (C:/path)
+        if (!normalized.isEmpty() && normalized.charAt(1) == ':') {
+            return FILE_PREFIX + "/" + normalized;
+        }
+        // Unix (/path)
+        return FILE_PREFIX + normalized;
+    }
+    
     /**
      * Generates empty diagnostics for the given URI
      * @param uri the uri used for the verification
@@ -93,30 +107,6 @@ public static PublishDiagnosticsParams getEmptyDiagnostics(String uri) {
         return new PublishDiagnosticsParams(uri, Collections.emptyList());
     }
 
-    /**
-     * 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 the full path
-     * @return base path
-     */
-    private static String extractBasePath(String fullPath) {
-        fullPath = fullPath.replace(FILE_PREFIX, "");
-        int suffixIndex = fullPath.indexOf(SRC_SUFFIX);
-        int nextSlashIndex = fullPath.indexOf("/", suffixIndex + SRC_SUFFIX.length());
-        if (suffixIndex == -1 || nextSlashIndex == -1)
-            return fullPath; // cannot extract base path
-        return fullPath.substring(0, nextSlashIndex); // up to and including the next slash after /src/
-    }
-
-    /**
-     * Converts a UTF-8 encoded string to a regular string
-     * @param source the UTF-8 encoded string
-     * @return converted string
-     */
-    private static String convertUTFtoCharacters(String source) {
-        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 the ErrorPosition

server/src/main/java/LJDiagnosticsHandler.java

@@ -1,5 +1,7 @@
 import java.io.File;
 import java.net.URI;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -18,8 +20,9 @@
 import liquidjava.diagnostics.LJDiagnostic;
 
 public class LJDiagnosticsService implements TextDocumentService, WorkspaceService {
-    
+
     private LJLanguageClient client;
+    private String sourcePath;
 
     /**
      * Sets the language client
@@ -29,6 +32,17 @@ public void setClient(LJLanguageClient client) {
         this.client = client;
     }
 
+    /**
+     * Sets the source path
+     * Uses workspaceRoot + "/src/main/java" if it exists, otherwise uses workspaceRoot
+     * @param workspaceRoot the workspace root URI
+     */
+    public void setSourcePath(String workspaceRoot) {
+        Path workspaceRootPath = Paths.get(URI.create(workspaceRoot));
+        Path srcMainJava = workspaceRootPath.resolve("src/main/java");
+        this.sourcePath = srcMainJava.toFile().isDirectory() ? srcMainJava.toString() : workspaceRootPath.toString();
+    }
+
     /**
      * Sends diagnostics notification to the client
      * @param diagnostics the diagnostics to send
@@ -49,7 +63,7 @@ public void sendDiagnosticsNotification(List<LJDiagnostic> diagnostics) {
      * @param uri the URI of the document
      */
     public void generateDiagnostics(String uri) {
-        LJDiagnostics ljDiagnostics = LJDiagnosticsHandler.getLJDiagnostics(uri);
+        LJDiagnostics ljDiagnostics = LJDiagnosticsHandler.getLJDiagnostics(uri, sourcePath);
         List<PublishDiagnosticsParams> nativeDiagnostics = LJDiagnosticsHandler.getNativeDiagnostics(ljDiagnostics, uri);
         nativeDiagnostics.forEach(params -> {
             this.client.publishDiagnostics(params);

server/src/main/java/LJDiagnosticsService.java

@@ -30,6 +30,12 @@ public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
         WorkspaceServerCapabilities workspaceServerCapabilities = new WorkspaceServerCapabilities();
         WorkspaceFoldersOptions workspaceFoldersOptions = new WorkspaceFoldersOptions();
 
+        // extract workspace root from initialization params
+        if (params.getWorkspaceFolders() != null && !params.getWorkspaceFolders().isEmpty()) {
+            String workspaceRoot = params.getWorkspaceFolders().get(0).getUri();
+            diagnosticsService.setSourcePath(workspaceRoot);
+        }
+
         // set options
         workspaceFoldersOptions.setChangeNotifications(true);
         workspaceFoldersOptions.setSupported(true);