feat: more apex templates, move to metadata ext

Author: mshanemc

.claude/skills/playwright-e2e/references/local-setup.md

@@ -24,7 +24,7 @@ Prereq: authenticated Dev Hub (`sf org login web --set-default-dev-hub` or simil
 ```bash
 mkdir -p /tmp/minimal-project/force-app
 echo '{"packageDirectories":[{"path":"force-app","default":true}],"namespace":"","sfdcLoginUrl":"https://login.salesforce.com","sourceApiVersion":"64.0"}' > /tmp/minimal-project/sfdx-project.json
-cd /tmp/minimal-project && sf org create scratch -d -w 10 -a minimalTestOrg --wait 30 --json
+cd /tmp/minimal-project && sf org create scratch -d -w 10 -a minimalTestOrg --edition developer --json
 ```
 
 ## Non-tracking
@@ -36,7 +36,7 @@ cd /tmp/minimal-project && sf org create scratch -d -w 10 -a minimalTestOrg --wa
 ```bash
 mkdir -p /tmp/non-tracking-project/force-app
 echo '{"packageDirectories":[{"path":"force-app","default":true}],"namespace":"","sfdcLoginUrl":"https://login.salesforce.com","sourceApiVersion":"64.0"}' > /tmp/non-tracking-project/sfdx-project.json
-cd /tmp/non-tracking-project && sf org create scratch -d -w 10 -a nonTrackingTestOrg --wait 30 --no-track-source --json
+cd /tmp/non-tracking-project && sf org create scratch -d -w 10 -a nonTrackingTestOrg --edition developer --no-track-source --json
 ```
 
 **Note:** Non-tracking test skips on web locally — requires Dev Hub aliased as `hub`. Desktop and CI work.

eslint.config.mjs

@@ -58,7 +58,10 @@ export default [
       'packages/salesforcedx-lightning-lsp-common/src/html-language-service/**',
       '**/.vscode-test-web/**',
       '**/.vscode-test/**',
-      '**/playwright-report/**'
+      '**/playwright-report/**',
+      '**/playwright-report/',
+      '**/test-results/**',
+      '**/test-results/'
     ]
   },
   {

packages/playwright-vscode-ext/src/utils/fileHelpers.ts

@@ -78,16 +78,18 @@ export const createApexClass = async (page: Page, className: string, content?: s
 
   await executeCommandWithCommandPalette(page, 'SFDX: Create Apex Class');
 
-  // First prompt: "Enter Apex class name"
-  // Wait for widget to appear first (command palette closes, new prompt opens)
-  // Then wait for text to render (CI can be slower)
+  // First prompt: Quick Pick to select template - press Enter to accept default (DefaultApexClass)
   const quickInput = page.locator(QUICK_INPUT_WIDGET);
   await quickInput.waitFor({ state: 'visible', timeout: 10_000 });
+  await page.locator(QUICK_INPUT_LIST_ROW).first().waitFor({ state: 'visible', timeout: 5000 });
+  await page.keyboard.press('Enter');
+
+  // Second prompt: "Enter Apex class name"
   await quickInput.getByText(/Enter Apex class name/i).waitFor({ state: 'visible', timeout: 10_000 });
   await page.keyboard.type(className);
   await page.keyboard.press('Enter');
 
-  // Second prompt: Quick Pick to select output directory - just press Enter to accept default
+  // Third prompt: Quick Pick to select output directory - just press Enter to accept default
   await page.locator(QUICK_INPUT_LIST_ROW).first().waitFor({ state: 'visible', timeout: 5000 });
   await page.keyboard.press('Enter');
 

packages/salesforcedx-vscode-apex-testing/src/commands/apexGenerateUnitTestClass.ts

@@ -9,6 +9,7 @@ import { ExtensionProviderService, type SalesforceVSCodeServicesApi } from '@sal
 import * as Effect from 'effect/Effect';
 import * as vscode from 'vscode';
 import { Utils, URI } from 'vscode-uri';
+import { APEX_CLASS_NAME_MAX_LENGTH } from '../constants';
 import { nls } from '../messages';
 
 type SfProject = Effect.Effect.Success<
@@ -58,6 +59,8 @@ const promptForClassName = (): Promise<string | undefined> =>
           if (!value || value.trim().length === 0) return 'Class name cannot be empty';
           if (!/^[A-Za-z][A-Za-z0-9_]*$/.test(value))
             return 'Class name must start with a letter and contain only alphanumeric characters and underscores';
+          if (value.length > APEX_CLASS_NAME_MAX_LENGTH)
+            return nls.localize('apex_test_class_name_max_length_error', APEX_CLASS_NAME_MAX_LENGTH);
           return undefined;
         }
       })

packages/salesforcedx-vscode-apex-testing/src/constants.ts

@@ -5,6 +5,8 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
+export const APEX_CLASS_NAME_MAX_LENGTH = 40;
+
 export const PASS_RESULT = 'Pass';
 export const FAIL_RESULT = 'Fail';
 export const SKIP_RESULT = 'Skip';

