@@ -7,7 +7,6 @@ import 'package:analysis_server/src/protocol_server.dart';
7
7
import 'package:analysis_server/src/services/completion/dart/completion_manager.dart' ;
8
8
import 'package:analysis_server/src/services/completion/dart/fuzzy_filter_sort.dart' ;
9
9
import 'package:analysis_server/src/services/completion/dart/suggestion_builder.dart' ;
10
- import 'package:analyzer/dart/element/element.dart' show LibraryElement;
11
10
import 'package:analyzer/dart/element/element2.dart' ;
12
11
import 'package:analyzer/src/dart/analysis/performance_logger.dart' ;
13
12
import 'package:analyzer/src/dart/analysis/results.dart' ;
@@ -179,7 +178,7 @@ class CiderCompletionComputer {
179
178
.toSet ();
180
179
for (var importedLibrary in importedLibraries) {
181
180
var importedSuggestions = _importedLibrarySuggestions (
182
- element: importedLibrary.asElement ,
181
+ element: importedLibrary,
183
182
performance: performance,
184
183
);
185
184
suggestionBuilders.addAll (importedSuggestions);
@@ -191,12 +190,12 @@ class CiderCompletionComputer {
191
190
/// Return cached, or compute unprefixed suggestions for all elements
192
191
/// exported from the library.
193
192
List <CompletionSuggestionBuilder > _importedLibrarySuggestions ({
194
- required LibraryElement element,
193
+ required LibraryElement2 element,
195
194
required OperationPerformanceImpl performance,
196
195
}) {
197
196
performance.getDataInt ('libraryCount' ).increment ();
198
197
199
- var path = element.source.fullName;
198
+ var path = element.firstFragment.libraryFragment ! . source.fullName;
200
199
var signature = _fileResolver.getLibraryLinkedSignature (path);
201
200
202
201
var cacheEntry = _cache._importedLibraries[path];
@@ -213,20 +212,20 @@ class CiderCompletionComputer {
213
212
/// Compute all unprefixed suggestions for all elements exported from
214
213
/// the library.
215
214
List <CompletionSuggestionBuilder > _librarySuggestions (
216
- LibraryElement element,
215
+ LibraryElement2 element,
217
216
) {
218
217
var suggestionBuilder = SuggestionBuilder (
219
218
_dartCompletionRequest,
220
219
useFilter: false ,
221
220
);
222
- suggestionBuilder.libraryUriStr = element.source. uri.toString ();
221
+ suggestionBuilder.libraryUriStr = element.uri.toString ();
223
222
var visitor = LibraryElementSuggestionBuilder (
224
223
_dartCompletionRequest,
225
224
suggestionBuilder,
226
225
);
227
- var exportMap = element.exportNamespace.definedNames ;
226
+ var exportMap = element.exportNamespace.definedNames2 ;
228
227
for (var definedElement in exportMap.values) {
229
- definedElement.asElement2 ? . accept2 (visitor);
228
+ definedElement.accept2 (visitor);
230
229
}
231
230
return suggestionBuilder.suggestions.toList ();
232
231
}
0 commit comments