Skip to content

Commit ede4fe3

Browse files
committed
Merge branch 'topic/manual-merge-edge' into 'edge'
Merge master into edge manually See merge request eng/ide/ada_language_server!1789
2 parents fed8719 + 303cc26 commit ede4fe3

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

.github/workflows/build-binaries.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup Python
2020
uses: actions/setup-python@v4
2121
with:
22-
python-version: '3.10'
22+
python-version: '3.11'
2323
- name: Initialize TAG and git autocrlf
2424
shell: bash
2525
run: |

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ section below it for the last release. -->
55
## \<next>
66

77
* Create commands for opening the project file and the log file
8+
* Add editor contextual menus for some Ada commands
9+
* Avoid 'auto-import' command when completing with-clauses
10+
* Replace "Project Problem" diagnostic by the project status message
11+
* Avoid running the Prove codelens with no problem matchers
12+
* Fix Goto Definition for entry in Protected Types
13+
* Avoid `PRECONDITION_FAILURE` on editing an empty file
14+
* Avoid occurrences of `STALE_REFERENCE_ERROR` in Libadalang
815

916
## 25.0.20241014
1017

integration/vscode/ada/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -886,6 +886,12 @@
886886
}
887887
]
888888
},
889+
"configurationDefaults": {
890+
"[ada]": {
891+
"editor.tabSize": 3,
892+
"editor.detectIndentation": false
893+
}
894+
},
889895
"walkthroughs": [
890896
{
891897
"id": "als-get-started",

0 commit comments

Comments
 (0)