Allow rename of lwc component inside of __tests__ directory

packages/salesforcedx-vscode-core/package.json

@@ -308,7 +308,7 @@
         },
         {
           "command": "sfdx.lightning.rename",
-          "when": "sfdx:project_opened && resource =~ /.*/(lwc|aura)/[^/]+(/[^/]+\\.(html|css|js|xml|svg|cmp|app|design|auradoc))?$/"
+          "when": "sfdx:project_opened && resource =~ /.*/(lwc|aura)/.*(/[^/]+\\.(html|css|js|xml|svg|cmp|app|design|auradoc))?$/"
         }
       ],
       "commandPalette": [

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

@@ -22,6 +22,7 @@ const RENAME_INPUT_PLACEHOLDER = 'rename_component_input_placeholder';
 const RENAME_INPUT_PROMPT = 'rename_component_input_prompt';
 const RENAME_INPUT_DUP_ERROR = 'rename_component_input_dup_error';
 const RENAME_INPUT_DUP_FILE_NAME_ERROR = 'rename_component_input_dup_file_name_error';
+const RENAME_ERROR = 'rename_component_error';
 const RENAME_WARNING = 'rename_component_warning';
 const LWC = 'lwc';
 const AURA = 'aura';
@@ -44,8 +45,14 @@ export class RenameLwcComponentExecutor extends LibraryCommandletExecutor<Compon
       let newComponentName = response.data.name?.trim();
       if (newComponentName && this.sourceFsPath) {
         newComponentName = await inputGuard(this.sourceFsPath, newComponentName);
-        await renameComponent(this.sourceFsPath, newComponentName);
-        return true;
+        try {
+          await renameComponent(this.sourceFsPath, newComponentName);
+          return true;
+        } catch (err) {
+          const errorMessage = nls.localize(RENAME_ERROR);
+          notificationService.showErrorMessage(errorMessage);
+          throw err;
+        }
       }
       return false;
   }
@@ -132,9 +139,21 @@ async function renameComponent(sourceFsPath: string, newName: string) {
   notificationService.showWarningMessage(nls.localize(RENAME_WARNING));
 }
 
+export function getLightningComponentDirectory(sourceFsPath: string): string {
+  const directories = sourceFsPath.split(path.sep);
+  const rootDir = directories.includes(LWC) ? LWC : AURA;
+  const lwcDirectoryIndex = directories.lastIndexOf(rootDir);
+  if (lwcDirectoryIndex > -1) {
+    directories.splice(lwcDirectoryIndex + 2);
+  }
+  return directories.join(path.sep);
+}
+
 async function getComponentPath(sourceFsPath: string): Promise<string> {
   const stats = await fs.promises.stat(sourceFsPath);
-  return stats.isFile() ? path.dirname(sourceFsPath) : sourceFsPath;
+  let dirname = stats.isFile() ? path.dirname(sourceFsPath) : sourceFsPath;
+  dirname = getLightningComponentDirectory(dirname);
+  return dirname;
 }
 
 function getComponentName(componentPath: string): string {

packages/salesforcedx-vscode-core/src/messages/i18n.ts

@@ -639,6 +639,8 @@ export const messages = {
     'Press Enter to confirm your input or Escape to cancel',
   rename_component_warning:
     'Warning: References to the old name will not be updated. Update manually and redeploy once all changes have been made.',
+  rename_component_error:
+    'Unable to rename the component. Try renaming the component manually and then redeploying your changes.',
   error_function_type: 'Unable to determine type of executing function.',
   error_unable_to_get_started_function:
     'Unable to access the function in "{0}".'

packages/salesforcedx-vscode-core/test/vscode-integration/commands/forceRenameLightningComponent.test.ts

@@ -4,7 +4,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as sinon from 'sinon';
 import * as vscode from 'vscode';
-import {inputGuard, isNameMatch, RenameLwcComponentExecutor} from '../../../src/commands/forceRenameLightningComponent';
+import {getLightningComponentDirectory, inputGuard, isNameMatch, RenameLwcComponentExecutor} from '../../../src/commands/forceRenameLightningComponent';
 import { nls } from '../../../src/messages';
 
 const RENAME_INPUT_DUP_ERROR = 'rename_component_input_dup_error';
@@ -399,5 +399,58 @@ describe('Force Rename Lightning Component', () => {
       expect(exceptionThrownLwc).to.equal(true);
       expect(exceptionThrownAura).to.equal(true);
     });
+
+  });
+
+  describe('getLightningComponentDirectory function', () => {
+
+    it('works with simple component folder', () => {
+      const folders = ['src', 'main', 'default', 'lwc', 'cmp'];
+      const folderPath = folders.join(path.sep);
+      const parentDirectory = getLightningComponentDirectory(folderPath);
+      expect(parentDirectory).to.equal(folderPath);
+    });
+
+    it('works with __tests__ folder in the path', () => {
+      const folders = ['src', 'main', 'default', 'lwc', 'cmp', '__tests__'];
+      const folderPath = folders.join(path.sep);
+
+      const parentFolder = folders.slice(0, -1);
+      const parentFolderPath = parentFolder.join(path.sep);
+
+      const parentDirectory = getLightningComponentDirectory(folderPath);
+      expect(parentDirectory).to.equal(parentFolderPath);
+    });
+
+    it('works with child folder of __tests__ folder', () => {
+      const folders = ['lwc', 'cmp', '__tests__', 'data'];
+      const folderPath = folders.join(path.sep);
+
+      const parentFolder = folders.slice(0, -2);
+      const parentFolderPath = parentFolder.join(path.sep);
+
+      const parentDirectory = getLightningComponentDirectory(folderPath);
+      expect(parentDirectory).to.equal(parentFolderPath);
+    });
+
+    it('works with templates folder of component', () => {
+      const folders = ['lwc', 'cmp', 'templates'];
+      const folderPath = folders.join(path.sep);
+
+      const parentFolder = folders.slice(0, -1);
+      const parentFolderPath = parentFolder.join(path.sep);
+
+      const parentDirectory = getLightningComponentDirectory(folderPath);
+      expect(parentDirectory).to.equal(parentFolderPath);
+    });
+
+    it('works with nested lwc folder of component', () => {
+      const folders = ['src', 'main', 'default', 'lwc', 'other', 'lwc', 'cmp'];
+      const folderPath = folders.join(path.sep);
+
+      const parentDirectory = getLightningComponentDirectory(folderPath);
+      expect(parentDirectory).to.equal(folderPath);
+    });
+
   });
 });