Merge branch 'master' into perl2py

.github/workflows/build-asy-linux.yml

@@ -50,13 +50,21 @@ jobs:
         run: |
           echo set\(ASY_VERSION_SUFFIX \"/github-ci/ref=${{ github.sha }}\"\) > asy-pkg-version-suffix.cmake
       - run: cmake --build --preset linux/release --target asy-with-basefiles -j
+      - name: build misc files
+        run: cmake --build --preset linux/release-ccache --target asy-dist-misc-files -j
       - name: Archive build files
         uses: actions/upload-artifact@v4
         with:
           name: asy-buildfiles
           path: |
             cmake-build-linux/release/asy
             cmake-build-linux/release/base
+      - name: Archive misc files
+        uses: actions/upload-artifact@v4
+        with:
+          name: asy-miscfiles
+          path: |
+            cmake-build-linux/release/misc-output
       - name: Build Asymptote google test files
         run: cmake --build --preset linux/release --target asyCxxTests -j
       - name: Archive Asymptote gtest files
@@ -121,6 +129,11 @@ jobs:
       with:
         name: asy-buildfiles
         path: tar-stage
+    - name: Download misc files
+      uses: actions/download-artifact@v4
+      with:
+        name: asy-miscfiles
+        path: tar-stage/misc/
     - name: Download asymptote.pdf
       uses: actions/download-artifact@v4
       with:
@@ -136,7 +149,7 @@ jobs:
     - name: Set asy's +x flag
       run: chmod +x tar-stage/asy
     - name: tar package
-      run: tar -C tar-stage -cvhf asymptote-build-linux.tar asy base examples doc
+      run: tar -C tar-stage -cvhf asymptote-build-linux.tar asy base examples doc misc
     - name: Archive Asymptote test files
       uses: actions/upload-artifact@v4
       with:

.github/workflows/build-asy-windows.yml

@@ -101,6 +101,10 @@ jobs:
         run: |
           ${{ env.pwsh_initialize_devenv }}
           cmake --build cmake-build-msvc/release --target asy-with-basefiles -j
+      - name: Build misc files on windows
+        run: |
+          ${{ env.pwsh_initialize_devenv }}
+          cmake --build cmake-build-msvc/release --target asy-dist-misc-files -j
       - name: Archive Asymptote build
         uses: actions/upload-artifact@v4
         with:
@@ -109,6 +113,12 @@ jobs:
             cmake-build-msvc/release/asy.exe
             cmake-build-msvc/release/base
             cmake-build-msvc/release/*.dll
+      - name: Archive Asymptote misc files
+        uses: actions/upload-artifact@v4
+        with:
+          name: asy-win-x64-miscfiles
+          path: |
+            cmake-build-msvc/release/misc-output
       - name: Build Asymptote google test
         run: |
           ${{ env.pwsh_initialize_devenv }}

.github/workflows/package-asy-installer-win.yml

@@ -33,11 +33,17 @@ jobs:
         with:
           name: cmake-windows-gui-files
           path: GUI/
+      - name: Download misc files
+        uses: actions/download-artifact@v4
+        with:
+          name: asy-win-x64-miscfiles
+          path: |
+            cmake-build-msvc/release/misc-output
       - name: Download asymptote.pdf
         uses: actions/download-artifact@v4
         with:
           name: asy-pdf-file
-          path: extfiles/
+          path: asydoc/
       - name: do cmake install
         run: cmake --install cmake-build-msvc/release --component asy-pre-nsis
       - name: Build installer file

CMakeLists.txt

@@ -71,6 +71,11 @@ include(cmake-scripts/asy-base-files.cmake)
 add_custom_target(asy-basefiles DEPENDS ${ASY_OUTPUT_BASE_FILES})
 add_custom_target(asy-with-basefiles ALL DEPENDS asy asy-basefiles)
 
+# asy misc files
+if (ENABLE_MISCFILES_GEN)
+    include(cmake-scripts/asy-misc-files.cmake)
+endif()
+
 # documentation generation
 
 if (ENABLE_DOCGEN)

CMakePresets.json

@@ -129,7 +129,7 @@
       "inherits": ["msvc/release"],
       "cacheVariables": {
         "ENABLE_ASYMPTOTE_PDF_DOCGEN": "false",
-        "EXTERNAL_DOCUMENTATION_DIR": "${sourceDir}/extfiles"
+        "EXTERNAL_DOCUMENTATION_DIR": "${sourceDir}/asydoc"
       }
     },
     {

INSTALL-WIN.md

@@ -206,8 +206,8 @@ are present in the system.
 
 #### If using a pre-built `asymptote.pdf`
 
-Place `asymptote.pdf` in the directory `<asymptote-repo>/extfiles/`.
-That is, the file `<asymptote-repo>/extfiles/asymptote.pdf` is present.
+Place `asymptote.pdf` in the directory `<asymptote-repo>/asydoc/`.
+That is, the file `<asymptote-repo>/asydoc/asymptote.pdf` is present.
 After that, configure cmake with the preset `msvc/release-with-existing-asymptote-pdf` - that is,
 
 ```powershell

LspCpp/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = [email protected]:vectorgraphics/LspCpp
 	branch = master
-	commit = 220a861ca2bfaf14fa402549ddcf484459f36406
-	parent = f240306af01490de4880237ba21eff585cb07e52
+	commit = d12eab466ee2c9eb8bb8925ec8482e374a880fcc
+	parent = 2c34fbcaf9d487f6fd7a9299649dbc9f76860e83
 	method = merge
 	cmdver = 0.4.9

LspCpp/include/LibLsp/lsp/ClientPreferences.h

@@ -139,10 +139,18 @@ class ClientPreferences
                 return v3supported && isDynamicRegistrationSupported(textDocument.documentHighlight);
         }
 
+        bool isDocumentLinkDynamicRegistered() {
+                return v3supported && isDynamicRegistrationSupported(textDocument.documentLink);
+        }
+
         bool isFoldgingRangeDynamicRegistered() {
                 return v3supported && isDynamicRegistrationSupported(textDocument.foldingRange);
         }
 
+        bool isInlayHintDynamicRegistered() {
+            return v3supported && isDynamicRegistrationSupported(textDocument.inlayHint);
+        }
+
         bool isImplementationDynamicRegistered() {
                 return v3supported && isDynamicRegistrationSupported(textDocument.implementation);
         }

LspCpp/include/LibLsp/lsp/general/lsServerCapabilities.h

@@ -380,6 +380,21 @@ MAKE_REFLECT_STRUCT(SemanticTokensWithRegistrationOptions, legend, range, full,
 
 using  DocumentColorOptions = WorkDoneProgressOptions;
 using  FoldingRangeOptions = WorkDoneProgressOptions;
+
+struct InlayHintOptions : WorkDoneProgressOptions {
+
+    /**
+     * The server provides support to resolve additional
+     * information for an inlay hint item.
+     */
+    optional<bool> resolveProvider;
+
+    MAKE_SWAP_METHOD(InlayHintOptions, workDoneProgress, resolveProvider);
+
+};
+
+MAKE_REFLECT_STRUCT(InlayHintOptions, workDoneProgress, resolveProvider)
+
 struct lsServerCapabilities {
         // Defines how text documents are synced. Is either a detailed structure
         // defining each notification or for backwards compatibility the
@@ -528,6 +543,14 @@ struct lsServerCapabilities {
          optional< std::pair< optional<bool>,
                  optional<StaticRegistrationOptions> > >  monikerProvider;
 
+        /**
+        * The server provides inlay hints.
+        *
+        * @since 3.17.0
+        */
+        optional< std::pair< optional<bool>,
+                optional<InlayHintOptions> > > inlayHintProvider;
+
         optional<lsp::Any> experimental;
 
 

LspCpp/include/LibLsp/lsp/general/lsTextDocumentClientCapabilities.h

@@ -668,6 +668,13 @@ struct lsTextDocumentClientCapabilities {
    //
   optional< DynamicRegistrationCapabilities >  moniker;
 
+  //
+   // Capabilities specific to the `textDocument/inlayHint` request.
+   //
+   // @since 3.17.0
+   //
+  optional< InlayHintClientCapabilities > inlayHint;
+
   MAKE_SWAP_METHOD(lsTextDocumentClientCapabilities,
           synchronization,
           completion,
@@ -687,7 +694,9 @@ struct lsTextDocumentClientCapabilities {
           documentLink, colorProvider,
           rename, publishDiagnostics, foldingRange,
           semanticHighlightingCapabilities, typeHierarchyCapabilities,
-          callHierarchy, selectionRange , linkedEditingRange, semanticTokens, moniker)
+          callHierarchy, selectionRange , linkedEditingRange, semanticTokens, moniker,
+          inlayHint
+  )
 };
 
 
@@ -710,4 +719,6 @@ MAKE_REFLECT_STRUCT(lsTextDocumentClientCapabilities,
         documentLink, colorProvider,
         rename, publishDiagnostics, foldingRange,
         semanticHighlightingCapabilities, typeHierarchyCapabilities,
-        callHierarchy, selectionRange, linkedEditingRange, semanticTokens, moniker)
+        callHierarchy, selectionRange, linkedEditingRange, semanticTokens, moniker,
+        inlayHint
+)

LspCpp/include/LibLsp/lsp/general/lsWorkspaceClientCapabilites.h

@@ -98,6 +98,25 @@ MAKE_REFLECT_STRUCT(DynamicRegistrationCapabilities,
         dynamicRegistration);
 
 
+struct InlayHintLazyProperties {
+    optional< std::vector<std::string> > properties;
+
+    MAKE_SWAP_METHOD(InlayHintLazyProperties, properties)
+};
+
+MAKE_REFLECT_STRUCT(InlayHintLazyProperties, properties)
+
+struct InlayHintClientCapabilities {
+    // Whether inlay hints support dynamic registration.
+    optional<bool> dynamicRegistration;
+
+    optional< InlayHintLazyProperties > resolveSupport;
+
+    MAKE_SWAP_METHOD(InlayHintClientCapabilities, dynamicRegistration, resolveSupport);
+
+};
+
+MAKE_REFLECT_STRUCT(InlayHintClientCapabilities, dynamicRegistration, resolveSupport)
 
 // Workspace specific client capabilities.
 struct SymbolKindCapabilities

LspCpp/include/LibLsp/lsp/textDocument/document_link.h

@@ -2,7 +2,9 @@
 
 #include "LibLsp/JsonRpc/RequestInMessage.h"
 #include "LibLsp/JsonRpc/lsResponseMessage.h"
-
+#include "LibLsp/lsp/lsTextDocumentIdentifier.h"
+#include "LibLsp/lsp/lsRange.h"
+#include "LibLsp/lsp/lsAny.h"
 
 namespace TextDocumentDocumentLink  {