Merge remote branch 'origin/master' into edge

(no-precommit-check no-tn-check)

Author: mergerepo

.github/workflows/build-binaries.sh

@@ -13,7 +13,6 @@ fi
 export GPR_PROJECT_PATH=$prefix/share/gpr:\
 $PWD/subprojects/VSS/gnat:\
 $PWD/subprojects/gnatdoc/gnat:\
-$PWD/subprojects/gpr-unit-provider:\
 $PWD/subprojects/libadalang-tools/src:\
 $PWD/subprojects/spawn/gnat:\
 $PWD/subprojects/stubs

.github/workflows/build-binaries.yml

@@ -86,11 +86,6 @@ jobs:
         with:
           repository: AdaCore/gnatdoc
           path: subprojects/gnatdoc
-      - name: Get gpr-unit-provider
-        uses: actions/checkout@v2
-        with:
-          repository: AdaCore/gpr-unit-provider
-          path: subprojects/gpr-unit-provider
       - uses: actions/cache@v2
         with:
           path: ./cached_gnat

Makefile

@@ -25,7 +25,6 @@ LIBRARY_TYPE?=relocatable
 
 # Build mode (dev or prod)
 BUILD_MODE=dev
-GPR_UNIT_PROVIDER_BUILD=debug
 
 # Whether to enable coverage (empty for no, any other value for yes)
 COVERAGE=
@@ -51,8 +50,7 @@ else
    EXE=
 endif
 
-LIBRARY_FLAGS=-XGPR_UNIT_PROVIDER_BUILD=$(GPR_UNIT_PROVIDER_BUILD) \
-              -XBUILD_MODE=$(BUILD_MODE)	\
+LIBRARY_FLAGS=-XBUILD_MODE=$(BUILD_MODE)	\
               -XOS=$(OS)			\
               -XLIBRARY_TYPE=$(LIBRARY_TYPE)	\
               -XXMLADA_BUILD=$(LIBRARY_TYPE)	\

README.md

@@ -77,7 +77,6 @@ To build the language server you need:
 * The [VSS](https://github.com/AdaCore/VSS) library
 * The [gnatdoc](https://github.com/AdaCore/gnatdoc) library
 * The [gpr](https://github.com/AdaCore/gpr) library
-* The [gpr-unit-provider](https://github.com/AdaCore/gpr-unit-provider) library
 * The a process [spawn](https://github.com/AdaCore/spawn) library
 
 Project files of the libraries must be available via the `GPR_PROJECT_PATH`

gnat/lsp_server.gpr

@@ -16,7 +16,6 @@
 ------------------------------------------------------------------------------
 
 with "gpr2.gpr";
-with "gpr_unit_provider.gpr";
 with "libadalang";
 with "lal_tools.gpr";
 with "ada_libfswatch.gpr";

source/ada/lsp-ada_completions-names.adb

@@ -128,7 +128,8 @@ package body LSP.Ada_Completions.Names is
                (Is_Dot_Call  => False,
                 Is_Visible   => True,
                 Use_Snippets => Use_Snippets,
-                Pos          => 1));
+                Pos          => 1,
+                Weight       => 0));
             return;
          end if;
       end if;
@@ -174,7 +175,8 @@ package body LSP.Ada_Completions.Names is
                         (Is_Dot_Call (Item),
                          Is_Visible (Item),
                          Use_Snippets,
-                         Completion_Count));
+                         Completion_Count,
+                         Weight (Item)));
                   end if;
                end loop;
             end if;

source/ada/lsp-ada_completions.adb

@@ -99,6 +99,7 @@ package body LSP.Ada_Completions is
                         Is_Dot_Call              => Info.Is_Dot_Call,
                         Is_Visible               => Info.Is_Visible,
                         Pos                      => Info.Pos,
+                        Weight                   => Info.Weight,
                         Completions_Count        => Length));
                end if;
             end;

source/ada/lsp-ada_completions.ads

