Merge remote branch 'origin/master' into edge

automatic-merge · automatic-merge · commit 6d760725d258 · 2025-03-05T00:56:22.000Z
diff --git a/.gitlab-ci.plan b/.gitlab-ci.plan
@@ -1,7 +1,7 @@
 def build_(qualifier={}):
     with defaults(qualifier=qualifier):
         anod_build("als")
-        anod_build("vscode-extension")
+        anod_build("vscode-extension", qualifier={"mono-plat": True})
 
 
 def test_als_(qualifier={}):
@@ -19,10 +19,10 @@ def test_als_cov_(qualifier={}):
 
 
 def test_vscode_extension_(qualifier={}):
-    with defaults(qualifier=qualifier):
-        # Install the component built in the preceding CI build job
-        anod_install("vscode-extension")
-        anod_test("vscode-extension", qualifier=qualifier | {"coverage": True})
+    component_qual = qualifier | {"mono-plat": True}
+    # Install the component built in the preceding CI build job
+    anod_install("vscode-extension", qualifier=component_qual)
+    anod_test("vscode-extension", qualifier=component_qual | {"coverage": True})
 
 
 def build_test_gs_(qualifier={}):
@@ -62,14 +62,29 @@ def build_test_gs_edge():
 
 
 def test_integration_testsuite():
-    # The two components below have been built by the build job of the CI
+    # These two components have been built by the build job of the CI, install them.
     anod_install("als")
-    anod_install("vscode-extension")
-    # Install gps component to avoid it getting rebuilt. We are only interested in
-    # vscode tests in the integration-testsuite, not gps.
-    anod_install("gps")
+    anod_install("vscode-extension", qualifier={"mono-plat": True})
+
+    # For the following components, we'd like to install with latest=True to be
+    # resilient to failures in nightly builds.
+    #
+    # We need to do this instead of running the whole plan with --latest because
+    # currently --latest bypasses the local offline Cathod component cache and prevents
+    # installing components built in the same CI pipeline.
+    for dep in (
+        # Install gps component to avoid it getting rebuilt. Here we are only interested
+        # in vscode tests in the integration-testsuite, not gps.
+        "gps",
+        "gnat",
+        "gnatdas",
+        "gnatsas",
+        "spark2014",
+    ):
+        anod_install(dep, latest=True)
+
     # Run the subset of integration-testsuite that uses VS Code
     anod_test(
         "integration-testsuite",
-        qualifier={"run-tools": "vscode", "cleanup-mode": "none"},
+        qualifier={"run-tools": "vscode", "cleanup-mode": "none", "mono-plat": True},
     )
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -21,6 +21,10 @@ include:
       cpus: 16
       disk: 80
       image: systemgtk
+      windows: true
+      windows-cpus: 8
+      # 8GB of memory leads to heap exhaustion during compilation. We need more.
+      windows-mem: 16
       save-component: true
 
   # Testing of the ALS
@@ -30,6 +34,7 @@ include:
       anod-args: run test_als_$ACI_TRACK
       image: systemgtk
       disk: 80
+      windows: true
 
   # Testing of the ALS with coverage
   - component: $CI_SERVER_FQDN/eng/gitlab-templates/test@~latest
@@ -50,6 +55,7 @@ include:
       job-name: vscode-extension
       anod-args: run test_vscode_extension_$ACI_TRACK
       image: systemgtk
+      windows: true
 
   # Integration testsuite
   - component: $CI_SERVER_FQDN/eng/gitlab-templates/test@~latest
@@ -62,6 +68,7 @@ include:
       image: systemgtk
       cpus: 4
       disk: 80
+      windows: true
       rules:
         # Does not work on edge
         - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_TARGET_BRANCH_NAME != 'edge'
@@ -75,6 +82,7 @@ include:
       image: systemgtk
       disk: 80
       stage: optional
+      windows: true
       rules:
         - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
           when: manual
@@ -180,3 +188,13 @@ vscode-extension:linux:
     paths:
       - anod-logs/
       - coverage/cobertura-coverage.xml