packages/salesforcedx-vscode-apex-testing/src/messages/i18n.ja.ts

@@ -10,6 +10,7 @@ import type { MessageKey } from './i18n';
 export const messages: Partial<Record<MessageKey, string>> = {
   apex_generate_unit_test_class_text: 'SFDX: Apex ユニットテストクラスを作成',
   apex_test_class_output_dir_prompt: '出力ディレクトリを選択',
+  apex_test_class_name_max_length_error: 'クラス名は %d 文字を超えることはできません',
   apex_test_class_name_prompt: 'Apex テストクラス名を入力',
   apex_test_class_name_placeholder: 'マイテスト',
   apex_unit_test_template_description: 'サンプルテストメソッド付きテンプレート',

packages/salesforcedx-vscode-apex-testing/src/messages/i18n.ts

@@ -74,6 +74,7 @@ export const messages = {
   apex_test_error_api_message: 'The org returned an error: %s',
   apex_generate_unit_test_class_text: 'SFDX: Create Apex Unit Test Class',
   apex_test_class_output_dir_prompt: 'Select output directory',
+  apex_test_class_name_max_length_error: 'Class name cannot exceed %d characters',
   apex_test_class_name_prompt: 'Enter Apex test class name',
   apex_test_class_name_placeholder: 'MyTest',
   apex_unit_test_template_description: 'Template with sample test method',

packages/salesforcedx-vscode-automation-tests/test/specs/templates.e2e.ts

@@ -55,32 +55,7 @@ describe('Templates', () => {
     projectName = testSetup.tempProjectName;
   });
 
-  // Apex Class
-  it('Create an Apex Class', async () => {
-    logTestStart(testSetup, 'Create an Apex Class');
-    // Using the Command palette, run SFDX: Create Apex Class.
-    await createCommand('Apex Class', 'ApexClass1', 'classes', 'cls');
-
-    // Check for expected items in the Explorer view.
-    const workbench = getWorkbench();
-
-    // Get the matching (visible) items within the tree which contains "ApexClass1".
-    const filteredTreeViewItems = await getFilteredVisibleTreeViewItemLabels(workbench, projectName, 'ApexClass1');
-
-    expect(filteredTreeViewItems.includes('ApexClass1.cls')).to.equal(true);
-    expect(filteredTreeViewItems.includes('ApexClass1.cls-meta.xml')).to.equal(true);
-  });
-
-  it('Verify the contents of the Apex Class', async () => {
-    logTestStart(testSetup, 'Verify the contents of the Apex Class');
-    const expectedText = ['public with sharing class ApexClass1 {', '    public ApexClass1() {', '', '    }', '}'].join(
-      '\n'
-    );
-    const workbench = getWorkbench();
-    const textEditor = await getTextEditor(workbench, 'ApexClass1.cls');
-    const textGeneratedFromTemplate = (await textEditor.getText()).trimEnd().replaceAll('\r\n', '\n');
-    expect(textGeneratedFromTemplate).to.equal(expectedText);
-  });
+  // Apex Class is covered in apexGenerateClass.headless.spec.ts (salesforcedx-vscode-metadata)
 
   // Apex Unit Test Class is covered in apexTestClassCreate.headless.spec.ts
 

packages/salesforcedx-vscode-core/package.json

@@ -257,10 +257,6 @@
           "command": "sf.internal.lightning.generate.lwc",
           "when": "explorerResourceIsFolder && sf:internal_dev"
         },
-        {
-          "command": "sf.apex.generate.class",
-          "when": "explorerResourceIsFolder && resourcePath =~ /classes/ && sf:project_opened && sf:show_shared_commands"
-        },
         {
           "command": "sf.folder.diff",
           "when": "explorerResourceIsFolder && sf:project_opened && sf:has_target_org && sf:show_shared_commands"
@@ -383,10 +379,6 @@
           "command": "sf.view.remote.changes",
           "when": "sf:project_opened && !sf:isv_debug_project && sf:target_org_has_change_tracking && sf:show_shared_commands"
         },
-        {
-          "command": "sf.apex.generate.class",
-          "when": "sf:project_opened && sf:show_shared_commands"
-        },
         {
           "command": "sf.analytics.generate.template",
           "when": "sf:project_opened"
@@ -550,10 +542,6 @@
         "command": "sf.view.remote.changes",
         "title": "%view_remote_changes_text%"
       },
-      {
-        "command": "sf.apex.generate.class",
-        "title": "%apex_generate_class_text%"
-      },
       {
         "command": "sf.analytics.generate.template",
         "title": "%analytics_generate_template_text%"

packages/salesforcedx-vscode-core/src/commands/index.ts

@@ -29,7 +29,6 @@ export { projectRetrieveStart } from './projectRetrieveStart';
 export { viewAllChanges, viewLocalChanges, viewRemoteChanges } from './source/viewChanges';
 export {
   analyticsGenerateTemplate,
-  apexGenerateClass,
   apexGenerateTrigger,
   internalLightningGenerateApp,
   internalLightningGenerateAuraComponent,