commit 263c49df9cbf4d8f1ac59a95b7cb23ce7626b5ea
author Phil Quitslund <pq@users.noreply.github.com> Mon Sep 23 09:54:36 2019 -0700
committer GitHub <noreply@github.com> Mon Sep 23 09:54:36 2019 -0700
tree 594b5a23c1116efbdb7d80631634dc896d8617f8
parent 51d8eb13dbf21761241b63aa49a9519bf6d79f71
parent 4b1ea6b080c9c622eebfd3656ac9c87c762a02b4

Merge pull request #1730 from dart-lang/update_spelunker

make spelunking featureSet aware

lib/src/ast.dart

diff --git a/lib/src/ast.dart b/lib/src/ast.dart
index 98ea0b0..c0f4c81 100644
--- a/lib/src/ast.dart
+++ b/lib/src/ast.dart
@@ -10,7 +10,6 @@
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/src/error/codes.dart'; // ignore: implementation_imports
 import 'package:analyzer/src/generated/resolver.dart'; // ignore: implementation_imports
 import 'package:linter/src/analyzer.dart';
@@ -102,9 +101,12 @@
     return false;
   }
 
-  // TODO(devoncarew): Change to using the resource provider on the context
-  // when that is available.
-  ResourceProvider resourceProvider = PhysicalResourceProvider.INSTANCE;
+  final resourceProvider =
+      compilationUnit?.declaredElement?.session?.resourceProvider;
+  if (resourceProvider == null) {
+    return false;
+  }
+
   File file = resourceProvider.getFile(fullName);
   Folder folder = file.parent;
 

lib/src/rules/unnecessary_statements.dart

diff --git a/lib/src/rules/unnecessary_statements.dart b/lib/src/rules/unnecessary_statements.dart
index c4f3510..deeb6b5 100644
--- a/lib/src/rules/unnecessary_statements.dart
+++ b/lib/src/rules/unnecessary_statements.dart
@@ -134,8 +134,8 @@
   visitPrefixedIdentifier(PrefixedIdentifier node) {
     // Allow getters; getters with side effects were the main cause of false
     // positives.
-    var bestElement = node.identifier.staticElement;
-    if (bestElement is PropertyAccessorElement && !bestElement.isSynthetic) {
+    var element = node.identifier.staticElement;
+    if (element is PropertyAccessorElement && !element.isSynthetic) {
       return;
     }
 
@@ -155,8 +155,8 @@
   visitPropertyAccess(PropertyAccess node) {
     // Allow getters; getters with side effects were the main cause of false
     // positives.
-    var bestElement = node.propertyName.staticElement;
-    if (bestElement is PropertyAccessorElement && !bestElement.isSynthetic) {
+    var element = node.propertyName.staticElement;
+    if (element is PropertyAccessorElement && !element.isSynthetic) {
       return;
     }
 
@@ -172,9 +172,8 @@
   visitSimpleIdentifier(SimpleIdentifier node) {
     // Allow getters; getters with side effects were the main cause of false
     // positives.
-    var bestElement = node.staticElement;
-    if (node.staticElement is PropertyAccessorElement &&
-        !bestElement.isSynthetic) {
+    var element = node.staticElement;
+    if (element is PropertyAccessorElement && !element.isSynthetic) {
       return;
     }
 

tool/since/dart_sdk.yaml

diff --git a/tool/since/dart_sdk.yaml b/tool/since/dart_sdk.yaml
index d3d1084..55e9464 100644
--- a/tool/since/dart_sdk.yaml
+++ b/tool/since/dart_sdk.yaml
@@ -1,3 +1,6 @@
+2.6.0-dev.1.0 : 0.1.97+1
+2.6.0-dev.0.0 : 0.1.97+1
+2.5.0 : 0.1.96
 2.5.0-dev.4.0 : 0.1.96
 2.5.0-dev.3.0 : 0.1.96
 2.5.0-dev.2.1 : 0.1.96