@atlisp/lint 0.2.23 → 0.2.25

package/README.md

@@ -102,7 +102,6 @@ npx @atlisp/lint --format-check
 | `redundant_nil_else` | warn | 风格 | if 中冗余 nil 分支 |
 | `single_arg_and_or` | warn | 风格 | 单参数 and/or 可简化 |
 | `double_not` | warn | 风格 | 双重 (not (not ...)) |
-| `multiple_setq` | warn | 风格 | 连续 setq 可合并 |
 | `setq_multiple` | warn | 风格 | 连续 setq 可合并 |
 | `setq_single_arg` | warn | 正确性 | setq 缺少值 |
 | `assoc_without_cdr` | warn | 正确性 | assoc 结果未用 cdr 提取 |

package/atlisp-lint.default.json

@@ -32,7 +32,6 @@
     "recursive_call": "warn",
     "variable_shadow": "warn",
     "unused_local_fun": "warn",
-    "multiple_setq": "off",
     "redundant_quotes": "warn",
     "trailing_paren": "warn",
     "empty_comment": "warn",

package/atlisp-lint.schema.json

@@ -90,7 +90,6 @@
         "mixed_indent": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "info" },
         "module_cycle": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "warn" },
         "module_registration": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "off" },
-        "multiple_setq": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "info" },
         "namespace_header": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "off" },
         "no_return": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "info" },
         "nth_usage": { "type": "string", "enum": ["off", "info", "warn", "error"], "default": "info" },

package/dist/checks/builtin-arg-count.js

@@ -179,7 +179,7 @@ const BUILTIN_ARITY = {
     acad_colordlg: { min: 1, max: 3 },
     // === ActiveX ===
     'vlax-invoke-method': { min: 2, max: -1 },
-    'vlax-get-property': { min: 2, max: 2 },
+    'vlax-get-property': { min: 2, max: -1 },
     'vlax-put-property': { min: 3, max: 3 },
     'vlax-get-or-create-object': { min: 1, max: 2 },
     'vlax-create-object': { min: 1, max: 1 },
@@ -284,8 +284,12 @@ function checkNode(node, content, file, issues) {
             });
         }
     }
-    for (const child of node.children) {
-        checkNode(child, content, file, issues);
+    // Lambda lists may contain a bare `/` separator, which is not a function call
+    const lambdaListIdx = funcName === 'lambda' ? 1 : funcName === 'defun' || funcName === 'defun-q' ? 2 : -1;
+    for (let i = 0; i < node.children.length; i++) {
+        if (i === lambdaListIdx)
+            continue;
+        checkNode(node.children[i], content, file, issues);
     }
 }
 //# sourceMappingURL=builtin-arg-count.js.map

package/dist/checks/commented-code.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkCommentedCode = checkCommentedCode;
 const locale_1 = require("../locale");
