Clean up several deprecation hints
Change-Id: I6191ddc4bb4a98c4976d8bc281b084bfd5073547
Reviewed-on: https://dart-review.googlesource.com/c/89941
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer/lib/dart/analysis/results.dart b/pkg/analyzer/lib/dart/analysis/results.dart
index 55defb7..7f82c94 100644
--- a/pkg/analyzer/lib/dart/analysis/results.dart
+++ b/pkg/analyzer/lib/dart/analysis/results.dart
@@ -89,7 +89,7 @@
/// those discovered during scanning and parsing.
///
/// Clients may not extend, implement or mix-in this class.
-// ignore: deprecated_member_use
+// ignore: deprecated_member_use_from_same_package
abstract class ParsedUnitResult implements ParseResult {}
/// The result of parsing of a single file. The errors returned include only
@@ -128,7 +128,7 @@
/// include both syntactic and semantic errors.
///
/// Clients may not extend, implement or mix-in this class.
-// ignore: deprecated_member_use
+// ignore: deprecated_member_use_from_same_package
abstract class ResolvedUnitResult implements ResolveResult {}
/// The result of building a resolved AST for a single file. The errors returned
diff --git a/pkg/analyzer/lib/source/line_info.dart b/pkg/analyzer/lib/source/line_info.dart
index 5d0dee9..5d5be56 100644
--- a/pkg/analyzer/lib/source/line_info.dart
+++ b/pkg/analyzer/lib/source/line_info.dart
@@ -8,7 +8,7 @@
/**
* The location of a character represented as a line and column pair.
*/
-// ignore: deprecated_member_use
+// ignore: deprecated_member_use_from_same_package
class CharacterLocation extends LineInfo_Location {
// TODO(brianwilkerson) Replace the body of this class with the body of
// LineInfo_Location and remove LineInfo_Location.
@@ -64,10 +64,10 @@
* Return the location information for the character at the given [offset].
*
* A future version of this API will return a [CharacterLocation] rather than
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
* a [LineInfo_Location].
*/
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
LineInfo_Location getLocation(int offset) {
var min = 0;
var max = lineStarts.length - 1;
diff --git a/pkg/analyzer/lib/src/dart/ast/utilities.dart b/pkg/analyzer/lib/src/dart/ast/utilities.dart
index 051fa2b..f62757e 100644
--- a/pkg/analyzer/lib/src/dart/ast/utilities.dart
+++ b/pkg/analyzer/lib/src/dart/ast/utilities.dart
@@ -363,7 +363,7 @@
@override
DefaultFormalParameter visitDefaultFormalParameter(
DefaultFormalParameter node) =>
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
astFactory.defaultFormalParameter(cloneNode(node.parameter), node.kind,
cloneToken(node.separator), cloneNode(node.defaultValue));
@@ -1439,7 +1439,7 @@
bool visitDefaultFormalParameter(DefaultFormalParameter node) {
DefaultFormalParameter other = _other as DefaultFormalParameter;
return isEqualNodes(node.parameter, other.parameter) &&
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
node.kind == other.kind &&
isEqualTokens(node.separator, other.separator) &&
isEqualNodes(node.defaultValue, other.defaultValue);
@@ -5824,7 +5824,7 @@
DefaultFormalParameter toNode = this._toNode as DefaultFormalParameter;
return _and(
_isEqualNodes(node.parameter, toNode.parameter),
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
node.kind == toNode.kind,
_isEqualTokens(node.separator, toNode.separator),
_isEqualNodes(node.defaultValue, toNode.defaultValue));
diff --git a/pkg/analyzer/lib/src/dart/element/builder.dart b/pkg/analyzer/lib/src/dart/element/builder.dart
index 5d439ae..9aac7f7 100644
--- a/pkg/analyzer/lib/src/dart/element/builder.dart
+++ b/pkg/analyzer/lib/src/dart/element/builder.dart
@@ -1432,7 +1432,7 @@
parameter.isConst = node.isConst;
parameter.isExplicitlyCovariant = node.parameter.covariantKeyword != null;
parameter.isFinal = node.isFinal;
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
parameter.parameterKind = node.kind;
// visible range
_setParameterVisibleRange(node, parameter);
@@ -1459,7 +1459,7 @@
parameter.isConst = node.isConst;
parameter.isExplicitlyCovariant = node.covariantKeyword != null;
parameter.isFinal = node.isFinal;
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
parameter.parameterKind = node.kind;
_currentHolder.addParameter(parameter);
parameterName.staticElement = parameter;
@@ -1488,7 +1488,7 @@
parameter.isConst = node.isConst;
parameter.isExplicitlyCovariant = node.covariantKeyword != null;
parameter.isFinal = node.isFinal;
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
parameter.parameterKind = node.kind;
_setParameterVisibleRange(node, parameter);
_currentHolder.addParameter(parameter);
@@ -1531,7 +1531,7 @@
parameter.isConst = node.isConst;
parameter.isExplicitlyCovariant = node.covariantKeyword != null;
parameter.isFinal = node.isFinal;
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
parameter.parameterKind = node.kind;
_setParameterVisibleRange(node, parameter);
if (node.type == null) {
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
index f764d36..56e2f2a 100644
--- a/pkg/analyzer/lib/src/dart/element/element.dart
+++ b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -1133,7 +1133,7 @@
}
implicitParameter.isConst = superParameter.isConst;
implicitParameter.isFinal = superParameter.isFinal;
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
implicitParameter.parameterKind = superParameter.parameterKind;
implicitParameter.isSynthetic = true;
implicitParameter.type =
@@ -3868,7 +3868,7 @@
buffer.write(", ");
}
ParameterElement parameter = parameters[i];
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
ParameterKind parameterKind = parameter.parameterKind;
if (parameterKind != kind) {
if (closing != null) {
diff --git a/pkg/analyzer/lib/src/dart/element/member.dart b/pkg/analyzer/lib/src/dart/element/member.dart
index 484458a..845d59d 100644
--- a/pkg/analyzer/lib/src/dart/element/member.dart
+++ b/pkg/analyzer/lib/src/dart/element/member.dart
@@ -636,7 +636,7 @@
buffer.write(", ");
}
ParameterElement parameter = parameters[i];
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
ParameterKind parameterKind = parameter.parameterKind;
if (parameterKind != kind) {
if (closing != null) {
diff --git a/pkg/analyzer/lib/src/dart/element/type.dart b/pkg/analyzer/lib/src/dart/element/type.dart
index 4ea8023..85712c3 100644
--- a/pkg/analyzer/lib/src/dart/element/type.dart
+++ b/pkg/analyzer/lib/src/dart/element/type.dart
@@ -920,7 +920,7 @@
return new ParameterElementImpl.synthetic(
p.name,
newType,
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
p.parameterKind);
}
@@ -3729,7 +3729,7 @@
int length = parameters.length;
for (int i = 0; i < length; i++) {
ParameterElement parameter = parameters[i];
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
if (parameter.parameterKind == kind) {
TypeImpl type = parameter.type ?? DynamicTypeImpl.instance;
if (typeArguments.length != 0 &&
@@ -3810,7 +3810,7 @@
return new ParameterElementImpl.synthetic(
p.name,
newType,
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
p.parameterKind);
}
@@ -3865,7 +3865,7 @@
return new ParameterElementImpl.synthetic(
p.name,
newType,
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
p.parameterKind);
}
@@ -3892,7 +3892,7 @@
void _forEachParameterType(
ParameterKind kind, Function(String name, DartType type) callback) {
for (var parameter in parameters) {
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
if (parameter.parameterKind == kind) {
callback(parameter.name, parameter.type);
}
diff --git a/pkg/analyzer/lib/src/dart/element/wrapped.dart b/pkg/analyzer/lib/src/dart/element/wrapped.dart
index 3c6f7f1..10c3f75 100644
--- a/pkg/analyzer/lib/src/dart/element/wrapped.dart
+++ b/pkg/analyzer/lib/src/dart/element/wrapped.dart
@@ -185,7 +185,7 @@
@override
String computeDocumentationComment() => wrappedUnit
- .computeDocumentationComment(); // ignore: deprecated_member_use
+ .computeDocumentationComment(); // ignore: deprecated_member_use_from_same_package
@deprecated
@override
@@ -377,7 +377,7 @@
@override
String computeDocumentationComment() => wrappedImport
- .computeDocumentationComment(); // ignore: deprecated_member_use
+ .computeDocumentationComment(); // ignore: deprecated_member_use_from_same_package
@deprecated
@override
@@ -599,8 +599,8 @@
T accept<T>(ElementVisitor<T> visitor) => wrappedLib.accept(visitor);
@override
- String computeDocumentationComment() =>
- wrappedLib.computeDocumentationComment(); // ignore: deprecated_member_use
+ String computeDocumentationComment() => wrappedLib
+ .computeDocumentationComment(); // ignore: deprecated_member_use_from_same_package
@deprecated
@override
diff --git a/pkg/analyzer/lib/src/dart/resolver/inheritance_manager.dart b/pkg/analyzer/lib/src/dart/resolver/inheritance_manager.dart
index 846de52..ed4f68e 100644
--- a/pkg/analyzer/lib/src/dart/resolver/inheritance_manager.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/inheritance_manager.dart
@@ -798,7 +798,7 @@
List<ParameterElement> parameters = executableElement.parameters;
for (int i = 0; i < parameters.length; i++) {
ParameterElement parameterElement = parameters[i];
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
if (parameterElement.parameterKind == parameterKind) {
parameterCount++;
}
diff --git a/pkg/analyzer/lib/src/generated/type_system.dart b/pkg/analyzer/lib/src/generated/type_system.dart
index 6a4ffba..5d54d71 100644
--- a/pkg/analyzer/lib/src/generated/type_system.dart
+++ b/pkg/analyzer/lib/src/generated/type_system.dart
@@ -908,10 +908,9 @@
var newType =
_substituteForUnknownType(p.type, lowerBound: !lowerBound);
return new ParameterElementImpl.synthetic(
- // ignore: deprecated_member_use
p.name,
newType,
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
p.parameterKind);
});
// Return type is covariant.
diff --git a/pkg/analyzer/lib/src/summary/summarize_ast.dart b/pkg/analyzer/lib/src/summary/summarize_ast.dart
index df89a01..1f05586 100644
--- a/pkg/analyzer/lib/src/summary/summarize_ast.dart
+++ b/pkg/analyzer/lib/src/summary/summarize_ast.dart
@@ -817,7 +817,7 @@
} else if (node.isNamed) {
b.kind = UnlinkedParamKind.named;
} else {
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
throw new StateError('Unexpected parameter kind: ${node.kind}');
}
return b;
diff --git a/pkg/analyzer/test/generated/all_the_rest_test.dart b/pkg/analyzer/test/generated/all_the_rest_test.dart
index 0c87fa9..367d0f5 100644
--- a/pkg/analyzer/test/generated/all_the_rest_test.dart
+++ b/pkg/analyzer/test/generated/all_the_rest_test.dart
@@ -45,7 +45,7 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(ContentCacheTest);
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
defineReflectiveTests(CustomUriResolverTest);
defineReflectiveTests(DartUriResolverTest);
defineReflectiveTests(ElementLocatorTest);
@@ -57,7 +57,7 @@
defineReflectiveTests(ExitDetectorTest2);
defineReflectiveTests(FileBasedSourceTest);
defineReflectiveTests(ResolveRelativeUriTest);
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
defineReflectiveTests(SDKLibrariesReaderTest);
defineReflectiveTests(UriKindTest);
});
diff --git a/pkg/analyzer/test/generated/static_type_analyzer_test.dart b/pkg/analyzer/test/generated/static_type_analyzer_test.dart
index fe9cb89..abf220e 100644
--- a/pkg/analyzer/test/generated/static_type_analyzer_test.dart
+++ b/pkg/analyzer/test/generated/static_type_analyzer_test.dart
@@ -1586,7 +1586,7 @@
for (FormalParameter parameter in parameters.parameters) {
ParameterElementImpl element =
new ParameterElementImpl.forNode(parameter.identifier);
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
element.parameterKind = parameter.kind;
element.type = _typeProvider.dynamicType;
parameter.identifier.staticElement = element;
diff --git a/pkg/analyzer/test/generated/test_all.dart b/pkg/analyzer/test/generated/test_all.dart
index ac07574..0d90e38 100644
--- a/pkg/analyzer/test/generated/test_all.dart
+++ b/pkg/analyzer/test/generated/test_all.dart
@@ -12,7 +12,8 @@
import 'compile_time_error_code_driver_test.dart'
as compile_time_error_code_driver_test;
import 'compile_time_error_code_test.dart' as compile_time_error_code_test;
-import 'constant_test.dart' as constant_test;
+import 'constant_test.dart'
+ as constant_test; // ignore: deprecated_member_use_from_same_package
import 'declaration_resolver_test.dart' as declaration_resolver_test;
import 'element_resolver_test.dart' as element_resolver_test;
import 'engine_test.dart' as engine_test;
diff --git a/pkg/analyzer/test/parse_compilation_unit_test.dart b/pkg/analyzer/test/parse_compilation_unit_test.dart
index 74a0179..899f832 100644
--- a/pkg/analyzer/test/parse_compilation_unit_test.dart
+++ b/pkg/analyzer/test/parse_compilation_unit_test.dart
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// ignore: deprecated_member_use
+// ignore: deprecated_member_use_from_same_package
import 'package:analyzer/analyzer.dart';
import 'package:test/test.dart';
diff --git a/pkg/analyzer/test/source/test_all.dart b/pkg/analyzer/test/source/test_all.dart
index 643b514..f356dc3 100644
--- a/pkg/analyzer/test/source/test_all.dart
+++ b/pkg/analyzer/test/source/test_all.dart
@@ -5,7 +5,8 @@
import 'package:test_reflective_loader/test_reflective_loader.dart';
import 'analysis_options_provider_test.dart' as analysis_options_provider_test;
-import 'embedder_test.dart' as embedder_test; // ignore: deprecated_member_use
+import 'embedder_test.dart'
+ as embedder_test; // ignore: deprecated_member_use_from_same_package
import 'error_processor_test.dart' as error_processor_test;
import 'package_map_resolver_test.dart' as package_map_resolver_test;
import 'path_filter_test.dart' as path_filter_test;
diff --git a/pkg/analyzer/test/src/dart/analysis/driver_resolution_test.dart b/pkg/analyzer/test/src/dart/analysis/driver_resolution_test.dart
index e52ece7..4797e9d 100644
--- a/pkg/analyzer/test/src/dart/analysis/driver_resolution_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/driver_resolution_test.dart
@@ -8797,7 +8797,7 @@
expect(type, isNotNull);
expect(element.name, name);
expect(element.nameOffset, offset);
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
expect(element.parameterKind, kind);
expect(element.type, type);
}
diff --git a/pkg/analyzer/test/src/dart/ast/utilities_test.dart b/pkg/analyzer/test/src/dart/ast/utilities_test.dart
index c6d4eab..8ce134b 100644
--- a/pkg/analyzer/test/src/dart/ast/utilities_test.dart
+++ b/pkg/analyzer/test/src/dart/ast/utilities_test.dart
@@ -27,7 +27,7 @@
defineReflectiveTests(NodeLocatorTest);
defineReflectiveTests(NodeLocator2Test);
defineReflectiveTests(ResolutionCopierTest);
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
defineReflectiveTests(ToSourceVisitorTest);
defineReflectiveTests(ToSourceVisitor2Test);
});
diff --git a/pkg/analyzer/test/src/dart/element/element_test.dart b/pkg/analyzer/test/src/dart/element/element_test.dart
index dbebb31..0b4d17d 100644
--- a/pkg/analyzer/test/src/dart/element/element_test.dart
+++ b/pkg/analyzer/test/src/dart/element/element_test.dart
@@ -3904,9 +3904,9 @@
MethodElement AfElement = elementB.type
.lookUpInheritedMethod("f", library: libraryElement, thisType: false);
expect(
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
BfElement.getReifiedType(objectType),
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
equals(AfElement.getReifiedType(objectType)));
}
}
diff --git a/pkg/analyzer/test/src/summary/resynthesize_common.dart b/pkg/analyzer/test/src/summary/resynthesize_common.dart
index 69d2215..186beca 100644
--- a/pkg/analyzer/test/src/summary/resynthesize_common.dart
+++ b/pkg/analyzer/test/src/summary/resynthesize_common.dart
@@ -9671,7 +9671,7 @@
compareVariableElements(resynthesized, original, desc);
compareParameterElementLists(
resynthesized.parameters, original.parameters, desc);
- // ignore: deprecated_member_use
+ // ignore: deprecated_member_use_from_same_package
expect(resynthesized.parameterKind, original.parameterKind, reason: desc);
expect(resynthesized.isInitializingFormal, original.isInitializingFormal,
reason: desc);
