Merge pull request #3 from OpenForgeProject/optimize-code-dublication

refactor: extract functions for better readability and maintainability in extension.ts

Author: dermatz

src/extension.ts

@@ -10,59 +10,70 @@ export function activate(context: vscode.ExtensionContext) {
   if (isMagentoProject === 'Please select') {
     vscode.window.showInformationMessage('Is this a Magento project?', 'Yes', 'No').then(selection => {
       if (selection === 'Yes') {
-        vscode.window.showInformationMessage('Please select the Magento root folder.', 'Select Magento Root Folder').then(buttonSelection => {
-          if (buttonSelection === 'Select Magento Root Folder') {
-            const workspaceFolders = vscode.workspace.workspaceFolders;
-            const defaultUri = workspaceFolders && workspaceFolders.length > 0 ? workspaceFolders[0].uri : undefined;
-            vscode.window.showOpenDialog({ defaultUri, canSelectFolders: true, canSelectMany: false, openLabel: 'Select Magento Root Folder' }).then(folderUri => {
-              if (folderUri?.[0]) {
-                config.update('magentoLogViewer.magentoRoot', folderUri[0].fsPath, vscode.ConfigurationTarget.Workspace).then(() => {
-                  try {
-                    vscode.window.showInformationMessage('Magento root folder successfully saved!');
-                  } catch (error) {
-                    console.error('Failed to show information message:', error instanceof Error ? error.message : String(error));
-                  }
-                  config.update('magentoLogViewer.isMagentoProject', 'Yes', vscode.ConfigurationTarget.Workspace);
-                  activateExtension(context, folderUri[0].fsPath);
-                });
-              }
-            });
-          }
-        });
+        selectMagentoRootFolder(config, context);
       } else {
-        config.update('magentoLogViewer.isMagentoProject', selection, vscode.ConfigurationTarget.Workspace);
+        updateConfig(config, 'magentoLogViewer.isMagentoProject', selection);
       }
     });
   } else if (isMagentoProject === 'Yes') {
     const magentoRoot = config.get<string>('magentoLogViewer.magentoRoot', '');
     if (!magentoRoot || !isValidPath(magentoRoot)) {
-      try {
-        vscode.window.showErrorMessage('Magento root path is not set or is not a directory.');
-      } catch (error) {
-        console.error('Failed to show error message:', error instanceof Error ? error.message : String(error));
-      }
+      showErrorMessage('Magento root path is not set or is not a directory.');
       return;
     }
     activateExtension(context, magentoRoot);
   }
 }
 
+function selectMagentoRootFolder(config: vscode.WorkspaceConfiguration, context: vscode.ExtensionContext) {
+  vscode.window.showInformationMessage('Please select the Magento root folder.', 'Select Magento Root Folder').then(buttonSelection => {
+    if (buttonSelection === 'Select Magento Root Folder') {
+      const workspaceFolders = vscode.workspace.workspaceFolders;
+      const defaultUri = workspaceFolders && workspaceFolders.length > 0 ? workspaceFolders[0].uri : undefined;
+      vscode.window.showOpenDialog({ defaultUri, canSelectFolders: true, canSelectMany: false, openLabel: 'Select Magento Root Folder' }).then(folderUri => {
+        if (folderUri?.[0]) {
+          updateConfig(config, 'magentoLogViewer.magentoRoot', folderUri[0].fsPath).then(() => {
+            showInformationMessage('Magento root folder successfully saved!');
+            updateConfig(config, 'magentoLogViewer.isMagentoProject', 'Yes');
+            activateExtension(context, folderUri[0].fsPath);
+          });
+        }
+      });
+    }
+  });
+}
+
+function updateConfig(config: vscode.WorkspaceConfiguration, key: string, value: unknown) {
+  return config.update(key, value, vscode.ConfigurationTarget.Workspace);
+}
+
+function showInformationMessage(message: string) {
+  try {
+    vscode.window.showInformationMessage(message);
+  } catch (error) {
+    console.error('Failed to show information message:', error instanceof Error ? error.message : String(error));
+  }
+}
+
+function showErrorMessage(message: string) {
+  try {
+    vscode.window.showErrorMessage(message);
+  } catch (error) {
+    console.error('Failed to show error message:', error instanceof Error ? error.message : String(error));
+  }
+}
+
 function activateExtension(context: vscode.ExtensionContext, magentoRoot: string) {
   const logViewerProvider = new LogViewerProvider(magentoRoot);
   const treeView = vscode.window.createTreeView('logFiles', { treeDataProvider: logViewerProvider });
 
   vscode.commands.registerCommand('magento-log-viewer.refreshLogFiles', () => logViewerProvider.refresh());
   vscode.commands.registerCommand('magento-log-viewer.openFile', (filePath: string, lineNumber?: number) => {
-
     if (typeof filePath === 'string') {
-      if (lineNumber !== undefined && typeof lineNumber === 'number' && typeof vscode !== 'undefined' && typeof vscode.window !== 'undefined') {
-        const options: vscode.TextDocumentShowOptions = {
-          selection: new vscode.Range(new vscode.Position(lineNumber, 0), new vscode.Position(lineNumber, 0))
-        };
-        vscode.window.showTextDocument(vscode.Uri.file(filePath), options);
-      } else {
-        vscode.window.showTextDocument(vscode.Uri.file(filePath));
-      }
+      const options: vscode.TextDocumentShowOptions = lineNumber !== undefined && typeof lineNumber === 'number' ? {
+        selection: new vscode.Range(new vscode.Position(lineNumber, 0), new vscode.Position(lineNumber, 0))
+      } : {};
+      vscode.window.showTextDocument(vscode.Uri.file(filePath), options);
     }
   });
   vscode.commands.registerCommand('magento-log-viewer.openFileAtLine', (filePath: string, lineNumber: number) => {
@@ -78,17 +89,9 @@ function activateExtension(context: vscode.ExtensionContext, magentoRoot: string
       const files = fs.readdirSync(logPath);
       files.forEach(file => fs.unlinkSync(path.join(logPath, file)));
       logViewerProvider.refresh();
-      try {
-        vscode.window.showInformationMessage('All log files have been cleared.');
-      } catch (error) {
-        console.error('Failed to show information message:', error instanceof Error ? error.message : String(error));
-      }
+      showInformationMessage('All log files have been cleared.');
     } else {
-      try {
-        vscode.window.showInformationMessage('No log files found to clear.');
-      } catch (error) {
-        console.error('Failed to show information message:', error instanceof Error ? error.message : String(error));
-      }
+      showInformationMessage('No log files found to clear.');
     }
   });