Skip to content

Commit 55bd8ad

Browse files
Merge branch 'topic/issue_1114' into 'master'
Do a pass on the VS Code walkthrough See merge request eng/ide/ada_language_server!1150
2 parents 5366ef7 + 65f43b1 commit 55bd8ad

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

integration/vscode/ada/media/settings.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
# Configure the extension
22

3-
☝ Make sure to configure active project file `*.gpr`.
4-
Otherwise the extension will use a project file in the root project filder.
3+
☝ Make sure to configure the active `*.gpr` project file, otherwise
4+
the extension will use the first project file found in the root project
5+
folder.
56

6-
⚙ You can change settings per project or per user.
7+
⚙ You can change settings per workspace or per user: generally we recommend to
8+
change the project file setting in the desired workspace, since project files
9+
are usually workspace-specific.
710

811
📋 [List of Ada settings](https://github.com/AdaCore/ada_language_server/blob/master/doc/settings.md)
912

integration/vscode/ada/media/welcome.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# ☀ Welcome to Ada!
22

3-
Take a few minutes to find about Ada extension features.
3+
Take a few minutes to learn about the functionality provided by the Ada extension.
44

5-
Use this extension to enable Ada/SPARK support in VS Code editor.
5+
Use this extension to enable Ada/SPARK support in VS Code.
66

77
📖 Take a look at our [WiKi site](https://github.com/AdaCore/ada_language_server/wiki) with tutorials and demos:
88
* [Tutorial: Using Ada in VS Code](https://github.com/AdaCore/ada_language_server/wiki/Getting-Started)

integration/vscode/ada/package.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -465,33 +465,36 @@
465465
{
466466
"id": "als-get-stated-welcome",
467467
"title": "Welcome to Ada extension!",
468-
"description": "This short walkthrough introduces Ada extension.",
468+
"description": "This short walkthrough introduces the Ada extension.",
469469
"media": {
470470
"markdown": "media/welcome.md"
471471
}
472472
},
473473
{
474474
"id": "als-get-stated-setting",
475475
"title": "Set a project file",
476-
"description": "Set active project file in the `ada.projectFile` setting.\n [Open Settings](command:workbench.action.openSettings)",
476+
"description": "Set the active project file in the `ada.projectFile` setting.\n [Open Settings](command:workbench.action.openSettings)",
477477
"media": {
478478
"markdown": "media/settings.md"
479-
}
479+
},
480+
"completionEvents": [
481+
"onSettingChanged:ada.projectFile"
482+
]
480483
},
481484
{
482485
"id": "als-get-stated-debug",
483486
"title": "Launch and debug",
484-
"description": "Install **Native Debug** extension to run debugger.\n [Install extension](command:workbench.extensions.search)",
487+
"description": "Use the pre-installed **C/C++** extension to debug Ada code.",
485488
"media": {
486489
"markdown": "media/launch-debug.md"
487490
},
488491
"completionEvents": [
489-
"extensionInstalled:webfreak.debug"
492+
"onCommand:workbench.action.debug.start"
490493
]
491494
},
492495
{
493496
"id": "als-get-stated-github",
494-
"title": "Report issues or contribute",
497+
"title": "Report issues or contribute to the extension",
495498
"description": "This extension is an open source software. Feel free to [open an issue](https://github.com/AdaCore/ada_language_server/issues) or [contribute on GitHub](https://github.com/AdaCore/ada_language_server/pulls)!",
496499
"media": {
497500
"image": "media/github.jpg",
@@ -535,4 +538,4 @@
535538
"vscode-languageclient": "7.0.0",
536539
"ws": "8.5.0"
537540
}
538-
}
541+
}

0 commit comments

Comments
 (0)