Merge branch 'topic/stable_bump_20230807' into 'master'

Merge edge into master

See merge request eng/ide/ada_language_server!1279

Author: setton

.vscode/launch.json

@@ -21,7 +21,7 @@
             "!**/node_modules/**"
          ],
          "args": [
-            "--extensionDevelopmentPath=${workspaceFolder}/integration/vscode/ada",
+            "--extensionDevelopmentPath=${workspaceFolder}/integration/vscode/ada"
 
             // It is useful to have workspace available for local debugging. The
             // following one is provided within the repository with test folders
@@ -34,7 +34,6 @@
             // So you can checkout a second copy of the ALS repository under
             // ../als-rt and use it with the following line.
             // "${workspaceFolder}/../als-rt"
-            "${workspaceFolder}/integration/vscode/ada/test/TestWorkspace"
          ],
          "preLaunchTask": "npm: compile",
          "env": {
@@ -47,40 +46,7 @@
          }
       },
       {
-         "name": "Extension Tests",
-         "type": "extensionHost",
-         "request": "launch",
-         "runtimeExecutable": "${execPath}",
-         "outFiles": [
-            "${workspaceFolder}/integration/vscode/ada/out/**/*.js",
-            "!**/node_modules/**"
-         ],
-         "args": [
-            "--extensionDevelopmentPath=${workspaceFolder}/integration/vscode/ada",
-            "--extensionTestsPath=${workspaceFolder}/integration/vscode/ada/out/test/suite/index",
-            "${workspaceFolder}/integration/vscode/ada/test/TestWorkspace"
-         ],
-         // Below we make the executables of node modules visible to the tests.
-         // In particular, vscode-tmgrammar-snap is used for syntax highlighting
-         // tests.
-         "env": {
-            // This is necessary to make the "child" vscode inherit the PATH
-            // variable set in the workspace settings. Without it in some setups
-            // (e.g. vscode remote) the child vscode does not get visibility
-            // over the Ada toolchain available in the parent vscode
-            // environment.
-            "PATH": "${env:PATH}",
-            // This is custom env var that we use in
-            // integration/vscode/ada/test/suite/index.ts to prevent timeouts in
-            // tests when debugging
-            "MOCHA_TIMEOUT": "0"
-         },
-         "preLaunchTask": "npm: pretest",
-         // Switch to Debug Console to see test results
-         "internalConsoleOptions": "openOnSessionStart"
-      },
-      {
-         "name": "Extension Tests (Update Test Refs)",
+         "name": "Highlighting Tests (Update Test Refs)",
          "type": "extensionHost",
          "request": "launch",
          "runtimeExecutable": "${execPath}",
@@ -136,7 +102,7 @@
          ],
          "args": [
             "--extensionDevelopmentPath=${workspaceFolder}/integration/vscode/ada",
-            "--extensionTestsPath=${workspaceFolder}/integration/vscode/ada/out/test/suite/index",
+            "--extensionTestsPath=${workspaceFolder}/integration/vscode/ada/out/test/suite/highlighting/index",
             "${workspaceFolder}/integration/vscode/ada/test/TestWorkspace"
          ],
          // Below we make the executables of node modules visible to the tests.

.vscode/settings.json.tmpl

@@ -5,6 +5,11 @@
       // ada_language_server executable after relocation 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,

README.md

