From ed5ce95ab40c1fda9139fd9b7df47eea0ccc9d50 Mon Sep 17 00:00:00 2001 From: Phil Quitslund Date: Fri, 13 May 2022 09:08:24 -0700 Subject: [PATCH] remove `DartProject` references (dart-lang/linter#3399) --- .../rules/package_prefixed_library_names.dart | 62 +++++++++---------- .../rules/package_prefixed_library_names.dart | 3 +- 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/lib/src/rules/package_prefixed_library_names.dart b/lib/src/rules/package_prefixed_library_names.dart index 95c7cb3c0951..ada43af8f374 100644 --- a/lib/src/rules/package_prefixed_library_names.dart +++ b/lib/src/rules/package_prefixed_library_names.dart @@ -51,10 +51,7 @@ library my_package.src.private; bool matchesOrIsPrefixedBy(String name, String prefix) => name == prefix || name.startsWith('$prefix.'); -class PackagePrefixedLibraryNames extends LintRule - implements ProjectVisitor, NodeLintRule { - DartProject? project; - +class PackagePrefixedLibraryNames extends LintRule { PackagePrefixedLibraryNames() : super( name: 'package_prefixed_library_names', @@ -62,20 +59,12 @@ class PackagePrefixedLibraryNames extends LintRule details: _details, group: Group.style); - @override - ProjectVisitor getProjectVisitor() => this; - @override void registerNodeProcessors( NodeLintRegistry registry, LinterContext context) { var visitor = _Visitor(this); registry.addLibraryDirective(this, visitor); } - - @override - void visit(DartProject project) { - this.project = project; - } } class _Visitor extends SimpleAstVisitor { @@ -84,28 +73,33 @@ class _Visitor extends SimpleAstVisitor { _Visitor(this.rule); @override + // ignore: prefer_expression_function_bodies void visitLibraryDirective(LibraryDirective node) { - // If no project info is set, bail early. - // https://github.com/dart-lang/linter/issues/154 - var project = rule.project; - var element = node.element; - if (project == null || element == null) { - return; - } - - var source = element.source; - if (source == null) { - return; - } - - var prefix = Analyzer.facade.createLibraryNamePrefix( - libraryPath: source.fullName, - projectRoot: project.root.absolute.path, - packageName: project.name); - - var name = element.name; - if (name == null || !matchesOrIsPrefixedBy(name, prefix)) { - rule.reportLint(node.name); - } + // Project info is not being set. + //See: https://github.com/dart-lang/linter/issues/3395 + return; + + // // If no project info is set, bail early. + // // https://github.com/dart-lang/linter/issues/154 + // var project = rule.project; + // var element = node.element; + // if (project == null || element == null) { + // return; + // } + // + // var source = element.source; + // if (source == null) { + // return; + // } + // + // var prefix = Analyzer.facade.createLibraryNamePrefix( + // libraryPath: source.fullName, + // projectRoot: project.root.absolute.path, + // packageName: project.name); + // + // var name = element.name; + // if (name == null || !matchesOrIsPrefixedBy(name, prefix)) { + // rule.reportLint(node.name); + // } } } diff --git a/test_data/rules/package_prefixed_library_names.dart b/test_data/rules/package_prefixed_library_names.dart index cb2798b19f3c..bcd082021b89 100644 --- a/test_data/rules/package_prefixed_library_names.dart +++ b/test_data/rules/package_prefixed_library_names.dart @@ -4,4 +4,5 @@ // test w/ `dart test -N package_prefixed_library_names` -library linter.not_where_it_should_be; //LINT +// See: https://github.com/dart-lang/linter/issues/3395 +library linter.not_where_it_should_be; //FAILING