Skip to content

Commit 04a0ae2

Browse files
author
automatic-merge
committed
Merge remote branch 'origin/master' into edge
2 parents ade75be + 6d898b2 commit 04a0ae2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/ISSUE_TEMPLATE/enhancement-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Enhancement Request
22
description: Suggest an idea for the Ada Language Server or the Ada & SPARK VS Code extension.
33
title: "[Enhancement]: "
4-
labels: ["bug"]
4+
labels: ["enhancement"]
55
body:
66
- type: markdown
77
attributes:

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ The `ada_language_server` relies on [Libadalang](https://github.com/AdaCore/liba
136136
Most of this computation is done while indexing which will create an internal cache.
137137
The expected memory size of this cache is around 300Mb per 100k lines of Ada code.
138138
Furthermore, 450Mb are necessary for the runtime.
139-
Please note that some Ada structures like generics and tagged types might
139+
Please note that some Ada structures like generics and tagged types might
140140
increase the memory usage. This is also the case when using aggregate projects.
141141
These measures were taken using both Resident Set Size and [Valgrind massif](https://valgrind.org/docs/manual/ms-manual.html) on Ubuntu 22.04LTS.
142142

@@ -496,20 +496,20 @@ Ada Language Server. In order to use it with minimal effort, follow these steps:
496496
* Install the ada language server and make sure it's in your $PATH.
497497
* Use your favorite Neovim plugin manager to add the default set of [LSP
498498
configuration files](https://github.com/neovim/nvim-lspconfig) to Neovim.
499-
* Enable the Ada Language Server by adding `:lua require('lspconfig').als.setup{}` to
500-
your init.vim.
499+
* Add `require('lspconfig').ada_ls.setup{}` to your init.lua in order to enable
500+
the Ada Language Server.
501501

502502
If you would rather not have the ada language server in your path, you can give
503503
the lsp client an absolute path to the ALS executable:
504504

505505
```lua
506-
require('lspconfig').als.setup{ cmd = "/path/to/als/executable" }
506+
require('lspconfig').ada_ls.setup{ cmd = "/path/to/als/executable" }
507507
```
508508

509509
Configuring the language server's settings can be achieved like this:
510510

511511
```lua
512-
require('nvim_lsp').als.setup{
512+
require('lspconfig').ada_ls.setup{
513513
settings = {
514514
ada = {
515515
projectFile = "project.gpr";

0 commit comments

Comments
 (0)