Merge pull request #36 from PraneshASP/staging

✨ v1.2.1
PraneshASP · Dec 16, 2023 · b121e30 · b121e30
2 parents 242358c + 532eb66
commit b121e30
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-solidity-inspector",
   "displayName": "Solidity Inspector",
   "description": "A vscode extension used to inspect Solidity files",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "engines": {
     "vscode": "^1.72.0"
   },

diff --git a/src/commands/highlight-unused-imports.js b/src/commands/highlight-unused-imports.js
@@ -42,14 +42,16 @@ async function unusedImportsActiveFile(editor) {
         const solhintRuleString = "solhint-disable no-unused-import"
         if (text.includes(solhintRuleString)) return;
 
-        const importRegex = /import\s+((?:\{.+?\}\s+from\s+)?(?:\".*?\"|'.*?'));/g;
-        const imports = text.match(importRegex) || [];
+        const importRegex = /(?<!\/\/\/?).*import\s+((?:\{.+?\}\s+from\s+)?(?:\".*?\"|'.*?'));/g;
+        const importStatements = text.match(importRegex) || [];
         const unusedImportDecorations = [];
+        for (const importStatement of importStatements) {
+            // skip commented out import statements
+            if (importStatement.startsWith("//") || importStatement.startsWith("/*")) return;
 
-        for (const importStatement of imports) {
             const imports = extractImports(importStatement);
             for (const item of imports) {
-                const regex = new RegExp(item, 'g');
+                const regex = new RegExp(`\\b${item}\\b`, 'g');
                 const itemOccurrencesInImportStatement = (importStatement.replace(/\.sol\b/g, '').match(regex) || []).length;
                 const totalOccurrencesOfItem = (text.match(new RegExp(`\\b${item}\\b`, 'gi')) || []).length;
                 if (totalOccurrencesOfItem == itemOccurrencesInImportStatement) {

diff --git a/src/commands/parse-tree.js b/src/commands/parse-tree.js
@@ -10,15 +10,6 @@ const treeFilesCodeActionProvider = vscode.languages.registerCodeActionsProvider
 
         document.getText().split('\n').forEach((lineText, lineNumber) => {
             lineText = lineText.trim();
-            if (lineNumber == 0 && !lineText.endsWith('.t.sol')) {
-                const diagnostic = new vscode.Diagnostic(
-                    new vscode.Range(0, 0, 0, lineText.length),
-                    `Should be a valid test name (ending with .t.sol)`,
-                    vscode.DiagnosticSeverity.Error
-                );
-
-                diagnostics.push(diagnostic);
-            }
             if (/^(├──|└──|│)/.test(lineText)) {
                 const allowedPrefixes = ['it', 'when', 'given'];
                 lineText = lineText.replace(/^[^a-zA-Z0-9]+/, '');

diff --git a/src/syntaxes/tree-syntax.tmLanguage.json b/src/syntaxes/tree-syntax.tmLanguage.json
@@ -9,7 +9,7 @@
             "include": "#tree-characters"
         },
         {
-            "match": "\\b[a-zA-Z0-9_.-]+\\.t\\.sol\\b",
+            "match": "\\b[a-zA-Z0-9_.-]*?(Test[a-zA-Z0-9_.-]*|\\.t\\.sol)\\b",
             "name": "constant.filename"
         },
         {