@tsslint/config 1.5.3 → 1.5.5

package/lib/plugins/ignore.js

@@ -121,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,26 +169,21 @@ function create(cmdOption, reportsUnusedComments) {
                     reportedRules.push([error.code, line]);
                     for (const code of [undefined, error.code]) {
                         const states = comments.get(code);
-                        if (states) {
-                            if (mode === 'singleLine') {
-                                if (states.some(({ nextLine }) => nextLine === line)) {
-                                    for (const state of states) {
-                                        if (state.nextLine === line) {
-                                            state.used = true;
-                                            break;
-                                        }
-                                    }
+                        if (!states) {
+                            continue;
+                        }
+                        if (mode === 'singleLine') {
+                            for (const state of states) {
+                                if (state.startLine === line) {
+                                    state.used = true;
                                     return false;
                                 }
                             }
-                            else {
-                                if (states.some(({ nextLine, lastLine }) => line >= nextLine && line <= (lastLine ?? Number.MAX_VALUE))) {
-                                    for (const state of states) {
-                                        if (line >= state.nextLine && line <= (state.lastLine ?? Number.MAX_VALUE)) {
-                                            state.used = true;
-                                            break;
-                                        }
-                                    }
+                        }
+                        else {
+                            for (const state of states) {
+                                if (line >= state.startLine && line <= (state.endLine ?? Number.MAX_VALUE)) {
+                                    state.used = true;
                                     return false;
                                 }
                             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsslint/config",
-	"version": "1.5.3",
+	"version": "1.5.5",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,8 +12,8 @@
 		"directory": "packages/config"
 	},
 	"dependencies": {
-		"@tsslint/types": "1.5.3",
+		"@tsslint/types": "1.5.5",
 		"ts-api-utils": "^2.0.0"
 	},
-	"gitHead": "563035c62d04ff2a5c393f4a37ab9635960de1d6"
+	"gitHead": "aa1bd7ed5b26cab99048001d1efa8880260f0c6e"
 }