Merge remote branch 'origin/master' into edge

Author: automatic-merge

integration/vscode/ada/package.json

@@ -695,7 +695,7 @@
             },
             {
                 "command": "ada.addMissingDirsToWorkspace",
-                "title": "Ada: Add missing source directories to workspace",
+                "title": "Ada: Add Missing Source Directories To Workspace",
                 "when": "ADA_PROJECT_CONTEXT"
             },
             {

integration/vscode/ada/src/commands.ts

@@ -9,7 +9,6 @@ import { getOrAskForProgram } from './debugConfigProvider';
 import { adaExtState, mainOutputChannel } from './extension';
 import { getProjectFileRelPath } from './helpers';
 import { CustomTaskDefinition, getEnclosingSymbol } from './taskProviders';
-import { LanguageClient } from 'vscode-languageclient/node';
 
 export function registerCommands(context: vscode.ExtensionContext, clients: ExtensionState) {
     context.subscriptions.push(vscode.commands.registerCommand('ada.otherFile', otherFileHandler));
@@ -52,15 +51,11 @@ export function registerCommands(context: vscode.ExtensionContext, clients: Exte
             'ada.addMissingDirsToWorkspace',
             async (
                 // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-                displayPopupWhenMissing: boolean = false,
+                atStartup: boolean = false,
                 // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-                displayPopupOnSuccess: boolean = true
+                displayYesNoPopup: boolean = true
             ) => {
-                await checkSrcDirectories(
-                    clients.adaClient,
-                    displayPopupWhenMissing,
-                    displayPopupOnSuccess
-                );
+                await checkSrcDirectories(atStartup, displayYesNoPopup);
             }
         )
     );
@@ -362,26 +357,27 @@ const otherFileHandler = () => {
  * Do nothing if the user did not setup any workspace file.
  *
  * @param alsClient - the running ALS client
- * @param displayPopupWhenMissing - whether or not we should display a yes/no popup
+ * @param atStartup - whether or not the command is triggered when activating the extension
+ * or explicitly by the user later via the Command Palette
+ * @param displayYesNoPopup - whether or not we should display a yes/no popup
  * when missing directories
- * @param displayPopupOnSuccess - whether or not we should display a popup to notify
- * the user that there is no missing directory
  */
-export async function checkSrcDirectories(
-    alsClient: LanguageClient,
-    displayPopupWhenMissing = true,
-    displayPopupOnSuccess = true
-) {
+export async function checkSrcDirectories(atStartup = false, displayYesNoPopup = true) {
     type ALSSourceDirDescription = {
         name: string;
         uri: string;
     };
 
     const foldersInSettings = vscode.workspace.getConfiguration().get('folders');
+    const alsClient = adaExtState.adaClient;
+    const doNotShowAgainKey = 'ada.addMissingDirsToWorkspace.doNotShowAgain';
+    const doNotShowAgain = adaExtState.context.workspaceState.get(doNotShowAgainKey);
 
     //  Don't propose any popup if we multi-root workspace folders are already set
-    //  explicitly in the workspace's settings.
-    if (foldersInSettings === undefined) {
+    //  explicitly in the workspace's settings, or if the command has been
+    //  triggered at startup while the user previously clicked on the
+    //  'Don't show again' button for this workspace
+    if (foldersInSettings === undefined && !(atStartup && doNotShowAgain)) {
         const sourceDirs: ALSSourceDirDescription[] = (await alsClient.sendRequest(
             ExecuteCommandRequest.type,
             {
@@ -429,17 +425,30 @@ export async function checkSrcDirectories(
         if (workspaceDirsToAdd.length > 0) {
             let doAdd = true;
 
-            if (displayPopupWhenMissing) {
+            if (displayYesNoPopup) {
+                const buttons: ('Yes' | 'No' | "Don't Show Again")[] = ['Yes', 'No'];
+
+                //  Show the 'Don't Show Again' button only at startup
+                if (atStartup) {
+                    buttons.push("Don't Show Again");
+                }
+
                 await vscode.window
                     .showInformationMessage(
                         'Some project source directories are not \
-                        listed in your workspace: do you want to add them?',
-                        'Yes',
-                        'No'
+                    listed in your workspace: do you want to add them?',
+                        ...buttons
                     )
                     .then((answer) => {
                         if (answer !== 'Yes') {
                             doAdd = false;
+
+                            if (answer === "Don't Show Again") {
+                                void adaExtState.context.workspaceState.update(
+                                    doNotShowAgainKey,
+                                    true
+                                );
+                            }
                         }
                     });
             }
@@ -453,7 +462,7 @@ export async function checkSrcDirectories(
                     ...workspaceDirsToAdd
                 );
             }
-        } else if (displayPopupOnSuccess) {
+        } else if (!atStartup) {
             void vscode.window.showInformationMessage(
                 "All the project's source directories are already \
                 available in the current workspace."

integration/vscode/ada/src/extension.ts

@@ -171,7 +171,7 @@ async function activateExtension(context: vscode.ExtensionContext) {
     /**
      * This can display a dialog to the User so don't wait on the result.
      */
-    void vscode.commands.executeCommand('ada.addMissingDirsToWorkspace', true, false);
+    void vscode.commands.executeCommand('ada.addMissingDirsToWorkspace', true);
 }
 
 function setUpLogging(context: vscode.ExtensionContext) {

integration/vscode/ada/test/suite/workspace_missing_dirs/workspace_missing_dirs.test.ts

@@ -18,7 +18,7 @@ suite('Extensions Advanced Test Suite', function () {
 
             // Execute the 'ada.addMissingDirsToWorkspace' command, that imports the missing
             // source directories into the current workspace if needed
-            await vscode.commands.executeCommand('ada.addMissingDirsToWorkspace', false);
+            await vscode.commands.executeCommand('ada.addMissingDirsToWorkspace', false, false);
 
             // Check that we have 3 workspace folders after executing the command
             folders = vscode.workspace.workspaceFolders;

source/ada/lsp-ada_completions-generic_assoc.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                         Language Server Protocol                         --
 --                                                                          --
---                     Copyright (C) 2022-2023, AdaCore                     --
+--                     Copyright (C) 2022-2024, AdaCore                     --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -23,6 +23,7 @@ with LSP.Ada_Documents;
 with LSP.Enumerations;
 with VSS.Strings.Character_Iterators;
 with VSS.Strings.Conversions;
+with VSS.Transformers.Caseless;
 with VSS.Unicode;
 
 pragma Warnings (Off, "is not referenced");
@@ -265,7 +266,7 @@ package body LSP.Ada_Completions.Generic_Assoc is
                        or else
                          Name.Starts_With
                            (Completion_Prefix,
-                            VSS.Strings.Identifier_Caseless)
+                            VSS.Transformers.Caseless.To_Identifier_Caseless)
                      then
                         --  Snippet Format: "Name => "
                         Item.label := Name;

source/ada/lsp-ada_completions-keywords.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                         Language Server Protocol                         --
 --                                                                          --
---                     Copyright (C) 2018-2021, AdaCore                     --
+--                     Copyright (C) 2018-2024, AdaCore                     --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -19,6 +19,7 @@ with Ada.Strings.Wide_Wide_Unbounded;
 with Libadalang.Common;
 
 with VSS.Strings;
+with VSS.Transformers.Caseless;
 
 with LSP.Ada_Completions.Filters;
 with LSP.Enumerations;
@@ -72,7 +73,7 @@ package body LSP.Ada_Completions.Keywords is
 
             begin
                if Label.Starts_With
-                    (Prefix, VSS.Strings.Identifier_Caseless)
+                    (Prefix, VSS.Transformers.Caseless.To_Identifier_Caseless)
                then
                   Item.label := Label;
                   Item.insertTextFormat := (True, LSP.Enumerations.PlainText);

source/ada/lsp-ada_completions-names.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                         Language Server Protocol                         --
 --                                                                          --
---                     Copyright (C) 2018-2021, AdaCore                     --
+--                     Copyright (C) 2018-2024, AdaCore                     --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -18,6 +18,7 @@
 with Langkit_Support.Errors;
 
 with VSS.Strings;
+with VSS.Transformers.Caseless;
 
 with LSP.Ada_Completions.Filters;
 
@@ -185,7 +186,8 @@ package body LSP.Ada_Completions.Names is
                   elsif Dotted_Node.Kind in
                        Libadalang.Common.Ada_Dotted_Name_Range
                     or else Name.Starts_With
-                      (Prefix, VSS.Strings.Identifier_Caseless)
+                      (Prefix,
+                       VSS.Transformers.Caseless.To_Identifier_Caseless)
                   then
                      Completion_Count := Completion_Count + 1;
 

source/ada/lsp-ada_configurations.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                         Language Server Protocol                         --
 --                                                                          --
---                     Copyright (C) 2018-2023, AdaCore                     --
+--                     Copyright (C) 2018-2024, AdaCore                     --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -25,16 +25,19 @@ with VSS.JSON.Pull_Readers.Simple;
 with VSS.JSON.Streams;
 with VSS.Strings.Conversions;
 with VSS.Text_Streams.File_Input;
+with VSS.Transformers.Casing;
 
 package body LSP.Ada_Configurations is
 
    Doc_Style_Values : constant VSS.String_Vectors.Virtual_String_Vector :=
      [for Item in GNATdoc.Comments.Options.Documentation_Style =>
-        VSS.Strings.To_Virtual_String (Item'Wide_Wide_Image).To_Lowercase];
+        VSS.Strings.To_Virtual_String (Item'Wide_Wide_Image).Transform
+          (VSS.Transformers.Casing.To_Lowercase)];
 
    Display_Method_Values : constant VSS.String_Vectors.Virtual_String_Vector :=
      [for Item in LSP.Enumerations.AlsDisplayMethodAncestryOnNavigationPolicy
-        => VSS.Strings.To_Virtual_String (Item'Wide_Wide_Image).To_Lowercase];
+        => VSS.Strings.To_Virtual_String (Item'Wide_Wide_Image).Transform
+          (VSS.Transformers.Casing.To_Lowercase)];
 
    function "+" (X : VSS.Strings.Virtual_String'Class) return String renames
      VSS.Strings.Conversions.To_UTF_8_String;

source/ada/lsp-predefined_completion.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                         Language Server Protocol                         --
 --                                                                          --
---                     Copyright (C) 2020-2021, AdaCore                     --
+--                     Copyright (C) 2020-2024, AdaCore                     --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -25,6 +25,7 @@ with GNATCOLL.VFS;      use GNATCOLL.VFS;
 with GNATCOLL.Utils;
 
 with VSS.Strings.Conversions;
+with VSS.Transformers.Caseless;
 
 with LSP.Enumerations;
 with LSP.Predefined_Completion.Ada2012;
@@ -201,7 +202,7 @@ package body LSP.Predefined_Completion is
    begin
       for Item of Items loop
          if Item.label.Starts_With
-           (Prefix, VSS.Strings.Identifier_Caseless)
+           (Prefix, VSS.Transformers.Caseless.To_Identifier_Caseless)
          then
             Result.Append (Item);
          end if;

source/ada/lsp-search-start_word.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                         Language Server Protocol                         --
 --                                                                          --
---                     Copyright (C) 2021-2023, AdaCore                     --
+--                     Copyright (C) 2021-2024, AdaCore                     --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -15,6 +15,8 @@
 -- of the license.                                                          --
 ------------------------------------------------------------------------------
 
+with VSS.Transformers.Caseless; use VSS.Transformers.Caseless;
+
 package body LSP.Search.Start_Word is
 
    -----------
@@ -54,15 +56,15 @@ package body LSP.Search.Start_Word is
    overriding function Match
      (Self : Start_Word_Search;
       Text : VSS.Strings.Virtual_String)
-      return Boolean
-   is
-      Kind : constant array (Boolean) of VSS.Strings.Case_Sensitivity :=
-        [False => VSS.Strings.Identifier_Caseless,
-         True  => VSS.Strings.Case_Sensitive];
-
+      return Boolean is
    begin
-      return Text.Starts_With (Self.Text, Kind (Self.Case_Sensitive))
-        xor Self.Negate;
+      case Self.Case_Sensitive is
+         when False =>
+            return Text.Starts_With (Self.Text, To_Identifier_Caseless)
+              xor Self.Negate;
+         when True =>
+            return Text.Starts_With (Self.Text) xor Self.Negate;
+      end case;
    end Match;
 
 end LSP.Search.Start_Word;