Skip to content

Commit 5687655

Browse files
author
mergerepo
committed
Merge remote branch 'origin/master' into edge
(no-precommit-check no-tn-check)
2 parents 9d731f4 + 0e1f8f7 commit 5687655

File tree

20 files changed

+604
-143
lines changed

20 files changed

+604
-143
lines changed

‎.github/workflows/build-binaries.sh‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,6 @@ else
5757
export BUILD_MODE=prod
5858
fi
5959

60-
pip install --user subprojects/langkit/
61-
62-
# Python used in GitHub CI on Windows can't understand
63-
# make's notation of absolute path in form of /d/PATH,
64-
# where /d is drive D: Let's use relative path instead
65-
sed -i -e '/langkit/s/.{CURDIR}/../' subprojects/gpr/Makefile
66-
67-
make -C subprojects/gpr setup prefix=$prefix \
68-
GPR2KBDIR=./gprconfig_kb/db ENABLE_SHARED=no \
69-
${DEBUG:+BUILD=debug} build-lib-static install-lib-static
70-
7160
make -C subprojects/templates-parser setup prefix=$prefix \
7261
ENABLE_SHARED=no \
7362
${DEBUG:+BUILD=debug} build-static install-static

‎.github/workflows/build-binaries.yml‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false
1717
matrix: # Build debug and production
1818
debug: ['', 'debug'] # '' if production, 'debug' for debug
19-
os: [macos-10.15, ubuntu-18.04, windows-latest]
19+
os: [macos-11, ubuntu-20.04, windows-latest]
2020
runs-on: ${{ matrix.os }}
2121
steps:
2222
- name: Setup Python 3.8
@@ -65,22 +65,6 @@ jobs:
6565
with:
6666
repository: AdaCore/templates-parser
6767
path: subprojects/templates-parser
68-
- name: Get Langkit
69-
uses: actions/checkout@v2
70-
with:
71-
repository: AdaCore/langkit
72-
path: subprojects/langkit
73-
- name: Get gpr
74-
uses: actions/checkout@v2
75-
with:
76-
repository: AdaCore/gpr
77-
path: subprojects/gpr
78-
ref: edge
79-
- name: Get gprconfig_kb
80-
uses: actions/checkout@v2
81-
with:
82-
repository: AdaCore/gprconfig_kb
83-
path: subprojects/gpr/gprconfig_kb
8468
- name: Get GNATdoc
8569
uses: actions/checkout@v2
8670
with:

