@atlisp/lint 0.1.20 → 0.1.22

package/dist/checks/empty-catch.js

@@ -61,19 +61,30 @@ function getSetqVarName(node) {
     return null;
 }
 function hasErrorCheckInSiblings(node, varName) {
-    const parent = node.parent;
+    let parent = node.parent;
     if (!parent || !parent.children)
         return false;
     const idx = parent.children.indexOf(node);
     for (let i = idx + 1; i < parent.children.length; i++) {
-        const sibling = parent.children[i];
-        if ((0, parser_1.astIsList)(sibling, 'vl-catch-all-error-p')) {
-            if (sibling.children && sibling.children.length >= 2 &&
-                (0, parser_1.astIsSymbol)(sibling.children[1], varName)) {
-                return true;
+        if (containsErrorCheck(parent.children[i], varName))
+            return true;
+    }
+    if ((0, parser_1.astIsList)(parent, 'setq')) {
+        const grandparent = parent.parent;
+        if (grandparent && grandparent.children) {
+            const parentIdx = grandparent.children.indexOf(parent);
+            for (let i = parentIdx + 1; i < grandparent.children.length; i++) {
+                if (containsErrorCheck(grandparent.children[i], varName))
+                    return true;
             }
         }
     }
     return false;
 }
+function containsErrorCheck(node, varName) {
+    const matches = (0, parser_1.astFindAll)(node, n => (0, parser_1.astIsList)(n, 'vl-catch-all-error-p') &&
+        n.children && n.children.length >= 2 &&
+        (0, parser_1.astIsSymbol)(n.children[1], varName));
+    return matches.length > 0;
+}
 //# sourceMappingURL=empty-catch.js.map

package/dist/checks/unused-catch-result.js

@@ -2,27 +2,48 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkUnusedCatchResult = checkUnusedCatchResult;
 const locale_1 = require("../locale");
+const parser_1 = require("@atlisp/parser");
 function checkUnusedCatchResult(content, file) {
     const issues = [];
-    const lines = content.split('\n');
-    const catchRe = /\(vl-catch-all-apply\s+'[^)]+\)/g;
-    for (let i = 0; i < lines.length; i++) {
-        const line = lines[i];
-        let match;
-        while ((match = catchRe.exec(line)) !== null) {
-            const col = match.index;
-            const after = line.slice(col + match[0].length).trim();
-            if (!after.startsWith(')')) {
-                issues.push({
-                    file,
-                    line: i + 1,
-                    severity: 'warn',
-                    rule: 'unused_catch_result',
-                    message: (0, locale_1.t)('unused_catch_result'),
-                });
-            }
-        }
+    const ast = (0, parser_1.parseAst)(content);
+    const catchNodes = (0, parser_1.astFindAll)(ast, n => (0, parser_1.astIsList)(n, 'vl-catch-all-apply'));
+    for (const node of catchNodes) {
+        if (isInQuote(node))
+            continue;
+        if (isWrappedByCatchError(node))
+            continue;
+        if (isSetqStored(node))
+            continue;
+        issues.push({
+            file,
+            line: node.pos.line,
+            severity: 'warn',
+            rule: 'unused_catch_result',
+            message: (0, locale_1.t)('unused_catch_result'),
+        });
     }
     return issues;
 }
+function isInQuote(node) {
+    let p = node.parent;
+    while (p) {
+        if ((0, parser_1.astIsList)(p, 'quote'))
+            return true;
+        p = p.parent;
+    }
+    return false;
+}
+function isWrappedByCatchError(node) {
+    const parent = node.parent;
+    return !!(parent && (0, parser_1.astIsList)(parent, 'vl-catch-all-error-p'));
+}
+function isSetqStored(node) {
+    const parent = node.parent;
+    if (!parent || !(0, parser_1.astIsList)(parent, 'setq'))
+        return false;
+    if (!parent.children || parent.children.length < 3)
+        return false;
+    const idx = parent.children.indexOf(node);
+    return idx >= 2 && idx % 2 === 0;
+}
 //# sourceMappingURL=unused-catch-result.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlisp/lint",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "AutoLISP static analysis tool — parens, security, conventions, SBCL syntax validation",
   "keywords": [
     "CAD",
@@ -37,7 +37,7 @@
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@atlisp/parser": "^0.1.0"
+    "@atlisp/parser": "^0.1.2"
   },
   "devDependencies": {
     "@types/jest": "^29",