Skip to content

Commit 24b2a16

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Remove V1 PrefixElement.
Change-Id: Ic4987ada9be6b44b2602a90998f29bee43c7f352 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/423440 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 2f05f9d commit 24b2a16

File tree

20 files changed

+50
-321
lines changed

20 files changed

+50
-321
lines changed

pkg/analysis_server/lib/src/services/refactoring/legacy/rename.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ abstract class RenameRefactoringImpl extends RefactoringImpl
169169
}
170170
return name;
171171
} else if (element is MockLibraryImportElement) {
172-
var prefix = element.import.prefix?.element;
172+
var prefix = element.import.prefix2?.element;
173173
if (prefix != null) {
174174
return prefix.displayName;
175175
}

pkg/analyzer/api.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2967,8 +2967,6 @@ package:analyzer/dart/constant/value.dart:
29672967
toSymbolValue (method: String? Function())
29682968
toTypeValue (method: DartType? Function())
29692969
package:analyzer/dart/element/element.dart:
2970-
DeferredImportElementPrefix (class extends Object implements ImportElementPrefix, deprecated):
2971-
new (constructor: DeferredImportElementPrefix Function())
29722970
DirectiveUri (class extends Object):
29732971
new (constructor: DirectiveUri Function())
29742972
DirectiveUriWithLibrary (class extends DirectiveUriWithSource):
@@ -3129,9 +3127,6 @@ package:analyzer/dart/element/element.dart:
31293127
HideElementCombinator (class extends Object implements NamespaceCombinator):
31303128
new (constructor: HideElementCombinator Function())
31313129
hiddenNames (getter: List<String>)
3132-
ImportElementPrefix (class extends Object, deprecated):
3133-
new (constructor: ImportElementPrefix Function())
3134-
element (getter: PrefixElement)
31353130
LibraryElement (class extends Object implements _ExistingElement, deprecated):
31363131
new (constructor: LibraryElement Function())
31373132
enclosingElement3 (getter: Null)
@@ -3163,7 +3158,6 @@ package:analyzer/dart/element/element.dart:
31633158
importKeywordOffset (getter: int)
31643159
importedLibrary (getter: LibraryElement?)
31653160
namespace (getter: Namespace)
3166-
prefix (getter: ImportElementPrefix?, deprecated)
31673161
uri (getter: DirectiveUri)
31683162
LibraryLanguageVersion (class extends Object):
31693163
new (constructor: LibraryLanguageVersion Function({required Version? override, required Version package}))
@@ -3203,11 +3197,6 @@ package:analyzer/dart/element/element.dart:
32033197
PartElement (class extends Object implements _ExistingElement, deprecated):
32043198
new (constructor: PartElement Function())
32053199
uri (getter: DirectiveUri)
3206-
PrefixElement (class extends Object implements _ExistingElement, deprecated):
3207-
new (constructor: PrefixElement Function())
3208-
imports (getter: List<LibraryImportElement>)
3209-
name (getter: String)
3210-
scope (getter: Scope)
32113200
PromotableElement (class extends Object implements LocalElement, VariableElement, deprecated):
32123201
new (constructor: PromotableElement Function())
32133202
name (getter: String)

pkg/analyzer/lib/dart/element/element.dart

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import 'package:analyzer/dart/analysis/session.dart';
4242
import 'package:analyzer/dart/constant/value.dart';
4343
import 'package:analyzer/dart/element/element2.dart';
4444
import 'package:analyzer/dart/element/nullability_suffix.dart';
45-
import 'package:analyzer/dart/element/scope.dart';
4645
import 'package:analyzer/dart/element/type.dart';
4746
import 'package:analyzer/dart/element/type_provider.dart';
4847
import 'package:analyzer/dart/element/type_system.dart';
@@ -59,12 +58,6 @@ import 'package:analyzer/src/task/api/model.dart' show AnalysisTarget;
5958
import 'package:meta/meta.dart';
6059
import 'package:pub_semver/pub_semver.dart';
6160

62-
/// [ImportElementPrefix] that is used together with `deferred`.
63-
///
64-
/// Clients may not extend, implement or mix-in this class.
65-
@Deprecated('Use PrefixElement2 instead')
66-
abstract class DeferredImportElementPrefix implements ImportElementPrefix {}
67-
6861
/// Meaning of a URI referenced in a directive.
6962
///
7063
/// Clients may not extend, implement or mix-in this class.
@@ -735,16 +728,6 @@ abstract class HideElementCombinator implements NamespaceCombinator {
735728
List<String> get hiddenNames;
736729
}
737730

738-
/// Usage of a [PrefixElement] in an `import` directive.
739-
///
740-
/// Clients may not extend, implement or mix-in this class.
741-
@Deprecated('Use PrefixElement2 instead')
742-
abstract class ImportElementPrefix {
743-
/// The prefix that was specified as part of the import directive, or `null`
744-
/// if there was no prefix specified.
745-
PrefixElement get element;
746-
}
747-
748731
/// A library.
749732
///
750733
/// Clients may not extend, implement or mix-in this class.
@@ -852,11 +835,6 @@ abstract class LibraryImportElement implements _ExistingElement {
852835
/// The [Namespace] that this directive contributes to the containing library.
853836
Namespace get namespace;
854837

855-
/// The prefix that was specified as part of the import directive, or `null`
856-
/// if there was no prefix specified.
857-
@Deprecated(elementModelDeprecationMsg)
858-
ImportElementPrefix? get prefix;
859-
860838
/// The interpretation of the URI specified in the directive.
861839
DirectiveUri get uri;
862840
}
@@ -1019,25 +997,6 @@ abstract class PartElement implements _ExistingElement {
1019997
DirectiveUri get uri;
1020998
}
1021999

1022-
/// A prefix used to import one or more libraries into another library.
1023-
///
1024-
/// Clients may not extend, implement or mix-in this class.
1025-
@Deprecated('Use PrefixElement2 instead')
1026-
abstract class PrefixElement implements _ExistingElement {
1027-
/// The imports that share this prefix.
1028-
List<LibraryImportElement> get imports;
1029-
1030-
@override
1031-
String get name;
1032-
1033-
/// The name lookup scope for this import prefix.
1034-
///
1035-
/// It consists of elements imported into the enclosing library with this
1036-
/// prefix. The namespace combinators of the import directives are taken
1037-
/// into account.
1038-
Scope get scope;
1039-
}
1040-
10411000
/// A variable that might be subject to type promotion. This might be a local
10421001
/// variable or a parameter.
10431002
///

pkg/analyzer/lib/src/dart/analysis/driver.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ import 'package:meta/meta.dart';
100100
// TODO(scheglov): Clean up the list of implicitly analyzed files.
101101
class AnalysisDriver {
102102
/// The version of data format, should be incremented on every format change.
103-
static const int DATA_VERSION = 453;
103+
static const int DATA_VERSION = 454;
104104

105105
/// The number of exception contexts allowed to write. Once this field is
106106
/// zero, we stop writing any new exception contexts in this process.

pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ import 'package:analyzer/src/lint/analysis_rule_timers.dart';
5151
import 'package:analyzer/src/lint/linter.dart';
5252
import 'package:analyzer/src/lint/linter_visitor.dart';
5353
import 'package:analyzer/src/util/performance/operation_performance.dart';
54-
import 'package:analyzer/src/utilities/extensions/element.dart';
5554
import 'package:analyzer/src/utilities/extensions/version.dart';
5655
import 'package:analyzer/src/workspace/pub.dart';
5756
import 'package:analyzer/src/workspace/workspace.dart';
@@ -974,7 +973,7 @@ class LibraryAnalyzer {
974973
required ErrorReporter errorReporter,
975974
}) {
976975
directive.element = element;
977-
directive.prefix?.element = element.prefix?.element.asElement2;
976+
directive.prefix?.element = element.prefix2?.element;
978977
_resolveUriConfigurations(
979978
configurationNodes: directive.configurations,
980979
configurationUris: state.uris.configurations,

pkg/analyzer/lib/src/dart/element/display_string_builder.dart

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -256,24 +256,6 @@ class ElementDisplayStringBuilder {
256256
_writeDirectiveUri(element.uri);
257257
}
258258

259-
void writePrefixElement(PrefixElementImpl element) {
260-
var libraryImports = element.imports;
261-
var displayName = element.displayName;
262-
if (libraryImports.isEmpty) {
263-
_write('as ');
264-
_write(displayName);
265-
return;
266-
}
267-
var first = libraryImports.first;
268-
_write("import '${first.libraryName}' as $displayName;");
269-
if (libraryImports.length == 1) {
270-
return;
271-
}
272-
for (var libraryImport in libraryImports.sublist(1)) {
273-
_write("\nimport '${libraryImport.libraryName}' as $displayName;");
274-
}
275-
}
276-
277259
void writePrefixElement2(PrefixElementImpl2 element) {
278260
var libraryImports = element.imports;
279261
var displayName = element.displayName;

0 commit comments

Comments
 (0)