@@ -76,6 +76,8 @@ To build the language server you need:
 * The [gnatdoc](https://github.com/AdaCore/gnatdoc) library
 * The [gpr](https://github.com/AdaCore/gpr) library
 * The process [spawn](https://github.com/AdaCore/spawn) library
+* The [lal-refactor](https://github.com/AdaCore/lal-refactor) library
+* The [templates-parser](https://github.com/AdaCore/templates-parser) library
 
 Project files of the libraries must be available via the `GPR_PROJECT_PATH`
 environment variable.

doc/object_dir.md

@@ -0,0 +1,26 @@
+# Object Directory
+
+## Short introduction
+
+This is a custom request used by the VS Code extension to retrieve the Object Directory from the GPR project file, allowing us to get the path to the object directory currently in use.
+
+## Change description
+
+We introduce a new type to represent the request results:
+
+```typescript
+
+type ObjDirResponse = {
+    Value : string;
+};
+
+```
+
+And a new request:
+
+  method: `$/glsObjectDir`
+  params: null
+
+Returning the project file of the loaded project like this:
+
+  result: `ObjDirResponse`

doc/project_file.md

@@ -0,0 +1,25 @@
+# Project File
+
+## Short introduction
+
+This is a custom request used by the VS Code extension to retrieve the GPR project file uploaded by the ALS, allowing us to get the path to the project file currently in use.
+
+## Change description
+
+We introduce a new type to represent the request results:
+
+```typescript
+
+export type ProjectFileResponse = {
+    Value : string;  // The Path to the GPR project file
+};
+```
+
+And a new request:
+
+  method: `$/glsProjectFile`
+  params: null
+
+Returning the project file of the loaded project like this:
+
+  result: `ProjectFileResponse`

doc/refactoring_tools.md

@@ -38,7 +38,7 @@
 * The new parameter type is infered when only the name is provided.
 * The new parameter location is infered from the cursor position.
 
-[Source](https://github.com/AdaCore/libadalang-tools/blob/master/src/laltools-refactor-subprogram_signature.ads)
+[Source](https://github.com/AdaCore/lal-refactor/blob/main/src/lal_refactor-subprogram_signature.ads)
 
 [Demo Source](../integration/vscode/Code%20Samples/refactoring_demos/add_parameter/)
 
@@ -50,7 +50,7 @@
 * All subprogram specs are updated.
 * Actual parameter is removed from the subprogram calls.
 
-[Source](https://github.com/AdaCore/libadalang-tools/blob/master/src/laltools-refactor-subprogram_signature-remove_parameter.ads)
+[Source](https://github.com/AdaCore/lal-refactor/blob/main/src/lal_refactor-subprogram_signature-remove_parameter.ads)
 
 [Demo Source](../integration/vscode/Code%20Samples/refactoring_demos/remove_parameter)
 
@@ -62,7 +62,7 @@
 * All subprogram specs are updated.
 * Actual parameter are moved in the subprogram calls when needed.
 
-[Source](https://github.com/AdaCore/libadalang-tools/blob/master/src/laltools-refactor-subprogram_signature.ads)
+[Source](https://github.com/AdaCore/lal-refactor/blob/main/src/lal_refactor-subprogram_signature.ads)
 
 [Demo Source](../integration/vscode/Code%20Samples/refactoring_demos/move_parameter)
 
@@ -73,7 +73,7 @@
 * Changes the parameter mode within a subprogram spec.
 * All subprogram specs are updated.
 
-[Source](https://github.com/AdaCore/libadalang-tools/blob/master/src/laltools-refactor-subprogram_signature.ads)
+[Source](https://github.com/AdaCore/lal-refactor/blob/main/src/lal_refactor-subprogram_signature.ads)
 
 [Demo Source](../integration/vscode/Code%20Samples/refactoring_demos/change_parameter_mode)
 
@@ -85,7 +85,7 @@
 * Only subtype indications with correct syntax are accepted.
 * All subprogram specs are updated.
 
-[Source](https://github.com/AdaCore/libadalang-tools/blob/master/src/laltools-refactor-subprogram_signature-change_parameters_type.ads)
+[Source](https://github.com/AdaCore/lal-refactor/blob/main/src/lal_refactor-subprogram_signature-change_parameters_type.ads)
 
 [Demo Source](../integration/vscode/Code%20Samples/refactoring_demos/change_parameter_type)
 
@@ -97,7 +97,7 @@
 * Only default value expressions with correct syntax are accepted.
 * All subprogram specs are updated.
 
-[Source](https://github.com/AdaCore/libadalang-tools/blob/master/src/laltools-refactor-subprogram_signature-change_parameters_defualt_value.ads)
+[Source](https://github.com/AdaCore/lal-refactor/blob/main/src/lal_refactor-subprogram_signature-change_parameters_default_value.ads)
 
 [Demo Source](../integration/vscode/Code%20Samples/refactoring_demos/change_parameter_default_value)
 
@@ -110,7 +110,7 @@
 * Local declarations of for loop and exception handlers are passed to the extracted subprogram as new parameters.
 * Extract function is available is the last statment is either an assignment or a return statment.
 
-[Source](https://github.com/AdaCore/libadalang-tools/blob/master/src/laltools-refactor-extract_subprogram.ads)
+[Source](https://github.com/AdaCore/lal-refactor/blob/main/src/lal_refactor-extract_subprogram.ads)
 
 [Demo Source](../integration/vscode/Code%20Samples/refactoring_demos/extract_subprogram)
 
@@ -121,7 +121,7 @@
 * Moves a declaration and its dependent declarations to their parent declarative part.
 * When pulling up a subprogram, object declaration are not pulled up. Instead, they're added as formal parameters to the subprogram specification and as actual parameters to the subprogram calls.
 
-[Source](https://github.com/AdaCore/libadalang-tools/blob/master/src/laltools-refactor-pull_up_declaration.ads)
+[Source](https://github.com/AdaCore/lal-refactor/blob/main/src/lal_refactor-pull_up_declaration.ads)
 
 [Demo Source](../integration/vscode/Code%20Samples/refactoring_demos/pull_up_declaration)
 
@@ -133,7 +133,7 @@
 * Use clauses in the separate subunit are moved to the subprogram's declarative part to avoid namespace collisions.
 * .bak is added to the separate subunit source filename.
 
-[Source](https://github.com/AdaCore/libadalang-tools/blob/master/src/laltools-refactor-suppress_separate.ads)
+[Source](https://github.com/AdaCore/lal-refactor/blob/main/src/lal_refactor-suppress_separate.ads)
 
 [Demo Source](../integration/vscode/Code%20Samples/refactoring_demos/suppress_separate)
 
@@ -145,7 +145,7 @@
 * All references of the object declaration or expression are replaced by the introduced parameter.
 * The user must mannually fix the calls to the subprogram that was refactored by addings the corresponding actual parameter.
 
-[Source](https://github.com/AdaCore/libadalang-tools/blob/master/src/laltools-refactor-introduce_parameter.ads)
+[Source](https://github.com/AdaCore/lal-refactor/blob/main/src/lal_refactor-introduce_parameter.ads)
 
 [Demo Source](../integration/vscode/Code%20Samples/refactoring_demos/introduce_parameter)
 
@@ -155,7 +155,7 @@
 
 * Replaces a type in the intire project by another type provided by the user.
 
-[Source](https://github.com/AdaCore/libadalang-tools/blob/master/src/laltools-refactor-replace_type.ads)
+[Source](https://github.com/AdaCore/lal-refactor/blob/main/src/lal_refactor-replace_type.ads)
 
 [Demo Source](../integration/vscode/Code%20Samples/refactoring_demos/replace_type)
 
@@ -165,7 +165,7 @@
 
 * For an unresolved name, suggests all packages that can be imported and prefix to be added so that that the name gets resolved.
 
-[Source](https://github.com/AdaCore/libadalang-tools/blob/master/src/laltools-refactor_imports.ads)
+[Source](https://github.com/AdaCore/lal-refactor/blob/main/src/lal_refactor-refactor_imports.ads)
 
 [Demo Source](../integration/vscode/Code%20Samples/refactoring_demos/auto_import)
 
@@ -175,7 +175,7 @@
 
 * Sorts all with and use clauses and their associated pragmas.
 
-[Source](https://github.com/AdaCore/libadalang-tools/blob/master/src/laltools-refactor-sort_dependencies.ads)
+[Source](https://github.com/AdaCore/lal-refactor/blob/main/src/lal_refactor-sort_dependencies.ads)
 
 [Demo Source](../integration/vscode/Code%20Samples/refactoring_demos/sort_dependencies)
 

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.

gnat/lsp_server.gpr

@@ -18,6 +18,7 @@
 with "gpr2.gpr";
 with "libadalang";
 with "lal_tools.gpr";
+with "lal_refactor.gpr";
 with "ada_libfswatch.gpr";
 with "libgnatdoc.gpr";
 with "spawn.gpr";