feat(vscode) - Adding additional csharp lsp server functionality

apps/vs-code-designer/package.json

@@ -56,7 +56,7 @@
   },
   "private": true,
   "scripts": {
-    "build:extension": "tsup && pnpm run copyFiles",
+    "build:extension": "tsup && pnpm run copyFiles && cd dist && npm install --ignore-scripts",
     "build:ui": "tsup --config tsup.e2e.test.config.ts",
     "copyFiles": "node extension-copy-svgs.js",
     "vscode:designer:pack": "pnpm run vscode:designer:pack:step1 && pnpm run vscode:designer:pack:step2",

apps/vs-code-designer/src/__test__/devContainerIntegration.test.ts

@@ -150,21 +150,25 @@ describe('devContainer Integration Tests', () => {
   });
 
   describe('useBinariesDependencies - devContainer override', () => {
-    it('should return false in devContainer regardless of global setting', async () => {
-      // Use importActual to run the REAL useBinariesDependencies logic.
-      // Its dependencies (isDevContainerWorkspace, getGlobalSetting) are still mocked.
-      const { useBinariesDependencies: realUseBinariesDependencies } =
-        await vi.importActual<typeof import('../app/utils/binaries')>('../app/utils/binaries');
-      const { isDevContainerWorkspace } = await import('../app/utils/devContainerUtils');
-      const settingsModule = await import('../app/utils/vsCodeConfig/settings');
-
-      vi.mocked(isDevContainerWorkspace).mockResolvedValue(true);
-      vi.mocked(settingsModule.getGlobalSetting).mockReturnValue(true);
-
-      const result = await realUseBinariesDependencies();
-
-      expect(result).toBe(false);
-    });
+    it(
+      'should return false in devContainer regardless of global setting',
+      async () => {
+        // Use importActual to run the REAL useBinariesDependencies logic.
+        // Its dependencies (isDevContainerWorkspace, getGlobalSetting) are still mocked.
+        const { useBinariesDependencies: realUseBinariesDependencies } =
+          await vi.importActual<typeof import('../app/utils/binaries')>('../app/utils/binaries');
+        const { isDevContainerWorkspace } = await import('../app/utils/devContainerUtils');
+        const settingsModule = await import('../app/utils/vsCodeConfig/settings');
+
+        vi.mocked(isDevContainerWorkspace).mockResolvedValue(true);
+        vi.mocked(settingsModule.getGlobalSetting).mockReturnValue(true);
+
+        const result = await realUseBinariesDependencies();
+
+        expect(result).toBe(false);
+      },
+      { timeout: 10000 }
+    );
 
     it('should respect global setting in non-devContainer workspace', async () => {
       const { useBinariesDependencies: realUseBinariesDependencies } =

apps/vs-code-designer/src/app/commands/__test__/pickCustomCodeWorkerProcess.test.ts

@@ -1,6 +1,10 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import * as vscode from 'vscode';
-import { pickCustomCodeNetHostProcess, pickCustomCodeNetHostProcessInternal } from '../pickCustomCodeWorkerProcess';
+import {
+  pickCustomCodeNetHostProcess,
+  pickCustomCodeNetHostProcessInternal,
+  pickCustomCodeWorkerChildProcess,
+} from '../pickCustomCodeWorkerProcess';
 import * as validatePreDebug from '../../debug/validatePreDebug';
 import { IRunningFuncTask, runningFuncTaskMap } from '../../utils/funcCoreTools/funcHostTask';
 import * as pickFuncProcessModule from '../pickFuncProcess';
@@ -143,6 +147,7 @@ describe('pickCustomCodeNetHostProcessInternal', () => {
 
 describe('pickCustomCodeWorkerChildProcess', async () => {
   const testFuncPid = 12345;
+  const testChildFuncPid = 54321;
   const testDotnetPid = 67890;
   const testLogicAppName = 'LogicApp';
   const testLogicAppPath = path.join('path', 'to', testLogicAppName);
@@ -177,8 +182,7 @@ describe('pickCustomCodeWorkerChildProcess', async () => {
     ]);
 
     // Re-import to get the mocked version
-    const { pickCustomCodeWorkerChildProcess: pickCustomCodeWorkerChildProcessMocked } = await import('../pickCustomCodeWorkerProcess');
-    const result = await pickCustomCodeWorkerChildProcessMocked(testFuncTask, false);
+    const result = await pickCustomCodeWorkerChildProcess(testFuncTask, false);
     expect(result).toBe(testDotnetPid.toString());
   });
 
@@ -190,27 +194,35 @@ describe('pickCustomCodeWorkerChildProcess', async () => {
       { command: 'other2', pid: 11112 },
     ]);
 
-    const { pickCustomCodeWorkerChildProcess: pickCustomCodeWorkerChildProcessMocked } = await import('../pickCustomCodeWorkerProcess');
-    const result = await pickCustomCodeWorkerChildProcessMocked(testFuncTask, false);
+    const result = await pickCustomCodeWorkerChildProcess(testFuncTask, false);
     expect(result).toBe(testDotnetPid.toString());
   });
 
-  it('should return the pid of a child process matching func on Unix', async () => {
+  it('should return the pid of a codeful child process matching dotnet on Unix', async () => {
     vi.stubGlobal('process', { platform: 'linux' });
-    vi.spyOn(pickFuncProcessModule, 'getUnixChildren').mockResolvedValue([
-      { command: 'func.exe', pid: testDotnetPid },
-      { command: 'other', pid: 11111 },
-    ]);
+    vi.spyOn(pickFuncProcessModule, 'getUnixChildren').mockImplementation((pid: Number) => {
+      if (pid === Number(testFuncPid)) {
+        return Promise.resolve([
+          { command: 'func', pid: testChildFuncPid },
+          { command: 'other', pid: 11111 },
+        ]);
+      } else if (pid === Number(testChildFuncPid)) {
+        return Promise.resolve([
+          { command: 'dotnet', pid: testDotnetPid },
+          { command: 'other', pid: 22222 },
+        ]);
+      } else {
+        return Promise.resolve([]);
+      }
+    });
 
-    const { pickCustomCodeWorkerChildProcess: pickCustomCodeWorkerChildProcessMocked } = await import('../pickCustomCodeWorkerProcess');
-    const result = await pickCustomCodeWorkerChildProcessMocked(testFuncTask, false);
+    const result = await pickCustomCodeWorkerChildProcess(testFuncTask, false /* isNetFxWorker */, false /* isCodeless */);
     expect(result).toBe(testDotnetPid.toString());
   });
 
   it('should return undefined if no matching child process is found', async () => {
     vi.stubGlobal('process', { platform: 'win32' });
-    const { pickCustomCodeWorkerChildProcess: pickCustomCodeWorkerChildProcessMocked } = await import('../pickCustomCodeWorkerProcess');
-    const result = await pickCustomCodeWorkerChildProcessMocked(testFuncTask, false);
+    const result = await pickCustomCodeWorkerChildProcess(testFuncTask, false);
     expect(result).toBeUndefined();
   });
 
@@ -220,8 +232,7 @@ describe('pickCustomCodeWorkerChildProcess', async () => {
     const getUnixChildren = vi.fn();
     vi.spyOn(pickFuncProcessModule, 'pickChildProcess').mockResolvedValue(undefined as any);
 
-    const { pickCustomCodeWorkerChildProcess: pickCustomCodeWorkerChildProcessMocked } = await import('../pickCustomCodeWorkerProcess');
-    const result = await pickCustomCodeWorkerChildProcessMocked(testFuncTask, false);
+    const result = await pickCustomCodeWorkerChildProcess(testFuncTask, false);
     expect(result).toBeUndefined();
   });
 });

apps/vs-code-designer/src/app/commands/__test__/pickFuncProcess.test.ts

@@ -0,0 +1,67 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+const mockGetChildProcessesWithScript = vi.fn();
+
+vi.mock('../../utils/findChildProcess/findChildProcess', () => ({
+  getChildProcessesWithScript: mockGetChildProcessesWithScript,
+}));
+
+const pickFuncProcessModule = await import('../pickFuncProcess');
+
+describe('findChildProcess', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it('returns the func.exe descendant pid on Windows', async () => {
+    vi.spyOn(process, 'platform', 'get').mockReturnValue('win32');
+    mockGetChildProcessesWithScript.mockResolvedValue([
+      { processId: 6312, name: 'conhost.exe', parentProcessId: 17884 },
+      { processId: 31696, name: 'func.exe', parentProcessId: 17884 },
+      { processId: 33904, name: 'node.exe', parentProcessId: 31696 },
+    ]);
+
+    const result = await pickFuncProcessModule.findChildProcess(17884);
+
+    expect(result).toBe('31696');
+    expect(mockGetChildProcessesWithScript).toHaveBeenCalledWith(17884);
+  });
+
+  it('returns undefined on Windows when no func.exe descendant is found', async () => {
+    vi.spyOn(process, 'platform', 'get').mockReturnValue('win32');
+    mockGetChildProcessesWithScript.mockResolvedValue([
+      { processId: 6312, name: 'conhost.exe', parentProcessId: 17884 },
+      { processId: 33904, name: 'node.exe', parentProcessId: 31696 },
+    ]);
+
+    const result = await pickFuncProcessModule.findChildProcess(17884);
+
+    expect(result).toBeUndefined();
+  });
+
+  it('returns a matching child pid on Unix and does not fall back to the parent pid', async () => {
+    vi.spyOn(process, 'platform', 'get').mockReturnValue('linux');
+    vi.spyOn(pickFuncProcessModule, 'getUnixChildren').mockResolvedValue([
+      { command: 'bash', pid: 1000 },
+      { command: 'func', pid: 2000 },
+      { command: 'dotnet', pid: 3000 },
+    ]);
+
+    const result = await pickFuncProcessModule.findChildProcess(1234);
+
+    expect(result).toBe('3000');
+  });
+
+  it('returns undefined on Unix when no matching child process is found', async () => {
+    vi.spyOn(process, 'platform', 'get').mockReturnValue('linux');
+    vi.spyOn(pickFuncProcessModule, 'getUnixChildren').mockResolvedValue([{ command: 'bash', pid: 1000 }]);
+
+    const result = await pickFuncProcessModule.findChildProcess(1234);
+
+    expect(result).toBeUndefined();
+  });
+});

apps/vs-code-designer/src/app/commands/appSettings/uploadAppSettings.ts

@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { localSettingsFileName, logicAppFilter, ProjectDirectoryPathKey, workflowCodefulEnabled } from '../../../constants';
+import { localSettingsFileName, logicAppFilter } from '../../../constants';
 import { ext } from '../../../extensionVariables';
 import { localize } from '../../../localize';
 import { getLocalSettingsJson } from '../../utils/appSettings/localSettings';
@@ -66,9 +66,6 @@ export async function uploadAppSettings(
     }
 
     ext.outputChannel.appendLog(localize('uploadingSettings', 'Uploading settings...'), { resourceName: client.fullName });
-    if (localSettings.Values[workflowCodefulEnabled] === 'true') {
-      localSettings.Values[ProjectDirectoryPathKey] = 'C:\\home\\site\\wwwroot\\lib\\codeful';
-    }
     await confirmOverwriteSettings(context, localSettings.Values, remoteSettings.properties, client.fullName);
 
     if (excludedAppSettings.length) {

apps/vs-code-designer/src/app/commands/convertToWorkspace.ts

@@ -27,6 +27,29 @@ export async function createWorkspaceFile(context: IActionContext, options: any)
 
   const webviewProjectContext: IWebviewProjectContext = options;
 
+  // Add telemetry properties for debugging
+  context.telemetry.properties.hasWorkspaceProjectPath = String(!!webviewProjectContext.workspaceProjectPath);
+  context.telemetry.properties.workspaceProjectPathType = typeof webviewProjectContext.workspaceProjectPath;
+  context.telemetry.properties.receivedOptionsKeys = Object.keys(options || {}).join(',');
+
+  // Validate that workspaceProjectPath exists and has required properties
+  if (!webviewProjectContext.workspaceProjectPath || !webviewProjectContext.workspaceProjectPath.fsPath) {
+    const errorMessage = `[ConvertToWorkspace] Invalid workspaceProjectPath: ${JSON.stringify(
+      {
+        hasWorkspaceProjectPath: !!webviewProjectContext.workspaceProjectPath,
+        workspaceProjectPathType: typeof webviewProjectContext.workspaceProjectPath,
+        workspaceProjectPathValue: webviewProjectContext.workspaceProjectPath,
+        contextKeys: Object.keys(options || {}),
+      },
+      null,
+      2
+    )}`;
+    ext.outputChannel.appendLog(errorMessage);
+    throw new Error(
+      `workspaceProjectPath is required and must have an fsPath property. Received: ${JSON.stringify(webviewProjectContext.workspaceProjectPath)}`
+    );
+  }
+
   const workspaceFolderPath = path.join(webviewProjectContext.workspaceProjectPath.fsPath, webviewProjectContext.workspaceName);
 
   await fse.ensureDir(workspaceFolderPath);

apps/vs-code-designer/src/app/commands/createNewCodeProject/CodeProjectBase/CreateLogicAppProjects.ts

@@ -62,7 +62,7 @@ export async function createLogicAppProject(context: IActionContext, options: an
   const mySubContext: IFunctionWizardContext = context as IFunctionWizardContext;
   mySubContext.logicAppName = options.logicAppName;
   mySubContext.projectPath = logicAppFolderPath;
-  mySubContext.projectType = webviewProjectContext.logicAppType as ProjectType;
+  mySubContext.projectType = webviewProjectContext.logicAppType;
   mySubContext.functionFolderName = options.functionFolderName;
   mySubContext.functionAppName = options.functionName;
   mySubContext.functionAppNamespace = options.functionNamespace;