@@ -13,7 +13,6 @@ use deno_lint::diagnostic::LintDiagnostic;
13
13
use deno_lint:: linter:: LinterBuilder ;
14
14
use deno_lint:: rules:: { get_all_rules, get_recommended_rules} ;
15
15
use deno_lint:: swc_util:: get_default_ts_config;
16
- use ignore:: overrides:: OverrideBuilder ;
17
16
use ignore:: types:: TypesBuilder ;
18
17
use ignore:: WalkBuilder ;
19
18
use napi:: { CallContext , Error , JsBoolean , JsBuffer , JsObject , JsString , Module , Result , Status } ;
@@ -173,6 +172,10 @@ fn lint_command(ctx: CallContext) -> Result<JsBoolean> {
173
172
174
173
eslint_ignore_file. push ( ".eslintignore" ) ;
175
174
175
+ let mut denolint_ignore_file = cwd. clone ( ) ;
176
+
177
+ denolint_ignore_file. push ( ".denolintignore" ) ;
178
+
176
179
let mut type_builder = TypesBuilder :: new ( ) ;
177
180
178
181
type_builder
@@ -189,27 +192,28 @@ fn lint_command(ctx: CallContext) -> Result<JsBoolean> {
189
192
. build ( )
190
193
. map_err ( |e| Error :: from_reason ( format ! ( "{}" , e) ) ) ?;
191
194
192
- let override_ignore = match fs:: File :: open ( & eslint_ignore_file) {
193
- Ok ( _) => OverrideBuilder :: new ( eslint_ignore_file)
194
- . build ( )
195
- . map_err ( |e| {
196
- Error :: from_reason ( format ! (
197
- "Create ignore rules from .eslintignore file failed {}" ,
198
- e
199
- ) )
200
- } ) ?,
201
- Err ( _) => OverrideBuilder :: new ( __dirname. as_str ( ) ?)
202
- . build ( )
203
- . map_err ( |e| {
204
- Error :: from_reason ( format ! (
205
- "Create ignore rules from .defaultignore file failed {}" ,
206
- e
207
- ) )
208
- } ) ?,
195
+ let ignore_file_path = match fs:: File :: open ( & denolint_ignore_file) {
196
+ Ok ( _) => denolint_ignore_file
197
+ . as_path ( )
198
+ . to_str ( )
199
+ . ok_or ( Error :: from_reason ( format ! (
200
+ "Convert path to string failed: {:?}" ,
201
+ & denolint_ignore_file
202
+ ) ) ) ?,
203
+ Err ( _) => match fs:: File :: open ( & eslint_ignore_file) {
204
+ Ok ( _) => eslint_ignore_file
205
+ . as_path ( )
206
+ . to_str ( )
207
+ . ok_or ( Error :: from_reason ( format ! (
208
+ "Convert path to string failed: {:?}" ,
209
+ & eslint_ignore_file
210
+ ) ) ) ?,
211
+ Err ( _) => __dirname. as_str ( ) ?,
212
+ } ,
209
213
} ;
210
214
211
215
for result in WalkBuilder :: new ( cwd)
212
- . overrides ( override_ignore )
216
+ . add_custom_ignore_filename ( ignore_file_path )
213
217
. types ( types)
214
218
. follow_links ( true )
215
219
. build ( )
@@ -220,6 +224,7 @@ fn lint_command(ctx: CallContext) -> Result<JsBoolean> {
220
224
if !p. is_dir ( ) {
221
225
let file_content = fs:: read_to_string ( & p)
222
226
. map_err ( |e| Error :: from_reason ( format ! ( "Read file {:?} failed: {}" , p, e) ) ) ?;
227
+ println ! ( "{:?}" , & p) ;
223
228
let mut linter = LinterBuilder :: default ( )
224
229
. rules ( if enable_all_rules {
225
230
get_all_rules ( )
0 commit comments