Merge remote branch 'origin/master' into edge

Author: automatic-merge

.gitlab-ci.yml

@@ -6,7 +6,7 @@ stages:
   - build_and_test
 
 .detect-branches:
-  #  Version 1.
+  #  Version 2.
   #  Detects source and target branches. Checkout necessary branch for
   #  repository when run downstream pipeline is detected.
   #    ACI_SOURCE_BRANCH is set to source branch (merge request, pull)
@@ -47,10 +47,18 @@ stages:
 
   #  On downstream pipeline checkout the necessary branch
   - if [[ "$CI_PIPELINE_SOURCE" == 'pipeline' ]]; then
-       if `git -C $CI_PROJECT_DIR show-ref $ACI_SOURCE_BRANCH > /dev/null`; then
-        git -C $CI_PROJECT_DIR checkout $ACI_SOURCE_BRANCH;
-      elif `git -C $CI_PROJECT_DIR show-ref $ACI_TARGET_BRANCH > /dev/null`; then
-        git -C $CI_PROJECT_DIR checkout $ACI_TARGET_BRANCH;
+      if git -C "$CI_PROJECT_DIR" show-ref --quiet -- "$ACI_SOURCE_BRANCH"; then
+        git -C "$CI_PROJECT_DIR" checkout "$ACI_SOURCE_BRANCH";
+      elif git -C "$CI_PROJECT_DIR" ls-remote --exit-code -- origin "$ACI_SOURCE_BRANCH"; then
+        git -C "$CI_PROJECT_DIR" config remote.origin.fetch "+refs/heads/$ACI_SOURCE_BRANCH:refs/remotes/origin/$ACI_SOURCE_BRANCH";
+        git -C "$CI_PROJECT_DIR" remote update;
+        git -C "$CI_PROJECT_DIR" checkout "$ACI_SOURCE_BRANCH";
+      elif git -C "$CI_PROJECT_DIR" show-ref --quiet -- "$ACI_TARGET_BRANCH"; then
+        git -C "$CI_PROJECT_DIR" checkout "$ACI_TARGET_BRANCH";
+      elif git -C "$CI_PROJECT_DIR" ls-remote --exit-code -- origin "$ACI_TARGET_BRANCH"; then
+        git -C "$CI_PROJECT_DIR" config remote.origin.fetch "+refs/heads/$ACI_TARGET_BRANCH:refs/remotes/origin/$ACI_TARGET_BRANCH";
+        git -C "$CI_PROJECT_DIR" remote update;
+        git -C "$CI_PROJECT_DIR" checkout "$ACI_TARGET_BRANCH";
       fi
     fi
 

source/ada/lsp-ada_driver.adb

@@ -337,6 +337,9 @@ begin
       Register_Commands;
    end if;
 
+   Ada.Text_IO.Set_Output (Ada.Text_IO.Standard_Error);
+   --  Protect stdout from pollution by accidental Put_Line calls
+
    Server.Initialize (Stream'Unchecked_Access);
 
    begin

source/client/lsp-raw_clients.adb

@@ -29,9 +29,6 @@ with Spawn.Processes; use Spawn.Processes;
 
 package body LSP.Raw_Clients is
 
-   Parse_Exception : exception;
-   --   Local exception raised when parsing invalid data
-
    New_Line : constant String :=
      (Ada.Characters.Latin_1.CR, Ada.Characters.Latin_1.LF);
 
@@ -267,8 +264,11 @@ package body LSP.Raw_Clients is
       use Ada.Strings.Fixed;
 
       procedure Parse_Headers
-        (Buffer : String; Content_Length : out Positive);
-      --  Parse headers in Buffer and return Content-Length
+        (Buffer         : String;
+         Content_Length : out Positive;
+         Success        : out Boolean);
+      --  Parse headers in Buffer and return Content-Length.
+      --  Return Success = False if encounter an unexpected header.
 
       Client : Raw_Clients.Raw_Client'Class renames Self.Client.all;
 
@@ -278,7 +278,8 @@ package body LSP.Raw_Clients is
 
       procedure Parse_Headers
         (Buffer         : String;
-         Content_Length : out Positive)
+         Content_Length : out Positive;
+         Success        : out Boolean)
       is
          function Skip (Pattern : String) return Boolean;
          --  Find Pattern in current position of Buffer and skip it
@@ -303,7 +304,9 @@ package body LSP.Raw_Clients is
          end Skip;
 
       begin
-         while Next < Buffer'Last loop
+         Success := True;
+
+         while Success and Next < Buffer'Last loop
             if Skip ("Content-Type: ") then
                Next := Index (Buffer, New_Line);
                pragma Assert (Next /= 0);
@@ -316,7 +319,8 @@ package body LSP.Raw_Clients is
                   Content_Length := Positive'Value (Buffer (From .. Next - 1));
                end;
             else
-               raise Parse_Exception with "Unexpected header:" & Buffer;
+               Next := Index (Buffer, New_Line);
+               Success := False;
             end if;
 
             Next := Next + New_Line'Length;
@@ -346,24 +350,21 @@ package body LSP.Raw_Clients is
                   Start := Index (Client.Buffer, New_Line & New_Line);
 
                   if Start /= 0 then
-                     begin
-                        Parse_Headers
-                          (Slice (Client.Buffer, 1, Start + 1),
-                           Client.To_Read);
-                        Delete
-                          (Client.Buffer, 1, Start + 2 * New_Line'Length - 1);
-                     exception
-                        when E : Parse_Exception =>
-                           Client.On_Exception (E);
-                           --  Delete the first line
-                           Start :=
-                             Index (Client.Buffer,
-                                    "" & Ada.Characters.Latin_1.LF);
-                           Delete
-                             (Client.Buffer, 1, Start);
-                           --  Reset start to 0 => we didn't find a header
-                           Start := 0;
-                     end;
+                     Parse_Headers
+                       (Slice (Client.Buffer, 1, Start + 1),
+                        Client.To_Read,
+                        Success);
+
+                     if not Success then
+                        Client.On_Error
+                          ("Unable to parse:" &
+                             Slice (Client.Buffer, 1, Start + 1));
+                        --  Notify upstream and try to recover by dropping the
+                        --  headers block.
+                     end if;
+
+                     Delete
+                       (Client.Buffer, 1, Start + 2 * New_Line'Length - 1);
                   end if;
                end if;