Merge branch 'topic/gs.522.formatting_provider' into 'master'

Revamp the source editor formatting provider

See merge request eng/ide/gnatstudio!849

Author: AdrienBoulanger

ada_module/ui/src/ada_module.adb

@@ -70,8 +70,7 @@ package body Cpp_Module is
                   Align_On_Arrows     => False,
                   Align_Decl_On_Colon => False,
                   Indent_Comments     => C_Indent_Comments.Get_Pref,
-                  Stick_Comments      => False,
-                  On_New_Line         => C_Action_On_New_Line.Get_Pref);
+                  Stick_Comments      => False);
 
    begin
       Set_Indentation_Parameters (C_Lang, Params, Style);
@@ -168,16 +167,6 @@ package body Cpp_Module is
          Doc     => -"Indent lines with only comments.",
          Label   => -"Indent comments");
 
-      C_Action_On_New_Line := Action_On_New_Line_Preferences.Create
-        (Manager,
-         Path    => -"Editor/C & C++:Indentation",
-         Name    => "C-Action-On-New-Line",
-         Default => Format,
-         Doc     =>
-           -"Decide if GNAT Studio should just indent when adding" &
-           " a new line or if it should also format the current line.",
-         Label   => -"Action on new line");
-
       Hook := new On_Pref_Changed;
       Preferences_Changed_Hook.Add (Hook);
       Hook.Execute (Kernel, null);

cpp_module/src/cpp_module.adb

@@ -40,6 +40,5 @@ package Cpp_Module is
 
    C_Indent_Extra          : Boolean_Preference;
    C_Indent_Comments       : Boolean_Preference;
-   C_Action_On_New_Line    : Action_On_New_Line_Preferences.Preference;
 
 end Cpp_Module;

cpp_module/src/cpp_module.ads

@@ -177,4 +177,4 @@ GPS.LSP.CODE_ACTIONS=yes
 --  Activate DAP debugger for developers
 GPS.DEBUGGING.DAP_MODULE=yes
 MODULE.Debugger_DAP=yes
-GPS.DAP.IN_OUT=yes
+GPS.DAP.IN_OUT=yes

gnatstudio/.gnatdebug

@@ -174,6 +174,7 @@ with Scenario_Views;
 with Shell_Script;
 with Socket_Module;
 with Src_Editor_Module;
+with Src_Editor_Module.Construct_Formatter;
 with Switches_Chooser.Scripts;
 with Toolchains_Editor;
 with VCS2.Module;
@@ -1164,6 +1165,9 @@ procedure GPS.Main is
       end Load_Sources;
 
    begin
+      --  Freeze the preferences to avoid overwriting preferences.xml too early
+      Freeze_Preferences (GPS_Main.Kernel);
+
       Update_Splash_Progress_Label ("Loading modules...");
 
       --  Register the Learn module and the associated view
@@ -1271,6 +1275,7 @@ procedure GPS.Main is
       --  to access marks that are handled by this module.
 
       Src_Editor_Module.Register_Module (GPS_Main.Kernel);
+      Src_Editor_Module.Construct_Formatter.Register_Module (GPS_Main.Kernel);
 
       --  Initialize the outline view
 
@@ -1288,6 +1293,10 @@ procedure GPS.Main is
 
       GPS.LSP_Module.Register_Module (GPS_Main.Kernel);
 
+      --  Create the Formatter provider preferences
+
+      Src_Editor_Module.Create_Preferences (GPS_Main.Kernel);
+
       --  Initialize the ada semantic tree module
 
       Ada_Semantic_Tree_Module.Register_Module
@@ -1590,6 +1599,7 @@ procedure GPS.Main is
       GPS.Traces.Register_Module (GPS_Main.Kernel);
 
       Load_Preferences (GPS_Main.Kernel);
+      Thaw_Preferences (GPS_Main.Kernel);
 
       Update_Splash_Progress_Label ("Loading project...");