Skip to content

Commit 21ccc18

Browse files
author
automatic-merge
committed
Merge remote branch 'origin/master' into edge
2 parents a4f1818 + 23dc197 commit 21ccc18

File tree

9 files changed

+100
-16
lines changed

9 files changed

+100
-16
lines changed
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: Bug Report
2+
description: Create a bug report for the Ada Language Server. This can concern the LSP language server itself or
3+
the VS Code extension on top of it.
4+
title: "[Bug]: "
5+
labels: ["bug"]
6+
body:
7+
- type: markdown
8+
attributes:
9+
value: |
10+
### Is there an existing issue for this?
11+
Please search our [existing issues](https://github.com/AdaCore/ada_language_server/issues) to see if an issue already exists for the bug you encountered.
12+
13+
Please also don't hesitate to read our [documentation](https://github.com/AdaCore/ada_language_server) first.
14+
- type: textarea
15+
attributes:
16+
label: Environment
17+
description: |
18+
Please provide the information for the following:
19+
- OS and Version (provide this for both host and target if you are using a remote or containerized development environment)
20+
- IDE Version (for example "VS Code 1.89.0" or "GNAT Studio 24.2")
21+
- Ada & SPARK Extension Version (if using VS Code)
22+
value: |
23+
- OS and Version:
24+
- IDE Version:
25+
- Ada & SPARK Extension Version:
26+
validations:
27+
required: true
28+
- type: textarea
29+
attributes:
30+
label: Bug Summary and Reproducer
31+
description: |
32+
Please describe the feature (for example, completion) that is not working as expected.
33+
Include information about the actual workspace project (for example, is the project an aggregate project, does it target native platforms or cross platforms etc.).
34+
value: |
35+
Bug Summary:
36+
37+
Steps to reproduce:
38+
39+
Expected behavior:
40+
validations:
41+
required: true
42+
- type: textarea
43+
attributes:
44+
label: Configuration and Logs
45+
description: |
46+
Please provide your VS Code workspace-specific configuration files and logs. Logs are in particular very useful to investigate bugs such as unexpected exceptions.
47+
- `tasks.json` file (for VS Code task-related issues) or `launch.json` (for VS Code debug-related issues)
48+
- Logs from running `Ada: Show extension output from the VS Code command palette
49+
- Logs from the Ada Language Server in the `$HOME/.als directory (`%USERPROFILE%/.als`` on Windows). More info about ALS logging can be found [here](https://github.com/AdaCore/ada_language_server/blob/master/doc/traces.md)
50+
render: shell
51+
validations:
52+
required: true
53+
- type: textarea
54+
attributes:
55+
label: Other VS Code Extensions
56+
description: If applicable, please list other extensions installed and if the issue persists after disabling other extensions.
57+
validations:
58+
required: false
59+
- type: textarea
60+
attributes:
61+
label: Additional context
62+
description: |
63+
Here you can provide any other information that will give us more context
64+
about the issue you are encountering (code sample, screenshots, screen recording of the issue,
65+
call stacks, etc.)
66+
validations:
67+
required: false
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Enhancement Request
2+
description: Suggest an idea for the Ada Language Server or the Ada & SPARK VS Code extension.
3+
title: "[Enhancement]: "
4+
labels: ["bug"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
### Is there an existing request for this enhancement?
10+
Prior to creating a new feature request, please review our [existing enhancement requests](https://github.com/AdaCore/ada_language_server/labels/enhancement) to avoid duplicates.
11+
- type: textarea
12+
attributes:
13+
label: Enhancement Request
14+
description: |
15+
Describe the enhancement here.
16+
validations:
17+
required: true

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,8 @@ formatting might no succeed on incomplete/illegal code.
255255
the project's search path, environment variables and the project's file
256256
name from the crate description.
257257

258-
* **Project support**: there is no `Scenario` view: users should configure scenarios via the *ada.scenarioVariables* setting (see the settings list available [here](doc/refactoring_tools.md)). You can execute the *Ada: Reload project* command to reload your project after saving the new scenario values (use the *Ctrl+P* shortcut to invoke the **Command Palette**, allowing you to execute commands).
258+
* **Project support**: there is no `Scenario` view: users should configure scenarios via the *ada.scenarioVariables* setting (see the settings list available [here](doc/settings.md)). Saving the settings file after changing the values will automatically reload the project and update the
259+
predefined tasks to take into account the new scenario values.
259260

260261
Source directories from imported projects should be added in a [workspace file](https://code.visualstudio.com/docs/editor/workspaces#_multiroot-workspaces). If you already have a workspace file, the extension will propose you to automatically add all the source directories coming from imported projects to your workspace automatically at startup.
261262

integration/vscode/ada/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,10 @@
359359
"always"
360360
],
361361
"enumDescriptions": [
362-
"Never list overridding and/or overridden suprograms.",
363-
"List overridding and/or overridden suprograms on dispatching calls and on abstract subprogram declarations.",
364-
"List overridding and/or overridden suprograms on declarations only.",
365-
"Always list overridding and/or overridden suprograms when possible."
362+
"Never list overriding and/or overridden subprograms.",
363+
"List overriding and/or overridden subprograms on dispatching calls and on abstract subprogram declarations.",
364+
"List overriding and/or overridden subprograms on declarations only.",
365+
"Always list overriding and/or overridden subprograms when possible."
366366
],
367367
"default": "usage_and_abstract_only",
368368
"description": "Controls the policy for displaying overriding and overridden subprograms on navigation requests such as 'Go To Definition' or 'Go To Implementations'."
@@ -401,7 +401,7 @@
401401
},
402402
{
403403
"type": "object",
404-
"title": "Miscelaneous",
404+
"title": "Miscellaneous",
405405
"properties": {
406406
"ada.enableIndexing": {
407407
"scope": "window",

integration/vscode/ada/src/commands.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const CMD_BUILD_AND_DEBUG_MAIN = 'ada.buildAndDebugMain';
3838
export function registerCommands(context: vscode.ExtensionContext, clients: ExtensionState) {
3939
context.subscriptions.push(vscode.commands.registerCommand('ada.otherFile', otherFileHandler));
4040
context.subscriptions.push(
41-
vscode.commands.registerCommand('ada.subprogramBox', addSupbrogramBoxCommand)
41+
vscode.commands.registerCommand('ada.subprogramBox', addSubprogramBoxCommand)
4242
);
4343
context.subscriptions.push(
4444
vscode.commands.registerCommand('ada.showExtensionOutput', () => mainOutputChannel.show())
@@ -108,7 +108,7 @@ export function registerCommands(context: vscode.ExtensionContext, clients: Exte
108108
*
109109
* procedure Foo is
110110
*/
111-
async function addSupbrogramBoxCommand() {
111+
async function addSubprogramBoxCommand() {
112112
const activeEditor = vscode.window.activeTextEditor;
113113

114114
await getEnclosingSymbol(activeEditor, [
@@ -202,7 +202,7 @@ interface TaskQuickPickItem extends vscode.QuickPickItem {
202202
* Propose to the User a list of build and run tasks, one for each main defined
203203
* in the project.
204204
*
205-
* Tasks defined explicitely in the workspace are identified as such in the
205+
* Tasks defined explicitly in the workspace are identified as such in the
206206
* offered list and proposed first.
207207
*
208208
* The User can choose either to run the task as is, or click the secondary
@@ -519,7 +519,7 @@ async function buildAndDebugSpecifiedMain(main: vscode.Uri): Promise<void> {
519519
* The vscode API doesn't provide a way to list both automatically
520520
* provided and User-defined debug configurations. So instead, we
521521
* inspect the launch.json data if it exists, and the dynamic configs
522-
* provided by the exctension. We look for a debug config that matches
522+
* provided by the extension. We look for a debug config that matches
523523
* the given main URI.
524524
*/
525525
// Create a launch config for this main to help with matching

integration/vscode/ada/src/debugConfigProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ export function getOrFindGdb(): string | undefined {
171171
* @param program - the executable to debug (optional)
172172
* @param main - the main source file to be displayed in the configuration label (optional)
173173
* @param name - the full name of the configuration (optional). If provided,
174-
* this name shortcircuits the automatic naming based on the 'main' or the
174+
* this name short-circuits the automatic naming based on the 'main' or the
175175
* 'program' parameter.
176176
* @returns an AdaConfig
177177
*/

integration/vscode/ada/src/extension.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable @typescript-eslint/no-unsafe-call */
21
/*----------------------------------------------------------------------------
32
-- Language Server Protocol --
43
-- --

integration/vscode/ada/src/gnattest.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export let testRunProfile: vscode.TestRunProfile;
1515
/**
1616
* Types definition for the Gnattest XML file structure. The types match the XML
1717
* generated by src/test-mapping.adb in the libadalang-tools repository. However
18-
* these types do not describe the entire XML strutcture. Only the elements used
18+
* these types do not describe the entire XML structure. Only the elements used
1919
* are described.
2020
*/
2121
export type Root = {
@@ -185,7 +185,7 @@ async function parseGnatTestXml(): Promise<Root> {
185185
// to obtain attributes.
186186
ignoreAttributes: false,
187187
// This prefix is used in the JS objects resulting from the parsing
188-
// to differenciate attributes from child nodes.
188+
// to differentiate attributes from child nodes.
189189
attributeNamePrefix: '@_',
190190
isArray: (_, jPath) => {
191191
return alwaysArray.indexOf(jPath) !== -1;

integration/vscode/ada/src/taskProviders.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ function quoteCommandLine(cmd: string[]): vscode.ShellQuotedString[] {
996996
/**
997997
*
998998
* @param task - a task
999-
* @returns `true` if the task is defined explicitely in the workspace's tasks.json
999+
* @returns `true` if the task is defined explicitly in the workspace's tasks.json
10001000
*/
10011001
export function isFromWorkspace(task: vscode.Task): boolean {
10021002
return task.source == 'Workspace';
@@ -1006,7 +1006,7 @@ export function isFromWorkspace(task: vscode.Task): boolean {
10061006
*
10071007
* @param task - a task
10081008
* @returns the label typically generated for that task by vscode. For tasks not
1009-
* defined explicitely in the workspace, this is `ada: <task name>`. For tasks
1009+
* defined explicitly in the workspace, this is `ada: <task name>`. For tasks
10101010
* defined in the workspace simply return the name which should already include
10111011
* the convention.
10121012
*/

0 commit comments

Comments
 (0)