Merge remote branch 'origin/master' into edge

Author: automatic-merge

cli/src/gps-cli.adb

@@ -120,7 +120,7 @@ procedure GPS.CLI is
       if Single_File = null then
          Append (Command, "None, ");
       else
-         Append (Command, """" & Single_File.all & """, ");
+         Append (Command, "r""" & Single_File.all & """, ");
       end if;
 
       if Follow_Closure then
@@ -129,7 +129,7 @@ procedure GPS.CLI is
          Append (Command, "False, ");
       end if;
 
-      Append (Command, """" & Project_Name.all);
+      Append (Command, "r""" & Project_Name.all);
 
       --  Add a ".gpr" if needed
       if not (Project_Name'Length > 3
@@ -139,7 +139,7 @@ procedure GPS.CLI is
          Append (Command, ".gpr");
       end if;
       Append (Command, """, ");
-      Append (Command, """" & Oracle_File.all & """)");
+      Append (Command, "r""" & Oracle_File.all & """)");
 
       --  Launch the Python command
       Script.Execute_Command

gnatdoc/src/gnatdoc-frontend.adb

@@ -2411,7 +2411,7 @@ package body GNATdoc.Frontend is
                   then
                      Update_Scope (Get_Full_View (E));
 
-                  elsif not (Get_Entities (Scope).Contains (E)) then
+                  elsif not Get_Entities (Scope).Contains (E) then
                      Update_Scope;
                   end if;
                end Decorate_Scope;

testsuite/tests/cli.adareducer/test.cmd

@@ -4,8 +4,12 @@ echo ""
 
 echo "## TEST MISSING PROJECT"
 gnatstudio_cli adareducer
-echo ""
 
+# Test that we can accept strings that contain "\U"
+# without Python trying to decode an Unicode char.
+gnatstudio_cli adareducer -P "C:\Users\doesnotexist.gpr" -s "C:\Users\s.sh"
+
+echo ""
 echo "## TEST MISSING ORACLE"
 gnatstudio_cli adareducer -P p
 echo ""

testsuite/tests/cli.adareducer/test.out

@@ -9,6 +9,7 @@ Usage: gnatstudio_cli [switches] [arguments]
 
 ## TEST MISSING PROJECT
 Specify a project with the -P switch
+project C:\Users\doesnotexist.gpr not found
 
 ## TEST MISSING ORACLE
 Specify an oracle with the -s/--oracle_script switch