@@ -41,26 +41,31 @@ function getSeverity(config, ruleId) {
41
41
* @returns {Comment|undefined } The gotten comment.
42
42
*/
43
43
function getCommentAt ( message , sourceCode ) {
44
- if ( sourceCode == null ) {
45
- return undefined
44
+ if ( sourceCode != null ) {
45
+ const loc = { line : message . line , column : message . column - 1 }
46
+ const index = sourceCode . getIndexFromLoc ( loc )
47
+ const options = { includeComments : true }
48
+ const comment = sourceCode . getTokenByRangeStart ( index , options )
49
+ if (
50
+ comment != null &&
51
+ ( comment . type === "Line" || comment . type === "Block" )
52
+ ) {
53
+ return comment
54
+ }
46
55
}
47
-
48
- const index = sourceCode . getIndexFromLoc ( message ) - 1
49
- return sourceCode . getTokenByRangeStart ( index , { includeComments : true } )
56
+ return undefined
50
57
}
51
58
52
59
/**
53
60
* Check whether a given message is a `reportUnusedDisableDirectives` error.
54
61
* @param {Message } message The message.
55
- * @param {Comment|undefined } comment The comment which existed at the message location.
56
62
* @returns {boolean } `true` if the message is a `reportUnusedDisableDirectives` error.
57
63
*/
58
- function isUnusedDisableDirectiveError ( message , comment ) {
64
+ function isUnusedDisableDirectiveError ( message ) {
59
65
return (
60
66
! message . fatal &&
61
67
! message . ruleId &&
62
- message . message . includes ( "eslint-disable" ) &&
63
- ( comment == null || comment . type === "Block" || comment . type === "Line" )
68
+ message . message . includes ( "eslint-disable" )
64
69
)
65
70
}
66
71
@@ -111,17 +116,15 @@ function createNoUnusedDisableError(ruleId, severity, message, comment) {
111
116
function convert ( messages , sourceCode , ruleId , severity , keepAsIs ) {
112
117
for ( let i = messages . length - 1 ; i >= 0 ; -- i ) {
113
118
const message = messages [ i ]
114
- const comment = getCommentAt ( message , sourceCode )
115
-
116
- if ( ! isUnusedDisableDirectiveError ( message , comment ) ) {
119
+ if ( ! isUnusedDisableDirectiveError ( message ) ) {
117
120
continue
118
121
}
119
122
120
123
const newMessage = createNoUnusedDisableError (
121
124
ruleId ,
122
125
severity ,
123
126
message ,
124
- comment
127
+ getCommentAt ( message , sourceCode )
125
128
)
126
129
127
130
if ( keepAsIs ) {
0 commit comments