merge main

Author: PraneshASP

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: "https://www.omo.so/praneshasp"

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-solidity-inspector",
   "displayName": "Solidity Inspector",
   "description": "A vscode extension used to inspect Solidity files",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "engines": {
     "vscode": "^1.72.0"
   },

src/commands/contract-size.js

@@ -130,13 +130,12 @@ function getContractSizes(fileName) {
     const foundryJsonPath = path.join(workspaceRoot, foundryOutDir, `${path.basename(fileName)}`, `${contractName}.json`);
     let hardhatJsonPath = null;
     if (hardhatOutDir) {
-        const relativePath = path.relative(path.join(workspaceRoot, 'contracts'), fileName);
+        const relativePath = path.relative(workspaceRoot, fileName);
         hardhatJsonPath = path.join(hardhatOutDir, relativePath, `${contractName}.json`);
     }
 
     const jsonPaths = [foundryJsonPath, hardhatJsonPath].filter(Boolean);
-
-    for (const jsonPath of jsonPaths) {
+     for (const jsonPath of jsonPaths) {
         try {
             if (fs.existsSync(jsonPath)) {
                 const jsonContent = JSON.parse(fs.readFileSync(jsonPath, 'utf8'));

src/completionItems.js

@@ -103,8 +103,10 @@ async function loadRemappings(rootPath) {
         }
 
         const completionItem = new vscode.CompletionItem(`${name} from "${finalPath}"`, vscode.CompletionItemKind.File);
-        completionItem.insertText = `{ ${name} } from "${finalPath}";`;
-  
+        const currentLineRange = document.lineAt(position.line).text.length;
+        const rangeToRemove = new vscode.Range(position.line, 0, position.line, position.character + currentLineRange);
+        completionItem.insertText = `import { ${name} } from "${finalPath}";`;
+        completionItem.additionalTextEdits = [vscode.TextEdit.delete(rangeToRemove)];
         return completionItem;
       });
     });