+
+als:windows:
+  variables:
+    # In GitLab CI tests timeout more often on Windows, so we multiply
+    # testsuite timeouts by the following factor
+    ALS_WAIT_FACTOR: "2"
+
+vscode-extension:windows:
+  variables:
+    MOCHA_TIMEOUT: "30000"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ repos:
     hooks:
       - id: flake8
         types: [file]
-        files: \.(py|anod|plan)$
+        files: \.(py)$
         additional_dependencies:
           - flake8-bugbear
           - flake8-builtins
@@ -16,7 +16,7 @@ repos:
     hooks:
       - id: black
         types_or: [file]
-        files: \.(py|plan)$
+        files: \.(py)$
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.8.0
     hooks:
diff --git a/integration/vscode/ada/src/ExtensionState.ts b/integration/vscode/ada/src/ExtensionState.ts
@@ -57,6 +57,7 @@ export class ExtensionState {
     public readonly codelensProvider = new AdaCodeLensProvider();
     public readonly testController: vscode.TestController;
     public readonly testData: Map<vscode.TestItem, object> = new Map();
+    public readonly statusBar: vscode.StatusBarItem;
 
     /**
      * The following fields are caches for ALS requests or costly properties.
@@ -107,6 +108,8 @@ export class ExtensionState {
         this.initialDebugConfigProvider = result.providerInitial;
         this.dynamicDebugConfigProvider = result.providerDynamic;
         this.testController = initializeTesting(context);
+        this.statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
+        this.context.subscriptions.push(this.statusBar);
     }
 
     public start = async () => {
@@ -115,6 +118,7 @@ export class ExtensionState {
         this.context.subscriptions.push(
             vscode.languages.registerCodeLensProvider('ada', this.codelensProvider),
         );
+        this.updateStatusBarVisibility(undefined);
     };
 
     public dispose = () => {
@@ -147,6 +151,139 @@ export class ExtensionState {
         ];
     };
 
+    /**
+     * Update the status bar item's visibility according to the current context.
+     */
+    public updateStatusBarVisibility = (editor: vscode.TextEditor | undefined) => {
+        const activeEditor = editor ?? vscode.window.activeTextEditor;
+
+        // Show the status bar if the active editor is on an Ada or a GPR source, or
+        // if it's the Output view that is focused (i.e: when the active editor's
+        // document scheme is set to 'output') and showing Ada & SPARK extension's logs.
+        if (
+            activeEditor &&
+            ((activeEditor.document.uri.scheme == 'output' &&
+                activeEditor.document.fileName.includes('AdaCore')) ||
+                ['ada', 'gpr'].includes(activeEditor.document.languageId))
+        ) {
+            this.statusBar.show();
+        } else {
+            this.statusBar.hide();
+        }
+    };
+
+    /**
+     * Update the status bar item's content according to currently displayed
+     * diagnostics.
+     */
+    public updateStatusBarItem = () => {
+        // Use markdown for the status bar item tiooltip. This allows to have
+        // hyperlinks that run actual commands.
+        this.statusBar.tooltip = new vscode.MarkdownString('', true);
+        this.statusBar.tooltip.isTrusted = true;
+
+        // Show the Problems view by default when clicking on the status
+        // bar item.
+        this.statusBar.command = 'workbench.panel.markers.view.focus';
+        let alireProjectLoaded = false;
+
+        // Monitor diagnostics related to project-loading in general, including
+        // potential issues reported by Alire.
+        const PROJECT_DIAGS_SOURCE = 'ada.project';
+        const ALIRE_DIAGS_SOURCE = 'ada.alire';
+        const diagnosticSources = [PROJECT_DIAGS_SOURCE, ALIRE_DIAGS_SOURCE];
+
+        // Gather all the diagnostics from the interesting ALS diagnostics' sources.
+        // For the status bar we are interested only in project-related diagnostics.
+        const alsDiagnostics: vscode.Diagnostic[] = vscode.languages
+            .getDiagnostics()
+            .flatMap(([, diagnostics]) => diagnostics)
+            .filter((diag) => diagnosticSources.includes(diag.source ?? ''));
+
+        // Update the status bar according to the ALS project-related diagnostics
+        if (alsDiagnostics.length > 0) {
+            // Get the highest severity of the currently displayed project-diagnostics, to
+            // update the status bar's colors accordingly.
+            const statusBarSeverity: vscode.DiagnosticSeverity = alsDiagnostics
+                .map((a) => a.severity)
+                .reduce((a, b) => (a < b ? a : b));
+            this.statusBar.text = 'Ada & SPARK';
+
+            switch (statusBarSeverity) {
+                case vscode.DiagnosticSeverity.Error:
+                    this.statusBar.tooltip.appendMarkdown(
+                        'Project loading has issued errors, see the [Problems]' +
+                            '(command:workbench.panel.markers.view.focus) view' +
+                            ' for more information.',
+                    );
+                    this.statusBar.backgroundColor = new vscode.ThemeColor(
+                        'statusBarItem.errorBackground',
+                    );
+                    this.statusBar.color = new vscode.ThemeColor('statusBarItem.errorForeground');
+                    break;
+
+                case vscode.DiagnosticSeverity.Warning:
+                    this.statusBar.tooltip.appendMarkdown(
+                        'Project loading has issued warnings, see the [Problems]' +
+                            '(command:workbench.panel.markers.view.focus) view' +
+                            ' for more information.',
+                    );
+                    this.statusBar.backgroundColor = new vscode.ThemeColor(
+                        'statusBarItem.warningBackground',
+                    );
+                    this.statusBar.color = new vscode.ThemeColor('statusBarItem.warningForeground');
+                    break;
+
+                default:
+                    this.statusBar.backgroundColor = undefined;
+                    this.statusBar.color = undefined;
+
+                    // Check if we have successfully loaded the project through Alire
+                    // and adapt the status bar item's text contents if it's the case, to
+                    // mention that Alire was used for project-loading.
+                    alireProjectLoaded = alsDiagnostics.some(
+                        (diagnostic) =>
+                            diagnostic.source == PROJECT_DIAGS_SOURCE &&
+                            diagnostic.message.includes('Alire'),
+                    );
+
+                    if (alireProjectLoaded) {
+                        this.statusBar.text += ' (Alire)';
+                        this.statusBar.tooltip.appendMarkdown(
+                            'Project was loaded successfully through Alire',
+                        );
+                    } else {
+                        this.statusBar.tooltip.appendMarkdown('Project was loaded successfully.');
+                    }
+            }
+        } else {
+            // We don't have any project-related diagnostics, just clear any color/background color
+            // of the status bar.
+            this.statusBar.tooltip.appendMarkdown('Project was loaded successfully.');
+            this.statusBar.backgroundColor = undefined;
+            this.statusBar.color = undefined;
+        }
+
+        if (this.statusBar.tooltip.value) {
+            this.statusBar.tooltip.appendMarkdown('\n\n---\n\n');
+        }
+        this.statusBar.tooltip.appendMarkdown(
+            `[$(terminal) Open Extension Logs](command:ada.showExtensionOutput
+ "Show Ada Extension Output")
+
+[$(terminal) Open Logs for Ada & SPARK](command:ada.showAdaLSOutput
+ "Show Ada Language Server for Ada & SPARK Output")
+
+[$(terminal) Open Logs for GPR](command:ada.showGprLSOutput
+ "Show Ada Language Server for GPR Output")
+
+[$(refresh) Reload Project](command:als-reload-project "Reload Project")
+
+[$(debug-restart) Restart Language Servers](command:ada.restartLanguageServers
+ "Restart Ada Language Servers")`,
+        );
+    };
+
     /**
      * Unregister all the task disposables needed by the extension (e.g: task providers,
      * listeners...).
diff --git a/integration/vscode/ada/src/extension.ts b/integration/vscode/ada/src/extension.ts
@@ -145,11 +145,23 @@ async function activateExtension(context: vscode.ExtensionContext) {
     adaExtState = new ExtensionState(context);
     context.subscriptions.push(adaExtState);
 
-    // Subscribe to the didChangeConfiguration event
+    // Subscribe to the didChangeConfiguration event to react to changes
+    // in settings
     context.subscriptions.push(
         vscode.workspace.onDidChangeConfiguration(adaExtState.configChanged),
     );
 
+    // Subscribe to the didChangeActiveTextEditor event to update the status bar
+    // item's visibility
+    context.subscriptions.push(
+        vscode.window.onDidChangeActiveTextEditor(adaExtState.updateStatusBarVisibility),
+    );
+
+    // Subscribe to the didChangeDiagnostics event to update the status bar item's content
+    context.subscriptions.push(
+        vscode.languages.onDidChangeDiagnostics(adaExtState.updateStatusBarItem),
+    );
+
     const alsMiddleware: Middleware = {
         executeCommand: alsCommandExecutor(adaExtState.adaClient),
     };
diff --git a/integration/vscode/ada/test/general/helpers.test.ts b/integration/vscode/ada/test/general/helpers.test.ts
@@ -290,7 +290,7 @@ suite('parallelize', function () {
                  * overall the computation shouldn't take more than the
                  * time needed to process one data item (with a margin).
                  */
-                const margin = singleWorkDurationMs * 0.2;
+                const margin = singleWorkDurationMs * 0.4;
                 /**
                  * When processing 4 items with 3 threads, the first parallel
                  * batch processes 3 items and a second batch processes 1 item.
@@ -303,7 +303,7 @@ suite('parallelize', function () {
                 assert.ok(
                     duration < expectedTotalWorkDuration,
                     `The computation took ${duration}ms when we expected` +
-                        ` no more than ${expectedTotalWorkDuration}`,
+                        ` no more than ${expectedTotalWorkDuration}ms`,
                 );
             }
         });
diff --git a/integration/vscode/ada/test/general/tasks.test.ts b/integration/vscode/ada/test/general/tasks.test.ts
@@ -26,7 +26,8 @@ import {
 import { runTaskAndGetResult } from '../../src/taskProviders';
 
 suite('Task Providers', function () {
-    this.timeout('15s');
+    // Set timeout to 15 seconds unless already configured to more
+    this.timeout(Math.max(this.timeout(), 15000));
 
     let projectPath: string;
 
diff --git a/testsuite/ada_lsp/config_file/test.py b/testsuite/ada_lsp/config_file/test.py
@@ -23,13 +23,19 @@
 subprocess.check_call(["gprconfig", "--batch", "--config=Ada,,light,,GNAT"])
 
 
-@test()
+@test(
+    als_settings={
+        # Disable indexing to avoid wasting computation resources and risking test
+        # timeouts
+        "enableIndexing": False
+    },
+    timeout=30,
+)
 async def do_testing(lsp: ALSLanguageClient) -> None:
     # Set configuration file
     lsp.didChangeConfig(
         {"projectFile": URI("main.gpr"), "gprConfigurationFile": URI("default.cgpr")}
     )
-    await lsp.awaitIndexingEnd()
 
     # Send a didOpen for main.adb
     open_params, main_adb_uri = didOpenTextDocumentParams("main.adb")
@@ -49,7 +55,6 @@ async def do_testing(lsp: ALSLanguageClient) -> None:
     lsp.didChangeConfig(
         {"projectFile": "main1.gpr", "gprConfigurationFile": "default.cgpr"}
     )
-    await lsp.awaitIndexingEnd()
 
     # Send a didOpen for main.adb
     open_params, main_adb_uri = didOpenTextDocumentParams("main.adb")
diff --git a/testsuite/ada_lsp/configuration_warning_null_setting/test.py b/testsuite/ada_lsp/configuration_warning_null_setting/test.py
diff --git a/testsuite/ada_lsp/initial_memory_footprint/test.py b/testsuite/ada_lsp/initial_memory_footprint/test.py
diff --git a/testsuite/drivers/pylsp.py b/testsuite/drivers/pylsp.py
diff --git a/testsuite/testsuite.py b/testsuite/testsuite.py