@@ -43,6 +43,10 @@ package LSP.Ada_Completions is
    --  for completion, since LAL can return several times the same declaration
    --  and specially subprograms from generic instantiations.
 
+   subtype Completion_Item_Weight_Type is Integer range 0 .. 100;
+   --  Type representing the weight returned by LAL for each completion item.
+   --  Used to sort them accordingly on the client-side.
+
    type Name_Information is record
       Is_Dot_Call  : Boolean;
       --  True if we are dealing with a dotted call.
@@ -57,6 +61,9 @@ package LSP.Ada_Completions is
       Pos          : Integer := -1;
       --  The position of the item in the fully computed completion list. Used
       --  for sorting properly the items on client-side.
+
+      Weight : Completion_Item_Weight_Type := 0;
+      --  The completion item's weight. Used for sorting on the client-side.
    end record;
 
    package Completion_Maps is new Ada.Containers.Hashed_Maps

source/ada/lsp-ada_documents.adb

@@ -1838,6 +1838,7 @@ package body LSP.Ada_Documents is
       Is_Dot_Call              : Boolean;
       Is_Visible               : Boolean;
       Pos                      : Integer;
+      Weight                   : Completion_Item_Weight_Type;
       Completions_Count        : Natural)
       return LSP.Messages.CompletionItem
    is
@@ -1860,14 +1861,22 @@ package body LSP.Ada_Documents is
 
       function Get_Sort_Text
         (Base_Label : VSS.Strings.Virtual_String)
-         return VSS.Strings.Virtual_String is
+         return VSS.Strings.Virtual_String
+      is
+         use VSS.Strings;
       begin
          return Sort_Text : VSS.Strings.Virtual_String do
-            if Pos /= -1 then
-               Sort_Text :=
-                 VSS.Strings.Conversions.To_Virtual_String
-                   (GNATCOLL.Utils.Image (Pos, Min_Width => Min_Width));
-            end if;
+
+            Sort_Text :=
+              VSS.Strings.Conversions.To_Virtual_String
+                (GNATCOLL.Utils.Image
+                   (Value     => Completion_Item_Weight_Type'Last - Weight,
+                    Min_Width =>
+                      Completion_Item_Weight_Type'Last'Img'Length - 1)) & "&";
+
+            Sort_Text := Sort_Text &
+              VSS.Strings.Conversions.To_Virtual_String
+              (GNATCOLL.Utils.Image (Pos, Min_Width => Min_Width));
 
             Sort_Text.Append (Base_Label);
 
@@ -2146,7 +2155,8 @@ package body LSP.Ada_Documents is
                (Is_Dot_Call  => False,
                 Is_Visible   => False,
                 Use_Snippets => False,
-                Pos          => <>));
+                Pos          => <>,
+                Weight       => <>));
          end if;
       end Insert;
 

source/ada/lsp-ada_documents.ads

@@ -33,7 +33,7 @@ with GNATCOLL.Traces;
 with Pp.Command_Lines;
 
 limited with LSP.Ada_Contexts;
-with LSP.Ada_Completions;
+with LSP.Ada_Completions; use LSP.Ada_Completions;
 with LSP.Ada_Highlighters;
 with LSP.Diagnostic_Sources;
 with LSP.Messages;
@@ -252,6 +252,7 @@ package LSP.Ada_Documents is
       Is_Dot_Call              : Boolean;
       Is_Visible               : Boolean;
       Pos                      : Integer;
+      Weight                   : Completion_Item_Weight_Type;
       Completions_Count        : Natural)
       return LSP.Messages.CompletionItem;
    --  Compute a completion item.
@@ -264,6 +265,8 @@ package LSP.Ada_Documents is
    --  named notation is used for subprogram completion snippets.
    --  Is_Dot_Call is used to know if we should omit the first parameter
    --  when computing subprogram snippets.
+   --  Weight is used for sorting: items with an higher weight will be placed
+   --  at the top.
    --  Completions_Count is the total number of completion items.
 
    procedure Set_Completion_Item_Documentation