@@ -157,14 +157,14 @@ function convertRule(
157157 let NodeEventGenerator ;
158158 let Traverser ;
159159 try {
160- createEmitter = require ( '../../eslint/lib/linter/safe-emitter.js' ) ;
161- NodeEventGenerator = require ( '../../eslint/lib/linter/node-event-generator.js' ) ;
162- Traverser = require ( '../../eslint/lib/shared/traverser.js' ) ;
160+ createEmitter = require ( '../../../ eslint/lib/linter/safe-emitter.js' ) ;
161+ NodeEventGenerator = require ( '../../../ eslint/lib/linter/node-event-generator.js' ) ;
162+ Traverser = require ( '../../../ eslint/lib/shared/traverser.js' ) ;
163163 }
164164 catch {
165- createEmitter = require ( require . resolve ( './node_modules/eslint/lib/linter/safe-emitter.js' ) ) ;
166- NodeEventGenerator = require ( require . resolve ( './node_modules/eslint/lib/linter/node-event-generator.js' ) ) ;
167- Traverser = require ( require . resolve ( './node_modules/eslint/lib/shared/traverser.js' ) ) ;
165+ createEmitter = require ( require . resolve ( '.. /node_modules/eslint/lib/linter/safe-emitter.js' ) ) ;
166+ NodeEventGenerator = require ( require . resolve ( '.. /node_modules/eslint/lib/linter/node-event-generator.js' ) ) ;
167+ Traverser = require ( require . resolve ( '.. /node_modules/eslint/lib/shared/traverser.js' ) ) ;
168168 }
169169
170170 const tsslintRule : TSSLint . Rule = ( { file, report, ...ctx } ) => {
@@ -225,11 +225,7 @@ function convertRule(
225225 }
226226 }
227227 else if ( 'node' in descriptor ) {
228- if ( descriptor . node . range ) {
229- start = descriptor . node . range [ 0 ] ;
230- end = descriptor . node . range [ 1 ] ;
231- }
232- else if ( descriptor . node . loc ) {
228+ if ( descriptor . node . loc ) {
233229 start = file . getPositionOfLineAndCharacter (
234230 descriptor . node . loc . start . line - 1 ,
235231 descriptor . node . loc . start . column ,
@@ -529,10 +525,10 @@ function getEstree(
529525
530526 const Parser = require ( '@typescript-eslint/parser' ) ;
531527 try {
532- SourceCode = require ( '../../eslint/lib/languages/js/source-code/source-code.js' ) ;
528+ SourceCode = require ( '../../../ eslint/lib/languages/js/source-code/source-code.js' ) ;
533529 }
534530 catch {
535- SourceCode = require ( require . resolve ( './node_modules/eslint/lib/languages/js/source-code/source-code.js' ) ) ;
531+ SourceCode = require ( require . resolve ( '.. /node_modules/eslint/lib/languages/js/source-code/source-code.js' ) ) ;
536532 }
537533
538534 const programProxy = new Proxy ( { } as ts . Program , {
0 commit comments