@tsslint/config 1.5.2 → 1.5.4

package/lib/plugins/ignore.js

@@ -6,9 +6,11 @@ function create(cmdOption, reportsUnusedComments) {
     const mode = typeof cmdOption === 'string' ? 'singleLine' : 'multiLine';
     const [cmd, endCmd] = Array.isArray(cmdOption) ? cmdOption : [cmdOption, undefined];
     const cmdText = cmd.replace(/\?/g, '');
-    const withRuleId = '(\\b[ \\t]*|[ \\t]+)(?<ruleId>\\S*\\b)?';
-    const reg = new RegExp(`\\s*${cmd}${withRuleId}`);
-    const endReg = endCmd ? new RegExp(`\\s*${endCmd}${withRuleId}`) : undefined;
+    const withRuleId = '[ \\t]*(?<ruleId>\\w\\S*)?';
+    const header = '^\\s*';
+    const ending = '([ \\t]+[^\\r\\n]*)?$';
+    const reg = new RegExp(`${header}${cmd}${withRuleId}${ending}`);
+    const endReg = endCmd ? new RegExp(`${header}${endCmd}${withRuleId}${ending}`) : undefined;
     const completeReg1 = /^\s*\/\/(\s*)([\S]*)?$/;
     const completeReg2 = new RegExp(`//\\s*${cmd}(\\S*)?$`);
     return ({ typescript: ts, languageService }) => {
@@ -119,29 +121,36 @@ function create(cmdOption, reportsUnusedComments) {
                     const startComment = commentText.match(reg);
                     if (startComment?.index !== undefined) {
                         const index = startComment.index + pos;
-                        const nextLine = sourceFile.getLineAndCharacterOfPosition(index).line + 1;
                         const ruleId = startComment.groups?.ruleId;
                         if (!comments.has(ruleId)) {
                             comments.set(ruleId, []);
                         }
                         const disabledLines = comments.get(ruleId);
+                        const line = sourceFile.getLineAndCharacterOfPosition(index).line;
+                        let startLine = line;
+                        if (mode === 'singleLine') {
+                            const startWithComment = sourceFile.text.slice(sourceFile.getPositionOfLineAndCharacter(line, 0), index - 2).trim() === '';
+                            if (startWithComment) {
+                                startLine = line + 1; // If the comment is at the start of the line, the error is in the next line
+                            }
+                        }
                         disabledLines.push({
                             commentRange: [
                                 index - 2,
                                 index + startComment[0].length,
                             ],
-                            nextLine,
+                            startLine,
                         });
                     }
                     else if (endReg) {
                         const endComment = commentText.match(endReg);
                         if (endComment?.index !== undefined) {
                             const index = endComment.index + pos;
-                            const prevLine = sourceFile.getLineAndCharacterOfPosition(index).line - 1;
+                            const prevLine = sourceFile.getLineAndCharacterOfPosition(index).line;
                             const ruleId = endComment.groups?.ruleId;
                             const disabledLines = comments.get(ruleId);
                             if (disabledLines) {
-                                disabledLines[disabledLines.length - 1].lastLine = prevLine;
+                                disabledLines[disabledLines.length - 1].endLine = prevLine;
                             }
                         }
                     }
@@ -162,9 +171,9 @@ function create(cmdOption, reportsUnusedComments) {
                         const states = comments.get(code);
                         if (states) {
                             if (mode === 'singleLine') {
-                                if (states.some(({ nextLine }) => nextLine === line)) {
+                                if (states.some(comment => comment.startLine === line)) {
                                     for (const state of states) {
-                                        if (state.nextLine === line) {
+                                        if (state.startLine === line) {
                                             state.used = true;
                                             break;
                                         }
@@ -173,9 +182,9 @@ function create(cmdOption, reportsUnusedComments) {
                                 }
                             }
                             else {
-                                if (states.some(({ nextLine, lastLine }) => line >= nextLine && line <= (lastLine ?? Number.MAX_VALUE))) {
+                                if (states.some((comment => line >= comment.startLine && line <= (comment.endLine ?? Number.MAX_VALUE)))) {
                                     for (const state of states) {
-                                        if (line >= state.nextLine && line <= (state.lastLine ?? Number.MAX_VALUE)) {
+                                        if (line >= state.startLine && line <= (state.endLine ?? Number.MAX_VALUE)) {
                                             state.used = true;
                                             break;
                                         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/config",
-	"version": "1.5.2",
+	"version": "1.5.4",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,8 +12,8 @@
 		"directory": "packages/config"
 	},
 	"dependencies": {
-		"@tsslint/types": "1.5.2",
+		"@tsslint/types": "1.5.4",
 		"ts-api-utils": "^2.0.0"
 	},
-	"gitHead": "7d5ed919f5a6ac75b76319396ff2d43b5d9a8ad4"
+	"gitHead": "02cbc403c85b4224b5ccd732dc96f7a0991a6ae2"
 }