+const utils_1 = require("../utils");
 const CODE_PATTERNS = [
     /^\s*\(defun\s/i,
     /^\s*\(setq\s/i,
@@ -22,17 +23,25 @@ const CODE_PATTERNS = [
 function checkCommentedCode(content, file) {
     const issues = [];
     const lines = content.split('\n');
+    const blockRanges = (0, utils_1.getBlockCommentRanges)(content);
     for (let i = 0; i < lines.length; i++) {
+        const lineNum = i + 1;
+        // Skip lines inside block comments
+        if ((0, utils_1.isInsideBlockComment)(lineNum, blockRanges))
+            continue;
         const line = lines[i];
         const match = line.match(/^\s*;+([^;].*)$/);
         if (!match)
             continue;
+        // Skip block comment markers ;| and |;
         const afterSemicolon = match[1];
+        if (afterSemicolon.startsWith('|'))
+            continue;
         for (const pat of CODE_PATTERNS) {
             if (pat.test(afterSemicolon)) {
                 issues.push({
                     file,
-                    line: i + 1,
+                    line: lineNum,
                     severity: 'warn',
                     rule: 'commented_code',
                     message: (0, locale_1.t)('commented_code'),

package/dist/checks/empty-comments.js

@@ -2,18 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkEmptyComments = checkEmptyComments;
 const locale_1 = require("../locale");
+const utils_1 = require("../utils");
 function checkEmptyComments(content, file) {
     const issues = [];
     const lines = content.split('\n');
+    const blockRanges = (0, utils_1.getBlockCommentRanges)(content);
     for (let i = 0; i < lines.length; i++) {
+        const lineNum = i + 1;
+        // Skip lines inside block comments
+        if ((0, utils_1.isInsideBlockComment)(lineNum, blockRanges))
+            continue;
         const line = lines[i].trim();
         // Check: line is a comment with only whitespace after the ;
-        if (line.startsWith(';')) {
+        // But skip block comment markers ;| and |;
+        if (line.startsWith(';') && !line.startsWith(';|') && !line.startsWith('|;')) {
             const afterSemicolon = line.slice(1);
             if (afterSemicolon.trim() === '') {
                 issues.push({
                     file,
-                    line: i + 1,
+                    line: lineNum,
                     severity: 'warn',
                     rule: 'empty_comment',
                     message: (0, locale_1.t)('empty_comment'),

package/dist/checks/error-handling.js

@@ -11,15 +11,20 @@ function checkErrorHandling(content, file) {
     let defunStart = 0;
     let defunText = '';
     let hasErrorHandler = false;
+    const blockRanges = (0, utils_1.getBlockCommentRanges)(content);
     let runningDepth = 0;
     for (let i = 0; i < lines.length; i++) {
+        const lineNum = i + 1;
+        // Skip lines inside block comments
+        if ((0, utils_1.isInsideBlockComment)(lineNum, blockRanges))
+            continue;
         const stripped = (0, utils_1.stripLine)(lines[i]);
         if (!inDefun) {
             const m = stripped.match(/\(defun\s+(\S+)/);
             if (m) {
                 inDefun = true;
                 defunName = m[1];
-                defunStart = i + 1;
+                defunStart = lineNum;
                 defunText = '';
                 hasErrorHandler = false;
                 runningDepth = 0;

package/dist/checks/extra-parens.js

@@ -7,7 +7,12 @@ function checkExtraParens(content, file) {
     const issues = [];
     const lines = content.split('\n');
     let runningDepth = 0;
+    const blockRanges = (0, utils_1.getBlockCommentRanges)(content);
     for (let i = 0; i < lines.length; i++) {
+        const lineNum = i + 1;
+        // Skip lines inside block comments
+        if ((0, utils_1.isInsideBlockComment)(lineNum, blockRanges))
+            continue;
         const stripped = (0, utils_1.stripLine)(lines[i]);
         const closeOnly = stripped.trim();
         // Empty line resets nothing; just continue tracking depth
@@ -29,7 +34,7 @@ function checkExtraParens(content, file) {
                 const extra = lineClose - runningDepth - lineOpen;
                 issues.push({
                     file,
-                    line: i + 1,
+                    line: lineNum,
                     severity: 'warn',
                     rule: 'extra_parens',
                     message: (0, locale_1.t)('extra_parens', extra),

package/dist/checks/function-order.js

@@ -7,7 +7,12 @@ function checkFunctionOrder(content, file) {
     const issues = [];
     const lines = content.split('\n');
     const defined = new Set();
+    const blockRanges = (0, utils_1.getBlockCommentRanges)(content);
     for (let i = 0; i < lines.length; i++) {
+        const lineNum = i + 1;
+        // Skip lines inside block comments
+        if ((0, utils_1.isInsideBlockComment)(lineNum, blockRanges))
+            continue;
         const stripped = (0, utils_1.stripLine)(lines[i]);
         const defunM = stripped.match(/\(defun\s+(\S+)/);
         if (defunM) {
@@ -24,7 +29,7 @@ function checkFunctionOrder(content, file) {
                 continue;
             if (!defined.has(name) && name.length > 1 && /^[a-z]/.test(name)) {
                 defined.add(name);
-                issues.push({ file, line: i + 1, severity: 'warn', rule: 'function_order', message: (0, locale_1.t)('function_order', name) });
+                issues.push({ file, line: lineNum, severity: 'warn', rule: 'function_order', message: (0, locale_1.t)('function_order', name) });
             }
         }
     }

package/dist/checks/missing-doc.js

@@ -6,7 +6,12 @@ const utils_1 = require("../utils");
 function checkMissingDoc(content, file) {
     const issues = [];
     const lines = content.split('\n');
+    const blockRanges = (0, utils_1.getBlockCommentRanges)(content);
     for (let i = 0; i < lines.length; i++) {
+        const lineNum = i + 1;
+        // Skip lines inside block comments
+        if ((0, utils_1.isInsideBlockComment)(lineNum, blockRanges))
+            continue;
         const stripped = (0, utils_1.stripLine)(lines[i]);
         const m = stripped.match(/\(defun\s+(\S+)/);
         if (!m)
@@ -18,10 +23,10 @@ function checkMissingDoc(content, file) {
             continue;
         if (name === 'T' || name === 'nil')
             continue;
-        if (!hasDocString(lines, i)) {
+        if (!hasDocString(lines, i, blockRanges)) {
             issues.push({
                 file,
-                line: i + 1,
+                line: lineNum,
                 severity: 'warn',
                 rule: 'missing_doc',
                 message: (0, locale_1.t)('missing_doc', name),
@@ -30,16 +35,30 @@ function checkMissingDoc(content, file) {
     }
     return issues;
 }
-function hasDocString(lines, defunLine) {
+function hasDocString(lines, defunLine, blockRanges) {
     let depth = 0;
     let inArgs = false;
     let argsDone = false;
     let inStr = false;
     let foundExpr = false;
+    let inBlockComment = false;
     for (let i = defunLine; i < lines.length; i++) {
         const line = lines[i];
         for (let j = 0; j < line.length; j++) {
             const ch = line[j];
+            // Handle block comments
+            if (!inStr && !inBlockComment && ch === ';' && line[j + 1] === '|') {
+                inBlockComment = true;
+                j++; // skip |
+                continue;
+            }
+            if (inBlockComment) {
+                if (ch === '|' && line[j + 1] === ';') {
+                    inBlockComment = false;
+                    j++; // skip ;
+                }
+                continue;
+            }
             if (ch === ';' && !inStr)
                 break;
             if (inStr) {

package/dist/checks/parens.js

@@ -2,11 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkParens = checkParens;
 const locale_1 = require("../locale");
+const utils_1 = require("../utils");
 function checkParens(content, file) {
     let openP = 0, closeP = 0;
     let inStr = false;
-    const lines = content.split('\n');
-    for (const line of lines) {
+    const blockRanges = (0, utils_1.getBlockCommentRanges)(content);
+    const cleaned = (0, utils_1.skipBlockComments)(content, blockRanges);
+    const lines = cleaned.split('\n');
+    for (let lineIdx = 0; lineIdx < lines.length; lineIdx++) {
+        const line = lines[lineIdx];
+        // Skip lines that are entirely within a block comment
+        if ((0, utils_1.isInsideBlockComment)(lineIdx + 1, blockRanges))
+            continue;
         let i = 0;
         while (i < line.length) {
             const ch = line[i];

package/dist/checks/trailing-paren.js

@@ -2,14 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkTrailingParen = checkTrailingParen;
 const locale_1 = require("../locale");
+const utils_1 = require("../utils");
 function checkTrailingParen(content, file) {
     // Count total parens to detect excess closing parens
     let openCount = 0;
     let closeCount = 0;
     let inStr = false;
+    const blockRanges = (0, utils_1.getBlockCommentRanges)(content);
     // We must parse strings accurately to avoid counting parens inside strings
+    // Also skip block comments
+    let inBlockComment = false;
     for (let i = 0; i < content.length; i++) {
         const ch = content[i];
+        // Handle block comments
+        if (!inStr && !inBlockComment && ch === ';' && content[i + 1] === '|') {
+            inBlockComment = true;
+            i++; // skip |
+            continue;
+        }
+        if (inBlockComment) {
+            if (ch === '|' && content[i + 1] === ';') {
+                inBlockComment = false;
+                i++; // skip ;
+            }
+            continue;
+        }
         if (ch === '"')
             inStr = !inStr;
         if (inStr) {

package/dist/config.js

@@ -88,7 +88,6 @@ const DEFAULT_CONFIG = {
         recursive_call: 'warn',
         variable_shadow: 'warn',
         unused_local_fun: 'warn',
-        multiple_setq: 'info',
         redundant_quotes: 'info',
         trailing_paren: 'warn',
         empty_comment: 'info',

package/dist/disable.js

@@ -2,11 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseDisableComments = parseDisableComments;
 exports.isDisabled = isDisabled;
+const utils_1 = require("./utils");
 function parseDisableComments(content, fileLine) {
     const map = new Map();
     const lines = content.split('\n');
+    const blockRanges = (0, utils_1.getBlockCommentRanges)(content);
     for (let i = 0; i < lines.length; i++) {
+        const lineNum = i + 1;
         const line = lines[i];
+        // Disable comments inside block comments are also valid
+        // (this is a design choice - allows disabling rules within commented sections)
         const disableFileM = line.match(/;\s*atlisp-lint:\s*disable-file=(.+)/i);
         if (disableFileM) {
             const rules = disableFileM[1]
@@ -26,7 +31,7 @@ function parseDisableComments(content, fileLine) {
             .split(',')
             .map(r => r.trim())
             .filter(Boolean);
-        let targetLine = i + 1;
+        let targetLine = lineNum;
         if (fileLine !== undefined)
             targetLine = fileLine;
         for (const rule of rules) {

package/dist/formatter.js

@@ -79,7 +79,7 @@ function runStandardFormat(lines, lineIdx, depth, _indentSize, rawLine, trimmed)
     if (trimmedStripped === '') {
         return {
             formattedLines: [' '.repeat(depth * _indentSize) + trimmed.trimStart()],
-            newDepth: depth
+            newDepth: depth,
         };
     }
     const opens = (trimmedStripped.match(/\(/g) || []).length;
@@ -97,7 +97,7 @@ function runStandardFormat(lines, lineIdx, depth, _indentSize, rawLine, trimmed)
     }
     return {
         formattedLines: [' '.repeat(effectiveDepth * _indentSize) + trimmed.trimStart()],
-        newDepth: depth + opens - closes
+        newDepth: depth + opens - closes,
     };
 }
 function formatCode(content, indentSize = 2) {

package/dist/locale.js

@@ -42,7 +42,6 @@ const messages = {
         recursive_call: "Function '{0}' calls itself — possible infinite recursion",
         variable_shadow: "Variable '{0}' is set with setq inside a let that binds the same name",
         unused_local_fun: "Local function/variable '{0}' is defined in defun with / but never used",
-        multiple_setq: 'Consecutive (setq ...) forms — consider merging into a single (setq ...)',
         redundant_quotes: "Redundant double quote — ''x can be simplified to 'x",
         trailing_paren: "Excess closing parenthesis: {0} extra ')' found",
         empty_comment: 'Empty comment line — contains only a semicolon with no text',
@@ -186,7 +185,6 @@ Options:
         recursive_call: "函数 '{0}' 调用了自身——可能存在无限递归",
         variable_shadow: "变量 '{0}' 在 let 绑定了相同名称后被 setq 赋值",
         unused_local_fun: "局部函数/变量 '{0}' 在 defun 的 / 后定义但从未使用",
-        multiple_setq: '连续多个 (setq ...) ——建议合并为一个 (setq ...)',
         redundant_quotes: "冗余双引号 —— ''x 可以简化为 'x",
         trailing_paren: "多余闭合括号：发现 {0} 个额外的 ')'",
         empty_comment: '空注释行 —— 分号后没有内容',

package/dist/presets.js

@@ -27,7 +27,6 @@ exports.PRESETS = {
             recursive_call: 'warn',
             variable_shadow: 'warn',
             unused_local_fun: 'warn',
-            multiple_setq: 'info',
             redundant_quotes: 'info',
             trailing_paren: 'warn',
             empty_comment: 'info',
@@ -119,7 +118,6 @@ exports.PRESETS = {
             recursive_call: 'error',
             variable_shadow: 'error',
             unused_local_fun: 'error',
-            multiple_setq: 'info',
             redundant_quotes: 'error',
             trailing_paren: 'error',
             empty_comment: 'error',

package/dist/rules.js

@@ -122,7 +122,6 @@ exports.RULES = [
         description: '检测模块文件是否注册到 *modules*',
         category: '架构',
     },
-    { name: 'multiple_setq', defaultSeverity: 'info', description: '检测多个连续 setq 可以合并', category: '风格' },
     {
         name: 'namespace_header',
         defaultSeverity: 'off',

package/dist/runner.js

@@ -189,7 +189,6 @@ function runChecks(content, file, config) {
         'recursive_call',
         'variable_shadow',
         'unused_local_fun',
-        'multiple_setq',
         'redundant_quotes',
         'redundant_setq',
         'redundant_nil_else',

package/dist/utils.d.ts

@@ -11,6 +11,29 @@ export declare function codeLines(content: string): Generator<{
 export declare function findMatchingParen(s: string, start: number): number;
 /** Extract the next s-expression form starting at position */
 export declare function extractForm(s: string, start: number): [string, number];
+/**
+ * Get ranges of block comments (;| ... |;) in content.
+ * Returns array of {startLine, endLine} (1-indexed).
+ * startLine is the line containing ;|, endLine contains |;
+ */
+export declare function getBlockCommentRanges(content: string): Array<{
+    startLine: number;
+    endLine: number;
+}>;
+/** Check if a line (1-indexed) is inside a block comment */
+export declare function isInsideBlockComment(line: number, ranges: Array<{
+    startLine: number;
+    endLine: number;
+}>): boolean;
+/**
+ * Given content and block comment ranges, return content with block comments
+ * replaced by spaces (preserving line structure). Useful for checks that
+ * need to ignore block-commented code.
+ */
+export declare function skipBlockComments(content: string, ranges: Array<{
+    startLine: number;
+    endLine: number;
+}>): string;
 /** Extract string literals from a line */
 export declare function extractStrings(line: string): string[];
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.js

@@ -5,6 +5,9 @@ exports.stripLineRaw = stripLineRaw;
 exports.codeLines = codeLines;
 exports.findMatchingParen = findMatchingParen;
 exports.extractForm = extractForm;
+exports.getBlockCommentRanges = getBlockCommentRanges;
+exports.isInsideBlockComment = isInsideBlockComment;
+exports.skipBlockComments = skipBlockComments;
 exports.extractStrings = extractStrings;
 function stripLineInternal(line, keepQuotes) {
     const out = [];
@@ -101,6 +104,98 @@ function extractForm(s, start) {
     const end = findMatchingParen(s, i);
     return [s.slice(i, end + 1), end + 1];
 }
+/**
+ * Get ranges of block comments (;| ... |;) in content.
+ * Returns array of {startLine, endLine} (1-indexed).
+ * startLine is the line containing ;|, endLine contains |;
+ */
+function getBlockCommentRanges(content) {
+    const ranges = [];
+    const lines = content.split('\n');
+    let inBlock = false;
+    let startLine = 0;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (!inBlock) {
+            // Look for ;| outside of strings and line comments
+            let inStr = false;
+            for (let j = 0; j < line.length; j++) {
+                const ch = line[j];
+                if (ch === ';' && !inStr) {
+                    if (line[j + 1] === '|') {
+                        inBlock = true;
+                        startLine = i + 1; // 1-indexed
+                    }
+                    break; // Rest of line is comment or block comment start
+                }
+                if (ch === '"')
+                    inStr = !inStr;
+                if (ch === '\\' && inStr)
+                    j++; // skip escape
+            }
+        }
+        else {
+            // Look for |; to end block comment
+            for (let j = 0; j < line.length; j++) {
+                if (line[j] === '|' && line[j + 1] === ';') {
+                    ranges.push({ startLine, endLine: i + 1 }); // 1-indexed
+                    inBlock = false;
+                    break;
+                }
+            }
+        }
+    }
+    // Unterminated block comment
+    if (inBlock) {
+        ranges.push({ startLine, endLine: lines.length });
+    }
+    return ranges;
+}
+/** Check if a line (1-indexed) is inside a block comment */
+function isInsideBlockComment(line, ranges) {
+    for (const r of ranges) {
+        if (line >= r.startLine && line <= r.endLine)
+            return true;
+    }
+    return false;
+}
+/**
+ * Given content and block comment ranges, return content with block comments
+ * replaced by spaces (preserving line structure). Useful for checks that
+ * need to ignore block-commented code.
+ */
+function skipBlockComments(content, ranges) {
+    if (ranges.length === 0)
+        return content;
+    const lines = content.split('\n');
+    for (const r of ranges) {
+        for (let i = r.startLine - 1; i < Math.min(r.endLine, lines.length); i++) {
+            if (i === r.startLine - 1) {
+                // Keep content before ;|, replace rest with spaces
+                const idx = lines[i].indexOf(';|');
+                if (idx >= 0) {
+                    lines[i] = lines[i].slice(0, idx) + ' '.repeat(lines[i].length - idx);
+                }
+            }
+            else if (i === r.endLine - 1 && r.endLine !== r.startLine) {
+                // Keep content after |;
+                const idx = lines[i].indexOf('|;');
+                if (idx >= 0) {
+                    lines[i] = ' '.repeat(idx + 2) + lines[i].slice(idx + 2);
+                }
+                else {
+                    // |; not found yet (unterminated), blank the whole line
+                    lines[i] = ' '.repeat(lines[i].length);
+                }
+            }
+            else {
+                // Blank entire line
+                lines[i] = ' '.repeat(lines[i].length);
+            }
+        }
+    }
+    return lines.join('\n');
+}
 /** Extract string literals from a line */
 function extractStrings(line) {
     const strings = [];

package/dist/validate.js

@@ -39,7 +39,6 @@ const VALID_RULES = new Set([
     'missing_export',
     'mixed_indent',
     'module_registration',
-    'multiple_setq',
     'namespace_header',
     'no_return',
     'nth_usage',

package/dist/visitors/register.js

@@ -285,31 +285,6 @@ function registerVisitorRules(visitor, state, checks, addIssue, config, file) {
             });
         }
     }
-    if (checks['multiple_setq'] !== 'off') {
-        visitor.on('*', node => {
-            if ((0, parser_1.astIsList)(node)) {
-                // Skip condition/branch positions (if/and/or/while/...) where setq
-                // children are mutually exclusive or short-circuited — merging would break them.
-                if ((0, shared_1.isNonSequentialParent)(node))
-                    return;
-                let prevSetq = false;
-                for (const child of node.children) {
-                    if ((0, parser_1.astIsList)(child, 'setq')) {
-                        if (prevSetq) {
-                            addIssue('multiple_setq', child.pos.line, (0, locale_1.t)('multiple_setq'));
-                            prevSetq = false;
-                        }
-                        else {
-                            prevSetq = true;
-                        }
-                    }
-                    else {
-                        prevSetq = false;
-                    }
-                }
-            }
-        });
-    }
     if (checks['recursive_call'] !== 'off') {
         visitor.on('defun', node => {
             if (!(0, parser_1.astIsList)(node))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlisp/lint",
-  "version": "0.2.23",
+  "version": "0.2.25",
   "description": "AutoLISP static analysis tool — parens, security, conventions, SBCL syntax validation",
   "keywords": [
     "CAD",