vortex-cli 5.0.0__tar.gz → 5.0.1__tar.gz

{vortex_cli-5.0.0/vortex_cli.egg-info → vortex_cli-5.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vortex_cli
-Version: 5.0.0
+Version: 5.0.1
 Summary: Vortex CLI
 Author-email: Jordan Amos <jordan.amos@gmail.com>
 License: MIT License
@@ -101,6 +101,7 @@ While it is possible to use without it, this software has been purposefully desi
    ; Optional
    clone_with_resources = html,css,js ; resources with these extensions are always cloned - 'clone --get-resources' still clones ALL resources
    lib_path = ; optional extra jars to add to the classpath (the server's own jars are downloaded automatically - see 'vortex libs')
+   workspace_folders = ~/dev/shared,notes ; extra folders to mount in the generated .code-workspace files. Relative paths resolve against the workspace root. Under [DEFAULT] they are added to every workspace; here they apply to this server's workspace (and the global one)
    java_home = /usr/lib/jvm/java-17-openjdk-amd64/ ; The local path to the JRE to use. Should be the same version running on your server
    java_environment_name = JavaSE-17 ; Java Execution Environment name https://docs.osgi.org/reference/eenames.html
    ```

{vortex_cli-5.0.0 → vortex_cli-5.0.1}/README.md

@@ -57,6 +57,7 @@ While it is possible to use without it, this software has been purposefully desi
    ; Optional
    clone_with_resources = html,css,js ; resources with these extensions are always cloned - 'clone --get-resources' still clones ALL resources
    lib_path = ; optional extra jars to add to the classpath (the server's own jars are downloaded automatically - see 'vortex libs')
+   workspace_folders = ~/dev/shared,notes ; extra folders to mount in the generated .code-workspace files. Relative paths resolve against the workspace root. Under [DEFAULT] they are added to every workspace; here they apply to this server's workspace (and the global one)
    java_home = /usr/lib/jvm/java-17-openjdk-amd64/ ; The local path to the JRE to use. Should be the same version running on your server
    java_environment_name = JavaSE-17 ; Java Execution Environment name https://docs.osgi.org/reference/eenames.html
    ```

{vortex_cli-5.0.0 → vortex_cli-5.0.1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vortex_cli"
-version = "5.0.0"
+version = "5.0.1"
 description = "Vortex CLI"
 requires-python = ">=3.10"
 readme = { file = "README.md", content-type = "text/markdown" }

{vortex_cli-5.0.0 → vortex_cli-5.0.1}/vortex/workspace.py

@@ -8,6 +8,7 @@ import os
 import pickle
 import shutil
 from collections.abc import Callable
+from collections.abc import Collection
 from collections.abc import Generator
 from collections.abc import Iterable
 from pathlib import Path
@@ -60,6 +61,11 @@ lib_path =
 java_home =
 java_environment_name =
 protected = false
+# Comma separated directories to mount as extra folders in the
+# generated .code-workspace files. Relative paths are resolved against
+# the workspace root. Set under [DEFAULT] to add them to every
+# workspace, or per server for that server's workspace
+workspace_folders =
 """
 
 
@@ -99,6 +105,7 @@ class Workspace:
         # credentials are only ever resolved once per server
         self._server_cache: dict[str, PuakmaServer] = {}
         self._warned_legacy_options = False
+        self._warned_missing_folders: set[str] = set()
         if init:
             self.init()
         if not self._path.is_dir():
@@ -591,6 +598,53 @@ class Workspace:
             folders.append({"path": str(docs_dir), "name": "docs"})
         return folders
 
+    def _custom_folders(
+        self, config: configparser.ConfigParser, section: str | None
+    ) -> list[dict[str, str]]:
+        """
+        The 'workspace_folders' config option as explorer folder entries:
+        comma separated directories, resolved against the workspace root
+        unless absolute. Under [DEFAULT] configparser applies the value
+        to every section; a section's own value overrides it. Directories
+        that don't exist are skipped with a warning (once per process) so
+        a typo can't put a broken root in the editor sidebar.
+        """
+        if section is not None and config.has_section(section):
+            raw = config.get(section, "workspace_folders", fallback="")
+        else:
+            raw = config.defaults().get("workspace_folders", "")
+        folders = []
+        for part in raw.split(","):
+            part = part.strip()
+            if not part:
+                continue
+            path = Path(os.path.expanduser(part))
+            if not path.is_absolute():
+                path = self.path / path
+            if not path.is_dir():
+                if part not in self._warned_missing_folders:
+                    self._warned_missing_folders.add(part)
+                    logger.warning(
+                        f"Skipping workspace folder '{part}': not a directory"
+                    )
+                continue
+            folders.append({"path": str(path)})
+        return folders
+
+    def _custom_folders_union(
+        self, config: configparser.ConfigParser
+    ) -> list[dict[str, str]]:
+        """Every configured custom folder, deduplicated, for the global
+        workspace: the [DEFAULT] entries plus each server's own."""
+        folders = self._custom_folders(config, None)
+        seen = {folder["path"] for folder in folders}
+        for section in config.sections():
+            for folder in self._custom_folders(config, section):
+                if folder["path"] not in seen:
+                    seen.add(folder["path"])
+                    folders.append(folder)
+        return folders
+
     def _app_blocks(
         self,
     ) -> list[tuple[str, str, list[tuple[PuakmaApplication, Path]]]]:
@@ -651,21 +705,29 @@ class Workspace:
             return []
         return [p for p in server_libs.split(",") if p]
 
-    def _referenced_libs_union(self, config: configparser.ConfigParser) -> list[str]:
-        """
-        The global workspace's referencedLibraries: a union across every
-        server. vscode-java's 'java.project.*' settings are WINDOW
-        scoped - folder-level settings.json values are ignored (VS Code
-        greys them out) - so a multi-root workspace can only carry ONE
-        list for all folders. Version conflicts between servers are
-        possible here; the per-server '<name>.code-workspace' files
-        ('vortex code -s <server>') are the guaranteed-correct view.
+    def _referenced_libs_union(
+        self, config: configparser.ConfigParser, cloned_hosts: Collection[str]
+    ) -> list[str]:
+        """
+        The global workspaces referencedLibraries: a union across the
+        servers that actually have cloned apps in this workspace.
+        vscode-java's 'java.project.*' settings are WINDOW scoped -
+        folder-level settings.json values are ignored (VS Code greys
+        them out) - so a multi-root workspace can only carry ONE list
+        for all folders. Servers configured in servers.ini with no
+        clones here contribute nothing: their jars would only shadow
+        the jars of servers that are in the window (the JDT builder
+        does not honor entry order, so e.g. a legacy server's old POI
+        can silently break a modern server's build). Version conflicts
+        between cloned servers are still possible; the per-server
+        '<name>.code-workspace' files ('vortex code -s <server>') are
+        the guaranteed-correct view.
         """
         refs: list[str] = []
         hosts: list[tuple[str, str]] = []
         for section in config.sections():
             host = config.get(section, "host", fallback="").strip()
-            if host:
+            if host and host in cloned_hosts:
                 hosts.append((section, host))
         for _section, host in hosts:
             entries = libs.vscode_reference_entries(self.path, host)
@@ -726,13 +788,19 @@ class Workspace:
         blocks = self._app_blocks()
 
         # The global workspace: every server's block, union of all jars
-        global_folders = self._utility_folders()
+        # and custom folders
+        global_folders = self._utility_folders() + self._custom_folders_union(config)
         for _label, _host, apps in blocks:
             global_folders.extend(self._server_block_folders(apps))
         self._write_workspace_file(
             self.code_workspace_file,
             global_folders,
-            self._java_settings(config, self._referenced_libs_union(config)),
+            self._java_settings(
+                config,
+                self._referenced_libs_union(
+                    config, {host for _label, host, _apps in blocks}
+                ),
+            ),
             reset,
         )
 
@@ -748,7 +816,11 @@ class Workspace:
                 refs.extend(
                     p for p in self._lib_path_entries(config, section) if p not in refs
                 )
-            folders = self._utility_folders() + self._server_block_folders(apps)
+            folders = (
+                self._utility_folders()
+                + self._custom_folders(config, section)
+                + self._server_block_folders(apps)
+            )
             self._write_workspace_file(
                 file, folders, self._java_settings(config, refs), reset
             )

{vortex_cli-5.0.0 → vortex_cli-5.0.1/vortex_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vortex_cli
-Version: 5.0.0
+Version: 5.0.1
 Summary: Vortex CLI
 Author-email: Jordan Amos <jordan.amos@gmail.com>
 License: MIT License
@@ -101,6 +101,7 @@ While it is possible to use without it, this software has been purposefully desi
    ; Optional
    clone_with_resources = html,css,js ; resources with these extensions are always cloned - 'clone --get-resources' still clones ALL resources
    lib_path = ; optional extra jars to add to the classpath (the server's own jars are downloaded automatically - see 'vortex libs')
+   workspace_folders = ~/dev/shared,notes ; extra folders to mount in the generated .code-workspace files. Relative paths resolve against the workspace root. Under [DEFAULT] they are added to every workspace; here they apply to this server's workspace (and the global one)
    java_home = /usr/lib/jvm/java-17-openjdk-amd64/ ; The local path to the JRE to use. Should be the same version running on your server
    java_environment_name = JavaSE-17 ; Java Execution Environment name https://docs.osgi.org/reference/eenames.html
    ```