Merge branch 'topic/vadim/lsp317' into 'master'

Reorganization of project files and source code.

See merge request eng/ide/ada_language_server!1618

Author: godunko

gnat/lsp.gpr

@@ -12,8 +12,8 @@ with "lsp_common";
 project LSP is
 
    for Source_Dirs use
-     ("../source/protocol", 
-      "../source/protocol/generated");
+     ("../liblsp_3_16/source/",
+      "../liblsp_3_16/source/generated/");
    for Object_Dir use "../.obj/" & LSP_Common.Superproject & "/lsp";
 
    package Compiler renames LSP_Common.Compiler;

gnat/lsp_3_17.gpr

@@ -10,8 +10,8 @@ with "lsp_common";
 project LSP_3_17 is
 
    for Source_Dirs use
-     ("../source/lsp_3.17",
-      "../source/lsp_3.17/generated");
+     ("../liblsp_3_17/source/",
+      "../liblsp_3_17/source/generated/");
    for Object_Dir use "../.obj/" & LSP_Common.Superproject & "/lsp_317";
 
    package Compiler extends LSP_Common.Compiler is

gnat/lsp_base.gpr

@@ -11,26 +11,11 @@ with "lsp_common";
 
 project LSP_Base is
 
-   for Source_Dirs use
-     ("../source/common",
-      "../source/uri");
+   for Source_Dirs use ("../liblsp_base/source/");
    for Object_Dir use "../.obj/" & LSP_Common.Superproject & "/lsp_base";
 
    package Compiler renames LSP_Common.Compiler;
 
-   package Naming is
-      case LSP_Common.OS_API is
-         when "Windows_NT" =>
-            for Implementation ("LSP.Stdio_Streams.Initialize")
-              use "lsp-stdio_streams-init_windows.adb";
-
-         when others =>
-            for Implementation ("LSP.Stdio_Streams.Initialize")
-              use "lsp-stdio_streams-init_others.adb";
-
-      end case;
-   end Naming;
-
    package Pretty_Printer renames LSP_Common.Pretty_Printer;
 
 end LSP_Base;

gnat/lsp_server.gpr

@@ -1,19 +1,8 @@
-------------------------------------------------------------------------------
---                         Language Server Protocol                         --
---                                                                          --
---                     Copyright (C) 2018-2023, AdaCore                     --
---                                                                          --
--- This is free software;  you can redistribute it  and/or modify it  under --
--- terms of the  GNU General Public License as published  by the Free Soft- --
--- ware  Foundation;  either version 3,  or (at your option) any later ver- --
--- sion.  This software is distributed in the hope  that it will be useful, --
--- but WITHOUT ANY WARRANTY;  without even the implied warranty of MERCHAN- --
--- TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public --
--- License for  more details.  You should have  received  a copy of the GNU --
--- General  Public  License  distributed  with  this  software;   see  file --
--- COPYING3.  If not, go to http://www.gnu.org/licenses for a complete copy --
--- of the license.                                                          --
-------------------------------------------------------------------------------
+--
+--  Copyright (C) 2018-2024, AdaCore
+--
+--  SPDX-License-Identifier: Apache-2.0
+--
 
 with "gpr2.gpr";
 with "libadalang";
@@ -24,6 +13,7 @@ with "libgnatdoc.gpr";
 with "spawn.gpr";
 
 with "lsp_3_17";
+with "lsp_common";
 
 project LSP_Server is
 
@@ -41,6 +31,7 @@ project LSP_Server is
    for Source_Dirs use
      ("../source/server",
       "../source/ada",
+      "../source/common",
       "../source/gpr",
       "../source/ada/generated",
       "../source/memory");
@@ -49,6 +40,19 @@ project LSP_Server is
    for Main use ("lsp-ada_driver.adb");
    for Languages use ("Ada", "C++");
 
+   package Naming is
+      case LSP_Common.OS_API is
+         when "Windows_NT" =>
+            for Implementation ("LSP.Stdio_Streams.Initialize")
+              use "lsp-stdio_streams-init_windows.adb";
+
+         when others =>
+            for Implementation ("LSP.Stdio_Streams.Initialize")
+              use "lsp-stdio_streams-init_others.adb";
+
+      end case;
+   end Naming;
+
    package Compiler is
       for Default_Switches ("Ada") use
         LSP_3_17.Compiler'Default_Switches ("Ada");

liblsp_3_16/.gitignore

@@ -0,0 +1,4 @@
+/.objs/
+/.libs/
+/alire/
+/config/

liblsp_3_16/alire.toml

@@ -0,0 +1,24 @@
+name = "liblsp_3_16"
+description = "Language Server Protocol Support, Version 3.16"
+version = "0.1.0-dev"
+
+authors = ["Vadim Godunko"]
+maintainers = ["Vadim Godunko <[email protected]>"]
+maintainers-logins = ["godunko"]
+licenses = "Apache-2.0"
+website = ""
+tags = ["lsp"]
+
+project-files = ["../gnat/lsp.gpr"]
+
+[configuration]
+generate_ada = false
+generate_c = false
+generate_gpr = true
+
+[[depends-on]]
+liblsp_base = "*"
+gnatcoll = "*"
+
+[[pins]]
+liblsp_base = { path='../liblsp_base' }

source/protocol/generated/lsp-message_io.adb renamed to liblsp_3_16/source/generated/lsp-message_io.adb

@@ -0,0 +1,4 @@
+/.objs/
+/.libs/
+/alire/
+/config/

source/protocol/generated/lsp-message_io.ads renamed to liblsp_3_16/source/generated/lsp-message_io.ads

@@ -0,0 +1,23 @@
+name = "liblsp_3_17"
+description = "Language Server Protocol Support, Version 3.17"
+version = "0.1.0-dev"
+
+authors = ["Vadim Godunko"]
+maintainers = ["Vadim Godunko <[email protected]>"]
+maintainers-logins = ["godunko"]
+licenses = "Apache-2.0"
+website = ""
+tags = ["lsp"]
+
+project-files = ["../gnat/lsp_3_17.gpr"]
+
+[configuration]
+generate_ada = false
+generate_c = false
+generate_gpr = true
+
+[[depends-on]]
+liblsp_base = "*"
+
+[[pins]]
+liblsp_base = { path='../liblsp_base' }