Merge branch 'onTypeFormatting_edge' into 'edge'

Add onTypeFormatting request initial implementation

See merge request eng/ide/ada_language_server!1229

Author: joaopsazevedo

.vscode/settings.json.tmpl

@@ -5,6 +5,11 @@
       // ada_language_server executable after relaction into the VS Code
       // extension.
       "LIBRARY_TYPE": "static"
+   "ada.onTypeFormatting.indentOnly": true,
+   "[ada]": {
+      "editor.autoIndent": "none",
+      "editor.formatOnType": false,
+      "editor.tabSize": 3
    },
    "python.analysis.extraPaths": ["testsuite"],
    "python.linting.enabled": true,

doc/settings.md

@@ -47,6 +47,7 @@ Ada Language Server understands these settings:
  * [foldComments](#foldComments)
  * [followSymlinks](#followSymlinks)
  * [documentationStyle](#documentationStyle)
+ * [onTypeFormatting.indentOnly](#onTypeFormatting.indentOnly)
 
 ----
 
@@ -214,4 +215,10 @@ For more information about documentation styles see GNATdoc User's Manual.
 ## trace.server
 
 This option controls the tracing of the communication between VSCode and the Ada language server.
-The separate setting `gpr.trace.server` controls tracing for GPR language server.
+The separate setting `gpr.trace.server` controls tracing for GPR language server.
+
+## onTypeFormatting.indentOnly
+
+This option controls if the `textDocument/onTypeFormatting` request only indents a new line, or if
+it additionally tries to format the previous node. By default, this option is enabled, that is,
+`textDocument/onTypeFormatting` only indents new lines.

integration/vscode/ada/package.json

@@ -401,7 +401,13 @@
                         "scope": "resource",
                         "type": "boolean",
                         "default": false,
-                        "description": "Enable editing Ada comments while executing `textDocument/rename` reques."
+                        "description": "Enable editing Ada comments while executing `textDocument/rename` request."
+                    },
+                    "ada.onTypeFormatting.indentOnly": {
+                        "scope": "resource",
+                        "type": "boolean",
+                        "default": true,
+                        "description": "Controls if the `textDocument/onTypeFormatting` request only indents a new line, or if it additionally tries to format the previous node."
                     }
                 }
             }

scripts/generate.py

@@ -295,6 +295,8 @@
      'DocumentFormattingParams', 'Formatting_Response'),
     ('textDocument/rangeFormatting', 'Range_Formatting',
      'DocumentRangeFormattingParams', 'Range_Formatting_Response'),
+    ('textDocument/onTypeFormatting', 'On_Type_Formatting',
+     'DocumentOnTypeFormattingParams', 'On_Type_Formatting_Response'),
     ('textDocument/selectionRange', 'Selection_Range',
      'SelectionRangeParams', 'SelectionRange_Response'),
     ('textDocument/semanticTokens/full', 'Document_Tokens_Full',

source/ada/lsp-ada_documents.adb

@@ -35,7 +35,6 @@ with Libadalang.Sources;
 with Libadalang.Iterators;
 
 with Laltools.Common;
-with Laltools.Partial_GNATPP;
 
 with VSS.Strings.Character_Iterators;
 with VSS.Strings.Line_Iterators;
@@ -919,6 +918,22 @@ package body LSP.Ada_Documents is
       end;
    end Diff_Symbols;
 
+   ---------------------------
+   -- Get_Formatting_Region --
+   ---------------------------
+
+   function Get_Formatting_Region
+     (Self     : Document;
+      Context  : LSP.Ada_Contexts.Context;
+      Position : LSP.Messages.Position)
+      return Laltools.Partial_GNATPP.Formatting_Region_Type
+   is (Laltools.Partial_GNATPP.Get_Formatting_Region
+        (Unit        => Self.Unit (Context),
+         Input_Range =>
+           Langkit_Support.Slocs.Make_Range
+             (Self.Get_Source_Location (Position),
+              Self.Get_Source_Location (Position))));
+
    ----------------
    -- Formatting --
    ----------------
@@ -1628,6 +1643,24 @@ package body LSP.Ada_Documents is
       end if;
    end Line_Terminator;
 
+   ---------------------
+   -- Get_Indentation --
+   ---------------------
+
+   function Get_Indentation
+     (Self     : Document;
+      Context  : LSP.Ada_Contexts.Context;
+      Line     : LSP.Types.Line_Number)
+      return Natural
+   is
+      Unit        : constant Libadalang.Analysis.Analysis_Unit :=
+        Self.Unit (Context);
+      Line_Number : constant Langkit_Support.Slocs.Line_Number :=
+        Self.Get_Source_Location (LSP.Messages.Position'(Line, 1)).Line;
+   begin
+      return Laltools.Partial_GNATPP.Estimate_Indentation (Unit, Line_Number);
+   end Get_Indentation;
+
    -----------------
    -- Get_Node_At --
    -----------------

source/ada/lsp-ada_documents.ads

@@ -26,6 +26,7 @@ private with VSS.Strings.Markers;
 with Libadalang.Analysis;
 with Libadalang.Common;
 with Langkit_Support.Slocs;
+with Laltools.Partial_GNATPP;
 
 with GNATCOLL.Traces;
 
@@ -134,10 +135,17 @@ package LSP.Ada_Documents is
       Result   : out LSP.Messages.Symbol_Vector);
    --  Populate Result with a symbol hierarchy from the document.
 
+   function Get_Indentation
+     (Self    : Document;
+      Context : LSP.Ada_Contexts.Context;
+      Line    : LSP.Types.Line_Number)
+      return Natural;
+   --  Estimates the indention a line should have
+
    function Get_Node_At
-     (Self      : Document;
-      Context   : LSP.Ada_Contexts.Context;
-      Position  : LSP.Messages.Position)
+     (Self     : Document;
+      Context  : LSP.Ada_Contexts.Context;
+      Position : LSP.Messages.Position)
       return Libadalang.Analysis.Ada_Node;
    --  Get Libadalang Node for given position in the document.
 
@@ -190,6 +198,14 @@ package LSP.Ada_Documents is
    --  Populate Result with code folding blocks in the document. If Lines_Only
    --  is True does not return characters positions in lines.
 
+   function Get_Formatting_Region
+     (Self     : Document;
+      Context  : LSP.Ada_Contexts.Context;
+      Position : LSP.Messages.Position)
+      return Laltools.Partial_GNATPP.Formatting_Region_Type;
+   --  Given Position, get the region that would be formatted if
+   --  Range_Formatting was called.
+
    function Formatting
      (Self     : Document;
       Context  : LSP.Ada_Contexts.Context;