Merge remote branch 'origin/master' into edge

Author: automatic-merge

CHANGELOG.md

@@ -7,6 +7,7 @@ section below it for the last release. -->
 
 * Fix a bug that caused the ALS to hang when trying to complete partially qualified invisible symbols
 * Support loading a fresh checkout of an Alire crate by automatically performing the necessary Alire workspace initializations
+* VS Code status bar now displays an item showing the project-loading status and useful commands provided by the extension when hovering on it
 
 ## 26.0.202502240
 

doc/settings.md

@@ -108,6 +108,7 @@ Settings understood by the Ada Language Server itself, independently from the LS
 * [rootDir](#rootdir)
 * [enableDiagnostics](#enableddiagnostics)
 * [adaFileDiagnostics](#adafilediagnostics)
+* [gprFileDiagnostics](#gprfilediagnostics)
 * [projectDiagnostics](#projectdiagnostics)
 * [alireDiagnostics](#alirediagnostics)
 * [enableIndexing](#enableindexing)
@@ -236,6 +237,17 @@ The value is a boolean.
     'adaFileDiagnostics': false
 ```
 
+### gprFileDiagnostics
+
+You can explicitly deactivate the emission of diagnostics related to the
+edition of gpr Files via the `gprFileDiagnostics` key. By default,
+diagnostics are enabled.
+The value is a boolean.
+
+```javascript
+    'gprFileDiagnostics': false
+```
+
 ### projectDiagnostics
 
 You can explicitly deactivate the emission of diagnostics when loading a

integration/vscode/ada/.vscode-test.mjs

@@ -39,7 +39,7 @@ if (process.env['MOCHA_GREP']) {
     baseMochaOptions.grep = process.env['MOCHA_GREP'];
 }
 
-const testsuites = ['general', 'workspace_missing_dirs', 'dot-als-json'];
+const testsuites = ['general', 'workspace_missing_dirs', 'dot-als-json', 'status_bar'];
 
 export default defineConfig(
     testsuites.map((suiteName) => {

integration/vscode/ada/package.json

@@ -426,7 +426,7 @@
                         "scope": "window",
                         "type": "boolean",
                         "default": null,
-                        "description": "Controls whether or not the Ada Language Server should emit project diagnostics into the VS Code Problems view."
+                        "description": "Controls whether or not the Ada Language Server should emit diagnostics related to project loading into the VS Code Problems view."
                     },
                     "ada.alireDiagnostics": {
                         "scope": "window",
@@ -438,7 +438,13 @@
                         "scope": "window",
                         "type": "boolean",
                         "default": null,
-                        "description": "Controls whether or not the Ada Language Server should emit diagnostics related to Ada files into the VS Code Problems view."
+                        "description": "Controls whether or not the Ada Language Server should emit diagnostics related to the edition of Ada files into the VS Code Problems view."
+                    },
+                    "ada.gprFileDiagnostics": {
+                        "scope": "window",
+                        "type": "boolean",
+                        "default": null,
+                        "description": "Controls whether or not the Ada Language Server should emit diagnostics related to the edition of GPR files into the VS Code Problems view."
                     }
                 }
             },

integration/vscode/ada/schemas/als-settings-schema.json

@@ -88,7 +88,12 @@
         "adaFileDiagnostics": {
             "type": "boolean",
             "default": true,
-            "description": "Controls whether or not the Ada Language Server should emit diagnostics related to Ada Files into the VS Code Problems view."
+            "description": "Controls whether or not the Ada Language Server should emit diagnostics related to the edition of Ada Files into the VS Code Problems view."
+        },
+        "gprFileDiagnostics": {
+            "type": "boolean",
+            "default": true,
+            "description": "Controls whether or not the Ada Language Server should emit diagnostics related to the edition of GPR Files into the VS Code Problems view."
         },
         "foldComments": {
             "type": "boolean",

integration/vscode/ada/src/ExtensionState.ts

@@ -23,6 +23,13 @@ import {
     createSparkTaskProvider,
 } from './taskProviders';
 import { isAbsolute } from 'path';
+import {
+    CMD_SHOW_EXTENSION_LOGS,
+    CMD_SHOW_ADA_LS_OUTPUT,
+    CMD_SHOW_GPR_LS_OUTPUT,
+    CMD_RELOAD_PROJECT,
+    CMD_RESTART_LANG_SERVERS,
+} from './commands';
 
 /**
  * Return type of the 'als-source-dirs' LSP request.
@@ -268,18 +275,18 @@ export class ExtensionState {
             this.statusBar.tooltip.appendMarkdown('\n\n---\n\n');
         }
         this.statusBar.tooltip.appendMarkdown(
-            `[$(terminal) Open Extension Logs](command:ada.showExtensionOutput
+            `[$(terminal) Open Extension Logs](command:${CMD_SHOW_EXTENSION_LOGS}
  "Show Ada Extension Output")
 
-[$(terminal) Open Logs for Ada & SPARK](command:ada.showAdaLSOutput
+[$(terminal) Open Logs for Ada & SPARK](command:${CMD_SHOW_ADA_LS_OUTPUT}
  "Show Ada Language Server for Ada & SPARK Output")
 
-[$(terminal) Open Logs for GPR](command:ada.showGprLSOutput
+[$(terminal) Open Logs for GPR](command:${CMD_SHOW_GPR_LS_OUTPUT}
  "Show Ada Language Server for GPR Output")
 
-[$(refresh) Reload Project](command:als-reload-project "Reload Project")
+[$(refresh) Reload Project](command:${CMD_RELOAD_PROJECT} "Reload Project")
 
-[$(debug-restart) Restart Language Servers](command:ada.restartLanguageServers
+[$(debug-restart) Restart Language Servers](command:${CMD_RESTART_LANG_SERVERS}
  "Restart Ada Language Servers")`,
         );
     };

integration/vscode/ada/src/alsExecuteCommand.ts

@@ -40,6 +40,7 @@ import {
     ReplaceTypeCommandArgs,
 } from './refactoring/alsReplaceTypeCommand';
 import { adaExtState } from './extension';
+import { CMD_RELOAD_PROJECT } from './commands';
 
 /**
  * Type alias for a function that intercepts a command and executes it by return a promise that
@@ -90,7 +91,7 @@ export const alsCommandExecutor = (client: LanguageClient): CommandExecutor => {
                 args[0] as ReplaceTypeCommandArgs,
             );
             if (!proceedWithExecution) return Promise.resolve(undefined);
-        } else if (command === 'als-reload-project') {
+        } else if (command === CMD_RELOAD_PROJECT) {
             // Clear the cache and the predefined tasks when the project
             // has been reloaded.
             adaExtState.clearCacheAndTasks('project is being reloaded: clearing caches and tasks');

integration/vscode/ada/src/commands.ts

@@ -86,9 +86,35 @@ export const CMD_SPARK_LIMIT_SUBP_ARG = 'ada.spark.limitSubpArg';
 export const CMD_SPARK_LIMIT_REGION_ARG = 'ada.spark.limitRegionArg';
 export const CMD_SPARK_PROVE_SUBP = 'ada.spark.proveSubprogram';
 
+/**
+ * Identifier for the command that shows the extension's output in the Output panel.
+ */
+export const CMD_SHOW_EXTENSION_LOGS = 'ada.showExtensionOutput';
+
+/**
+ * Identifier for the command that shows the output of the ALS for Ada in the Output panel.
+ */
+export const CMD_SHOW_ADA_LS_OUTPUT = 'ada.showAdaLSOutput';
+
+/**
+ * Identifier for the command that shows the output of the ALS for GPR in the Output panel.
+ */
+export const CMD_SHOW_GPR_LS_OUTPUT = 'ada.showGprLSOutput';
+
+/**
+ * Identifier for the command that reloads the currently loaded project on server-side.
+ */
+export const CMD_RELOAD_PROJECT = 'als-reload-project';
+
+/**
+ * Identifier for the command that restarts all the language servers spawned by the extension
+ * (Ada and GPR).
+ */
+export const CMD_RESTART_LANG_SERVERS = 'ada.restartLanguageServers';
+
 export function registerCommands(context: vscode.ExtensionContext, clients: ExtensionState) {
     context.subscriptions.push(
-        vscode.commands.registerCommand('ada.restartLanguageServers', restartLanguageServers),
+        vscode.commands.registerCommand(CMD_RESTART_LANG_SERVERS, restartLanguageServers),
     );
     context.subscriptions.push(
         vscode.commands.registerCommand('ada.createHelloWorldProject', createHelloWorldProject),
@@ -116,15 +142,15 @@ export function registerCommands(context: vscode.ExtensionContext, clients: Exte
         vscode.commands.registerCommand('ada.subprogramBox', addSubprogramBoxCommand),
     );
     context.subscriptions.push(
-        vscode.commands.registerCommand('ada.showExtensionOutput', () => mainOutputChannel.show()),
+        vscode.commands.registerCommand(CMD_SHOW_EXTENSION_LOGS, () => mainOutputChannel.show()),
     );
     context.subscriptions.push(
-        vscode.commands.registerCommand('ada.showAdaLSOutput', () =>
+        vscode.commands.registerCommand(CMD_SHOW_ADA_LS_OUTPUT, () =>
             clients.adaClient.outputChannel.show(),
         ),
     );
     context.subscriptions.push(
-        vscode.commands.registerCommand('ada.showGprLSOutput', () =>
+        vscode.commands.registerCommand(CMD_SHOW_GPR_LS_OUTPUT, () =>
             clients.gprClient.outputChannel.show(),
         ),
     );

integration/vscode/ada/test/general/extension.test.ts

@@ -5,6 +5,7 @@ import { activate, assertEqualToFileContent } from '../utils';
 
 import { readFileSync, writeFileSync } from 'fs';
 import * as vscode from 'vscode';
+import { CMD_RESTART_LANG_SERVERS } from '../../src/commands';
 
 suite('Extensions Test Suite', function () {
     // Make sure the extension is activated
@@ -139,7 +140,7 @@ suite('Extensions Test Suite', function () {
                 // Restart the server and check that we still have the same project
                 // loaded on ALS side
                 const oldAlsUri = await adaExtState.getProjectUri();
-                await vscode.commands.executeCommand('ada.restartLanguageServers');
+                await vscode.commands.executeCommand(CMD_RESTART_LANG_SERVERS);
                 const newAlsUri = await adaExtState.getProjectUri();
                 assert.deepStrictEqual(
                     oldAlsUri?.fsPath,

integration/vscode/ada/test/runTest.ts

@@ -10,7 +10,7 @@ async function main() {
     // Passed to `--extensionDevelopmentPath`
     const extensionDevelopmentPath = path.resolve(__dirname, '../../');
 
-    const testsuites = ['general', 'gnattest', 'workspace_missing_dirs'];
+    const testsuites = ['general', 'gnattest', 'workspace_missing_dirs', 'status_bar'];
 
     let someTestsuiteFailed = false;