chore: 🛠️ refactor code

Author: PraneshASP

src/extension.js

@@ -6,8 +6,7 @@
 
 /** imports */
 const vscode = require("vscode");
-const path = require("path");
-const fs = require("fs");
+
 
 const {
   irOptimizerActiveFile,
@@ -41,7 +40,7 @@ const { treeFilesCodeActionProvider, treeFilesDiagnosticCollection } = require("
 
 const { scaffoldActiveFile, scaffoldContextMenu } = require("./commands/bulloak-scaffold");
 
-const { findSolidityFiles } = require("./helpers");
+const { provideCompletionItems } = require("./helpers");
 
 
 /** global vars */
@@ -153,67 +152,7 @@ function onActivate(context) {
   context.subscriptions.push(scaffoldActiveFileSubscription);
   context.subscriptions.push(scaffoldContextMenuSubscription);
 
-
-
-  async function provideCompletionItems(document, position) {
-    const linePrefix = document.lineAt(position).text.substring(0, position.character);
-    if (!linePrefix.startsWith('import')) {
-      return undefined;
-    }
-
-    // Step 1: Read and parse remappings
-    const workspaceFolders = vscode.workspace.workspaceFolders;
-    if (!workspaceFolders) return undefined; // No workspace folder open
-
-    const rootPath = workspaceFolders[0].uri.fsPath;
-    const remappingsPath = path.join(rootPath, 'remappings.txt');
-    let remappings = {};
-
-    if (fs.existsSync(remappingsPath)) {
-      const remappingsContent = fs.readFileSync(remappingsPath, 'utf8');
-      remappingsContent.split('\n').forEach(line => {
-        const [key, val] = line.split('=');
-        remappings[key.trim()] = val.trim();
-      });
-    }
-
-    // Step 2: Apply remappings to import paths
-    const solidityFiles = await findSolidityFiles();
-    const currentFilePath = document.uri.fsPath;
-    const currentDir = path.dirname(currentFilePath);
-
-
-    const completionItems = solidityFiles.map(file => {
-      let filePath = vscode.workspace.asRelativePath(file, false);
-      let remappedPath = filePath; // Start with the original path
-
-      // Apply remappings
-      Object.entries(remappings).forEach(([key, value]) => {
-        if (filePath.startsWith(value)) {
-          // Replace the matching part of the path with the remapping key
-          remappedPath = filePath.replace(value, key);
-        }
-      });
-
-      // Determine if the path was remapped
-      const isRemapped = remappedPath !== filePath;
-
-      // Use the remapped path if available, otherwise use the relative path
-      const finalPath = isRemapped ? remappedPath : `./${path.relative(currentDir, file).split(path.sep).join('/')}`;
-
-      const contractName = path.basename(file, '.sol');
-      const completionItem = new vscode.CompletionItem(`${contractName} from "${finalPath}"`, vscode.CompletionItemKind.File);
-
-      // Format the insert text based on whether the path was remapped
-      completionItem.insertText = `{${contractName}} from "${finalPath}";`;
-
-      return completionItem;
-    });
-
-
-    return completionItems;
-  }
-
+  // Import suggestions. 
   context.subscriptions.push(vscode.languages.registerCompletionItemProvider('solidity', { provideCompletionItems }, ['"', "{"]));
 
 

src/helpers.js

@@ -25,9 +25,8 @@ function newWindowBeside(content) {
 }
 
 
-async function provideImportSuggestions(document, position) {
+async function provideCompletionItems(document, position) {
   const linePrefix = document.lineAt(position).text.substring(0, position.character);
-  console.log("lineprefix", linePrefix);
   if (!linePrefix.startsWith('import')) {
     return undefined;
   }
@@ -80,8 +79,6 @@ async function provideImportSuggestions(document, position) {
 
     return completionItem;
   });
-
-
   return completionItems;
 }
 
@@ -195,4 +192,4 @@ const networkMap = {
 
 
 
-module.exports = { newWindowBeside, getContractRootDir, LANGID, networkMap, provideImportSuggestions, findSolidityFiles };
+module.exports = { newWindowBeside, getContractRootDir, LANGID, networkMap, provideCompletionItems, findSolidityFiles };