Support configurable libs dirs

StevenLooman · Nov 20, 2023 · 48c9bae · 48c9bae
1 parent 8f23739
commit 48c9bae
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 28 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,8 @@
 
 0.9.0 (unreleased)
 
+- Support configurable libs dirs.
+
 0.8.3 (unreleased)
 
 - Fix error finding start/end line/column for Scopes, when encountering an empty block.

diff --git a/magik-language-server/client-vscode/package.json b/magik-language-server/client-vscode/package.json
@@ -207,6 +207,10 @@
 					"description": "Path to Smallworld Core.",
 					"type": "string"
 				},
+				"magik.libsDirs": {
+					"description": "Paths to libs dirs of Smallworld products",
+					"type": "array"
+				},
 				"magik.aliases": {
 					"description": "Path to gis_aliases file.",
 					"type": "string"

diff --git a/...-language-server/src/main/java/nl/ramsolutions/sw/magik/languageserver/MagikSettings.java b/...-language-server/src/main/java/nl/ramsolutions/sw/magik/languageserver/MagikSettings.java
@@ -56,6 +56,29 @@ public String getSmallworldGis() {
         return smallworldGis.getAsString();
     }
 
+    /**
+     * Get magik.libsDirs.
+     * @return magik.libsDirs.
+     */
+    public List<String> getLibsDirs() {
+        final JsonObject magik = this.settings.getAsJsonObject(TOP_LEVEL);
+        if (magik == null) {
+            return Collections.emptyList();
+        }
+
+        final JsonArray libsDirs = magik.getAsJsonArray("libsDirs");
+        if (libsDirs == null) {
+            return Collections.emptyList();
+        }
+
+        final List<String> paths = new ArrayList<>();
+        libsDirs.forEach(jsonElement -> {
+            final String path = jsonElement.getAsString();
+            paths.add(path);
+        });
+        return paths;
+    }
+
     /**
      * Get magik.typing.typeDatabasePath.
      * @return magik.typing.typeDatabasePath.

diff --git a/...e-server/src/main/java/nl/ramsolutions/sw/magik/languageserver/MagikWorkspaceService.java b/...e-server/src/main/java/nl/ramsolutions/sw/magik/languageserver/MagikWorkspaceService.java
@@ -11,7 +11,6 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
-import javax.annotation.Nullable;
 import nl.ramsolutions.sw.IgnoreHandler;
 import nl.ramsolutions.sw.magik.analysis.typing.ClassInfoTypeKeeperReader;
 import nl.ramsolutions.sw.magik.analysis.typing.ITypeKeeper;
@@ -106,7 +105,7 @@ private void runIgnoreFilesIndexer() {
                     .forEach(path -> {
                         try {
                             this.ignoreHandler.addIgnoreFile(path);
-                        } catch (IOException exception) {
+                        } catch (final IOException exception) {
                             LOGGER.error(exception.getMessage(), exception);
                         }
                     });
@@ -129,26 +128,22 @@ private void runIndexer() {
         }
     }
 
-    private void readLibsDocs(final @Nullable String smallworldGisDir) {
-        LOGGER.trace("Reading libs docs from: {}", smallworldGisDir);
+    private void readLibsClassInfos(final List<String> libsDirs) {
+        LOGGER.trace("Reading libs docs from: {}", libsDirs);
 
-        if (smallworldGisDir == null
-            || smallworldGisDir.trim().isEmpty()) {
-            LOGGER.info("No smallworld gis directory configured");
-            return;
-        }
-
-        final Path libsDirPath = Path.of(smallworldGisDir).resolve("sw_core").resolve("libs");
-        if (!Files.exists(libsDirPath)) {
-            return;
-        }
+        libsDirs.forEach(pathStr -> {
+            final Path path = Path.of(pathStr);
+            if (!Files.exists(path)) {
+                LOGGER.warn("Path to libs dir does not exist: {}", pathStr);
+                return;
+            }
 
-        // Move to ClassInfoTypeKeeperReader class.
-        try {
-            ClassInfoTypeKeeperReader.readLibsDirectory(libsDirPath, this.typeKeeper);
-        } catch (IOException exception) {
-            LOGGER.error(exception.getMessage(), exception);
-        }
+            try {
+                ClassInfoTypeKeeperReader.readLibsDirectory(path, this.typeKeeper);
+            } catch (final IOException exception) {
+                LOGGER.error(exception.getMessage(), exception);
+            }
+        });
     }
 
     /**
@@ -166,8 +161,8 @@ public void readTypesDbs(final List<String> typeDbPaths) {
             }
 
             try {
-                JsonTypeKeeperReader.readTypes(path, this.typeKeeper);
-            } catch (IOException exception) {
+                JsonTypeKeeperReader.read(path, this.typeKeeper);
+            } catch (final IOException exception) {
                 LOGGER.error(exception.getMessage(), exception);
             }
         });
@@ -289,11 +284,9 @@ private void runIndexers() {
         final List<String> typesDbPaths = MagikSettings.INSTANCE.getTypingTypeDatabasePaths();
         this.readTypesDbs(typesDbPaths);
 
-        // Read method docs.
-        final String smallworldGisDir = MagikSettings.INSTANCE.getSmallworldGis();
-        if (smallworldGisDir != null) {
-            this.readLibsDocs(smallworldGisDir);
-        }
+        // Read class_infos from libs/ dirs.
+        final List<String> libsDirs = MagikSettings.INSTANCE.getLibsDirs();
+        this.readLibsClassInfos(libsDirs);
 
         // Index .magik-tools-ignore files.
         this.runIgnoreFilesIndexer();
@@ -324,7 +317,7 @@ private void runIndexersInBackground() {
 
             try {
                 this.runIndexers();
-            } catch (Exception exception) {
+            } catch (final Exception exception) {
                 LOGGER.error(exception.getMessage(), exception);
             }