Merge branch 'topic/als.1358.remove_implicit_fallback_for_configured_project' into 'edge'

Second pass on project loading

See merge request eng/ide/ada_language_server!1665

Author: AdrienBoulanger

integration/vscode/ada/src/ExtensionState.ts

@@ -47,7 +47,7 @@ export class ExtensionState {
     /**
      * The following fields are caches for ALS requests or costly properties.
      */
-    cachedProjectFile: string | undefined;
+    cachedProjectUri: vscode.Uri | undefined;
     cachedObjectDir: string | undefined;
     cachedMains: string[] | undefined;
     cachedExecutables: string[] | undefined;
@@ -57,7 +57,7 @@ export class ExtensionState {
     private sparkTaskProvider?: SimpleTaskProvider;
 
     public clearALSCache() {
-        this.cachedProjectFile = undefined;
+        this.cachedProjectUri = undefined;
         this.cachedObjectDir = undefined;
         this.cachedMains = undefined;
         this.cachedExecutables = undefined;
@@ -184,16 +184,26 @@ export class ExtensionState {
     };
 
     /**
-     * @returns the full path of the main project file from the ALS
+     * @returns the URI of the main project file from the ALS
      */
-    public async getProjectFile(): Promise<string> {
-        if (!this.cachedProjectFile) {
-            this.cachedProjectFile = (await this.adaClient.sendRequest(ExecuteCommandRequest.type, {
+    public async getProjectUri(): Promise<vscode.Uri | undefined> {
+        if (!this.cachedProjectUri) {
+            const strUri = (await this.adaClient.sendRequest(ExecuteCommandRequest.type, {
                 command: 'als-project-file',
             })) as string;
+            if (strUri != '') {
+                this.cachedProjectUri = vscode.Uri.parse(strUri, true);
+            }
         }
 
-        return this.cachedProjectFile;
+        return this.cachedProjectUri;
+    }
+
+    /**
+     * @returns the full path of the main project file from the ALS
+     */
+    public async getProjectFile(): Promise<string> {
+        return (await this.getProjectUri())?.fsPath ?? '';
     }
 
     /**

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

@@ -1,11 +1,10 @@
 import * as assert from 'assert';
 import { adaExtState } from '../../../src/extension';
-import { getProjectFile, getObjectDir } from '../../../src/helpers';
-import { assertEqualToFileContent, activate } from '../utils';
+import { getObjectDir } from '../../../src/helpers';
+import { activate, assertEqualToFileContent } from '../utils';
 
-import * as vscode from 'vscode';
 import { readFileSync, writeFileSync } from 'fs';
-import { basename } from 'path';
+import * as vscode from 'vscode';
 
 suite('Extensions Test Suite', function () {
     // Make sure the extension is activated
@@ -14,9 +13,14 @@ suite('Extensions Test Suite', function () {
     });
     test('Project File Response', async () => {
         if (vscode.workspace.workspaceFolders !== undefined) {
-            const result: string = await getProjectFile(adaExtState.adaClient);
-            const name = basename(result);
-            assert.strictEqual(name, 'prj.gpr');
+            // Uri obtained from the ALS
+            const alsUri = await adaExtState.getProjectUri();
+            // Uri manually computed based on the loaded workspace
+            const wsUri = vscode.Uri.joinPath(vscode.workspace.workspaceFolders[0].uri, 'prj.gpr');
+            // Ask for fsPath, it will resolve wsUri._fsPath
+            wsUri.fsPath != null
+            // Both should match
+            assert.deepStrictEqual(alsUri, wsUri);
         } else {
             throw new Error('No workspace folder found for the specified URI');
         }

source/ada/lsp-ada_handlers-other_file_commands.adb

@@ -132,13 +132,17 @@ package body LSP.Ada_Handlers.Other_File_Commands is
          begin
             --  First look in the closure of sources, then in the
             --  runtime project.
-            Unit := Handler.Project_Tree.Root_Project.Unit (F.Base_Name);
+            if Handler.Project_Tree.Is_Defined then
+               Unit := Handler.Project_Tree.Root_Project.Unit (F.Base_Name);
 
-            if not Unit.Is_Defined then
-               Unit := Handler.Project_Tree.Runtime_Project.Unit
-                 (F.Base_Name);
+               if not Unit.Is_Defined then
+                  Unit := Handler.Project_Tree.Runtime_Project.Unit
+                    (F.Base_Name);
+               end if;
+               return Unit;
+            else
+               return GPR2.Build.Compilation_Unit.Undefined;
             end if;
-            return Unit;
          end Unit_For_File;
 
       begin

source/ada/lsp-ada_handlers-project_file_commands.adb

@@ -17,6 +17,8 @@
 
 with GPR2.Project.View;
 
+with URIs;
+
 with VSS.JSON.Streams;
 
 package body LSP.Ada_Handlers.Project_File_Commands is
@@ -60,7 +62,7 @@ package body LSP.Ada_Handlers.Project_File_Commands is
       if Handler.Project_Tree.Is_Defined then
          Element := Handler.Project_Tree.Root_Project;
          Value := VSS.Strings.Conversions.To_Virtual_String
-           (String (Element.Path_Name.Value));
+           (URIs.Conversions.From_File (String (Element.Path_Name.Value)));
       end if;
 
       Response := (Is_Null => False, Value => <>);