‎README.md‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ extension at
4141
- [Getting started](#getting-started)
4242
- [Auto-detected tasks](#auto-detected-tasks)
4343
- [Short demo](#short-demo)
44-
- [Go to other Ada file](#go-to-other-ada-file)
44+
- [Commands and shortcuts](#commands-and-shortcuts)
4545
- [Launch the extension to debug it](#launch-the-extension-to-debug-it)
4646
- [Configuration](#configuration)
4747
- [Integration with Coc.NVim](#integration-with-cocnvim)
@@ -170,12 +170,25 @@ You can bind keyboard shortcuts to them by adding to the `keybindings.json` file
170170

171171
[A demo for auto-detected tasks](https://github.com/AdaCore/ada_language_server/wiki/auto_detected_tasks.mp4)
172172

173-
### Go to other Ada file
173+
### Commands and shortcuts
174174

175-
The extension contributes a command and a corresponding key binding to
176-
switch between specification and implementation Ada files.
175+
The extension contributes a few commands and corresponding key bindings.
176+
177+
#### Ada: Go to other file
178+
179+
This command switches between specification and implementation Ada files.
177180
The default shortcut is `Alt+O`.
178181

182+
#### Ada: Add subprogram box
183+
184+
This command inserts a comment box before the current subprogram body.
185+
The default shortcut is `Alt+Shift+B`.
186+
187+
#### Ada: Reload project
188+
189+
This command reloads the current project.
190+
The default shortcut is `None`.
191+
179192
### Launch the extension to debug it
180193

181194
For the moment, this repository includes a vscode extension that is used as the

‎integration/vscode/ada/package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,10 @@
423423
"command": "ada.otherFile",
424424
"title": "Ada: Go to other file"
425425
},
426+
{
427+
"command": "als-reload-project",
428+
"title": "Ada: Reload project"
429+
},
426430
{
427431
"command": "ada.subprogramBox",
428432
"title": "Ada: Add subprogram box"

‎source/ada/lsp-ada_driver.adb‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ with GNATCOLL.VFS; use GNATCOLL.VFS;
4040
with LSP.Ada_Handlers;
4141
with LSP.Ada_Handlers.Named_Parameters_Commands;
4242
with LSP.Ada_Handlers.Other_File_Commands;
43+
with LSP.Ada_Handlers.Project_Reload_Commands;
4344
with LSP.Ada_Handlers.Refactor_Imports_Commands;
4445
with LSP.Ada_Handlers.Refactor_Add_Parameter;
4546
with LSP.Ada_Handlers.Refactor_Remove_Parameter;
@@ -132,6 +133,8 @@ procedure LSP.Ada_Driver is
132133
begin
133134
LSP.Commands.Register
134135
(LSP.Ada_Handlers.Other_File_Commands.Command'Tag);
136+
LSP.Commands.Register
137+
(LSP.Ada_Handlers.Project_Reload_Commands.Command'Tag);
135138
LSP.Commands.Register
136139
(LSP.Ada_Handlers.Named_Parameters_Commands.Command'Tag);
137140
LSP.Commands.Register

‎source/ada/lsp-ada_handlers-project_reload_commands.adb‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
------------------------------------------------------------------------------
2+
-- Language Server Protocol --
3+
-- --
4+
-- Copyright (C) 2022, AdaCore --
5+
-- --
6+
-- This is free software; you can redistribute it and/or modify it under --
7+
-- terms of the GNU General Public License as published by the Free Soft- --
8+
-- ware Foundation; either version 3, or (at your option) any later ver- --
9+
-- sion. This software is distributed in the hope that it will be useful, --
10+
-- but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- --
11+
-- TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public --
12+
-- License for more details. You should have received a copy of the GNU --
13+
-- General Public License distributed with this software; see file --
14+
-- COPYING3. If not, go to http://www.gnu.org/licenses for a complete copy --
15+
-- of the license. --
16+
------------------------------------------------------------------------------
17+
18+
package body LSP.Ada_Handlers.Project_Reload_Commands is
19+
20+
------------
21+
-- Create --
22+
------------
23+
24+
overriding function Create
25+
(JS : not null access LSP.JSON_Streams.JSON_Stream'Class) return Command
26+
is
27+
pragma Unreferenced (JS);
28+
begin
29+
return (LSP.Commands.Command with null record);
30+
end Create;
31+
32+
-------------
33+
-- Execute --
34+
-------------
35+
36+
overriding procedure Execute
37+
(Self : Command;
38+
Handler : not null access LSP.Server_Notification_Receivers
39+
.Server_Notification_Receiver'Class;
40+
Client : not null access LSP.Client_Message_Receivers
41+
.Client_Message_Receiver'Class;
42+
Error : in out LSP.Errors.Optional_ResponseError)
43+
is
44+
Message_Handler : LSP.Ada_Handlers.Message_Handler renames
45+
LSP.Ada_Handlers.Message_Handler (Handler.all);
46+
47+
begin
48+
Message_Handler.Reload_Project;
49+
end Execute;
50+
51+
-------------------
52+
-- Write_Command --
53+
-------------------
54+
55+
procedure Write_Command
56+
(S : access Ada.Streams.Root_Stream_Type'Class;
57+
V : Command)
58+
is
59+
JS : LSP.JSON_Streams.JSON_Stream'Class renames
60+
LSP.JSON_Streams.JSON_Stream'Class (S.all);
61+
begin
62+
JS.Start_Object;
63+
-- no command arguments!
64+
JS.End_Object;
65+
end Write_Command;
66+
67+
end LSP.Ada_Handlers.Project_Reload_Commands;

‎source/ada/lsp-ada_handlers-project_reload_commands.ads‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
------------------------------------------------------------------------------
2+
-- Language Server Protocol --
3+
-- --
4+
-- Copyright (C) 2022, AdaCore --
5+
-- --
6+
-- This is free software; you can redistribute it and/or modify it under --
7+
-- terms of the GNU General Public License as published by the Free Soft- --
8+
-- ware Foundation; either version 3, or (at your option) any later ver- --
9+
-- sion. This software is distributed in the hope that it will be useful, --
10+
-- but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- --
11+
-- TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public --
12+
-- License for more details. You should have received a copy of the GNU --
13+
-- General Public License distributed with this software; see file --
14+
-- COPYING3. If not, go to http://www.gnu.org/licenses for a complete copy --
15+
-- of the license. --
16+
------------------------------------------------------------------------------
17+
--
18+
-- Implementation of the command to reload current project.
19+
20+
with Ada.Streams;
21+
22+
with LSP.Client_Message_Receivers;
23+
with LSP.Commands;
24+
with LSP.Errors;
25+
with LSP.JSON_Streams;
26+
27+
package LSP.Ada_Handlers.Project_Reload_Commands is
28+
29+
type Command is new LSP.Commands.Command with private;
30+
31+
private
32+
33+
type Command is new LSP.Commands.Command with null record;
34+
35+
overriding function Create
36+
(JS : not null access LSP.JSON_Streams.JSON_Stream'Class)
37+
return Command;
38+
39+
overriding procedure Execute
40+
(Self : Command;
41+
Handler : not null access
42+
LSP.Server_Notification_Receivers.Server_Notification_Receiver'Class;
43+
Client : not null access
44+
LSP.Client_Message_Receivers.Client_Message_Receiver'Class;
45+
Error : in out LSP.Errors.Optional_ResponseError);
46+
47+
procedure Write_Command
48+
(S : access Ada.Streams.Root_Stream_Type'Class;
49+
V : Command);
50+
51+
for Command'Write use Write_Command;
52+
for Command'External_Tag use "als-reload-project";
53+
54+
end LSP.Ada_Handlers.Project_Reload_Commands;

0 commit comments

Comments
 (0)