Merge branch 'topic/stable_bump' into 'master'

Bump edge to master

Closes #1675

See merge request eng/ide/ada_language_server!2028

Author: AnthonyLeonardoGracio

README.md

@@ -69,6 +69,7 @@ extension at
     - [Integration with Neovim's built-in LSP client](#integration-with-neovims-built-in-lsp-client)
     - [Integration with emacs lsp-mode](#integration-with-emacs-lsp-mode)
     - [Integration with QtCreator](#integration-with-qtcreator)
+    - [Integration with IntelliJ](#integration-with-intellij)
   - [Refactoring Tools](#refactoring-tools)
   - [Authors \& Contributors](#authors--contributors)
   - [Contribute](#contribute)
@@ -601,6 +602,13 @@ the Ada Language Server.
 
 Workspace-specific [ALS Settings](doc/settings.md) such as the `projectFile` can be provided in a `.als.json` file at the root of the workspace.
 
+### Integration with IntelliJ
+
+The [LSP4IJ](https://plugins.jetbrains.com/plugin/23257-lsp4ij) IntelliJ plugin
+provides a template for Ada since version `0.14.0`, allowing users tu use the Ada Language Server from IntelliJ.
+
+Follow the [dedicated LSP4J documentation](https://github.com/redhat-developer/lsp4ij/blob/main/docs/user-defined-ls/ada_language_server.md) for more information.
+
 ## Refactoring Tools
 
 See [corresponding document](doc/refactoring_tools.md).

source/ada/lsp-utils.adb

@@ -24,6 +24,7 @@ with Libadalang.Sources;
 with Langkit_Support.Diagnostics;
 with Langkit_Support.Symbols;
 with Langkit_Support.Token_Data_Handlers;
+with Langkit_Support.Types;
 with Pp.Actions;
 
 with VSS.Strings.Character_Iterators;
@@ -202,7 +203,7 @@ package body LSP.Utils is
 
       procedure Tokenize_Output is
          Input : constant Libadalang.Lexer.Lexer_Input :=
-           (Kind     => Libadalang.Common.Bytes_Buffer,
+           (Kind     => Langkit_Support.Types.Bytes_Buffer,
             Charset  => Ada.Strings.Unbounded.To_Unbounded_String ("utf-8"),
             Read_BOM => False,
             Bytes    => To_Unbounded_String (Output));