@@ -637,7 +637,7 @@ const getUtils = (
637637} ;
638638
639639const getSettings = ( context ) => {
640- /* eslint-disable sort-keys-fix /sort-keys-fix */
640+ /* eslint-disable canonical /sort-keys */
641641 const settings = {
642642 // All rules
643643 ignorePrivate : Boolean ( context . settings . jsdoc ?. ignorePrivate ) ,
@@ -665,7 +665,7 @@ const getSettings = (context) => {
665665 mode : context . settings . jsdoc ?. mode ??
666666 ( context . parserPath . includes ( '@typescript-eslint' ) ? 'typescript' : 'jsdoc' ) ,
667667 } ;
668- /* eslint-enable sort-keys-fix /sort-keys-fix */
668+ /* eslint-enable canonical /sort-keys */
669669
670670 jsdocUtils . setTagStructure ( settings . mode ) ;
671671 try {
@@ -831,7 +831,7 @@ const iterateAllJsdocs = (iterator, ruleConfig, contexts, additiveContexts) => {
831831
832832 const utils = getBasicUtils ( context , settings ) ;
833833 jsdocNodes . forEach ( ( jsdocNode ) => {
834- if ( ! ( / ^ \/ \* \* \s / ) . test ( sourceCode . getText ( jsdocNode ) ) ) {
834+ if ( ! ( / ^ \/ \* \* \s / u ) . test ( sourceCode . getText ( jsdocNode ) ) ) {
835835 return ;
836836 }
837837
@@ -850,10 +850,18 @@ const iterateAllJsdocs = (iterator, ruleConfig, contexts, additiveContexts) => {
850850 lastIndex : idx ,
851851 selector : node ?. type ,
852852 } ,
853- indent , jsdoc ,
854- ruleConfig , context , lines , jsdocNode , node ,
855- settings , sourceCode , iterator ,
856- state , true ,
853+ indent ,
854+ jsdoc ,
855+ ruleConfig ,
856+ context ,
857+ lines ,
858+ jsdocNode ,
859+ node ,
860+ settings ,
861+ sourceCode ,
862+ iterator ,
863+ state ,
864+ true ,
857865 ) ;
858866 } ) ;
859867
@@ -880,10 +888,18 @@ const iterateAllJsdocs = (iterator, ruleConfig, contexts, additiveContexts) => {
880888 lastIndex,
881889 selector : node ?. type ,
882890 } ,
883- indent , jsdoc ,
884- ruleConfig , context , lines , jsdocNode , node ,
885- settings , sourceCode , iterator ,
886- state , true ,
891+ indent ,
892+ jsdoc ,
893+ ruleConfig ,
894+ context ,
895+ lines ,
896+ jsdocNode ,
897+ node ,
898+ settings ,
899+ sourceCode ,
900+ iterator ,
901+ state ,
902+ true ,
887903 ) ;
888904 } ) ;
889905 if ( lastCall && ruleConfig . exit ) {
@@ -1085,9 +1101,7 @@ export default function iterateJsdoc (iterator, ruleConfig) {
10851101 }
10861102
10871103 iterate (
1088- info , indent , jsdoc ,
1089- ruleConfig , context , lines , jsdocNode , node ,
1090- settings , sourceCode , iterator , state ,
1104+ info , indent , jsdoc , ruleConfig , context , lines , jsdocNode , node , settings , sourceCode , iterator , state ,
10911105 ) ;
10921106 } ;
10931107
0 commit comments