Skip to content

Commit e55de8c

Browse files
author
Dart CI
committed
Version 3.10.0-77.0.dev
Merge 00240e8 into dev
2 parents 2cb72ff + 00240e8 commit e55de8c

File tree

13 files changed

+546
-317
lines changed

13 files changed

+546
-317
lines changed

‎DEPS

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,24 +133,24 @@ vars = {
133133
# EOL comment after a dependency to instead pin at the current revision.
134134
"ai_rev": "72a9283b421e5ee85c089822ddf6735aade849da",
135135
"core_rev": "b59ecf4ceebe6153e1c0166b7c9a7fdd9458a89d",
136-
"dartdoc_rev": "414953ed17ea534078f26a8526909ab014c1ad09",
137-
"ecosystem_rev": "2fe3618849cbcfcb798e4e001f042423b602e549",
136+
"dartdoc_rev": "82b48b53128a474221269a05a947bae28e2d7ac6",
137+
"ecosystem_rev": "4543c38a67919958539dec8366d8c9414179741f",
138138
"flute_rev": "d5adc4d6439572db5da71a9261b9bf0c7c96daa4",
139139
"http_rev": "afda3102b7ed5467f435b9ad4a29a1032f195156",
140-
"i18n_rev": "c45e050426bdeaaa120e5ce856abb486863d0476",
140+
"i18n_rev": "25cdb1b44b18544e0c988cc1734adc4810a65099",
141141
"leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", # rolled manually
142142
"material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
143143
"native_rev": "16ae2d8619e23fc2bd83fbff087a26ac032a1145", # rolled manually while native assets are experimental
144144
"protobuf_rev": "0b73b0d64c15e34d35f6e5f9036aac52e4a64033",
145145
"pub_rev": "c3e50919d11896f014cb971e1776d00a0e2d18b3", # rolled manually
146-
"shelf_rev": "082d3ac2d13a98700d8148e8fad8f3e12a6fd0e1",
146+
"shelf_rev": "2a46b4ffe1f095909c3b14bdf62da40cbdbd82e9",
147147
"sync_http_rev": "c07f96f89a7eec7e3daac641fa6c587224fcfbaa",
148148
"tar_rev": "5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a",
149-
"test_rev": "5aef9719ad9b598260c062b2a90a50d2f50a78f3",
150-
"tools_rev": "5e977d6f0698a220279a50538c89a440d56b0c44",
149+
"test_rev": "9354f239b0eb42a459200b432893d7d026056391",
150+
"tools_rev": "1b52e89e0b4ef70e004383c1cf781ad4182f380b",
151151
"vector_math_rev": "3939545edc38ed657381381d33acde02c49ff827",
152-
"web_rev": "1d5771b74a97f8d59375daa3029617ce2cd1bae8",
153-
"webdev_rev": "7ff2d0795727402c7658ea8ee026884b023099d8",
152+
"web_rev": "f3c960f57cd88afad6e20d80ed453d722d3610b7",
153+
"webdev_rev": "94c172cc862d0c39c72158c6537f1e20b4432e0e",
154154
"webdriver_rev": "595649d890f69b9d05a596426ca93681b1921132",
155155
"webkit_inspection_protocol_rev": "effa75205516757795683d527c3dea9546eb0c32",
156156

‎pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart

Lines changed: 55 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -464,41 +464,43 @@ class DeclarationHelper {
464464
(extendedType is InterfaceType) ? extendedType.element : null;
465465
if (includeMethods) {
466466
for (var method in extension.methods) {
467-
if (!method.isStatic) {
468-
if (method.isOperator) {
469-
continue;
470-
}
471-
_suggestMethod(
472-
method: method,
473-
importData: importData,
474-
referencingInterface: referencingInterface,
475-
);
467+
if (method.isStatic ||
468+
method.isOperator ||
469+
!method.isVisibleIn(request.libraryElement)) {
470+
continue;
476471
}
472+
_suggestMethod(
473+
method: method,
474+
importData: importData,
475+
referencingInterface: referencingInterface,
476+
);
477477
}
478478
}
479479
for (var accessor in extension.getters) {
480-
if (excludedGetters.contains(accessor.name)) {
480+
if (excludedGetters.contains(accessor.name) ||
481+
accessor.isStatic ||
482+
!accessor.isVisibleIn(request.libraryElement)) {
481483
continue;
482484
}
483-
if (!accessor.isStatic) {
485+
_suggestProperty(
486+
accessor: accessor,
487+
referencingInterface: referencingInterface,
488+
importData: importData,
489+
);
490+
}
491+
if (includeSetters) {
492+
for (var accessor in extension.setters) {
493+
if (accessor.isStatic ||
494+
!accessor.isVisibleIn(request.libraryElement)) {
495+
continue;
496+
}
484497
_suggestProperty(
485498
accessor: accessor,
486499
referencingInterface: referencingInterface,
487500
importData: importData,
488501
);
489502
}
490503
}
491-
if (includeSetters) {
492-
for (var accessor in extension.setters) {
493-
if (!accessor.isStatic) {
494-
_suggestProperty(
495-
accessor: accessor,
496-
referencingInterface: referencingInterface,
497-
importData: importData,
498-
);
499-
}
500-
}
501-
}
502504
}
503505

504506
/// Adds suggestions for any constructors that are visible within the not yet
@@ -805,49 +807,53 @@ class DeclarationHelper {
805807
var extension = instantiatedExtension.extension;
806808
if (includeMethods) {
807809
for (var method in extension.methods) {
808-
if (!method.isStatic) {
809-
if (method.isOperator) {
810-
continue;
811-
}
812-
_suggestMethod(
813-
method: method,
814-
isKeywordNeeded: isKeywordNeeded,
815-
isTypeNeeded: isTypeNeeded,
816-
);
810+
if (method.isStatic ||
811+
method.isOperator ||
812+
!method.isVisibleIn(libraryElement)) {
813+
continue;
817814
}
815+
_suggestMethod(
816+
method: method,
817+
isKeywordNeeded: isKeywordNeeded,
818+
isTypeNeeded: isTypeNeeded,
819+
);
818820
}
819821
}
820822
for (var getter in extension.getters) {
821823
if (excludedGetters.contains(getter.name)) {
822824
continue;
823825
}
824826
if (!getter.isSynthetic) {
825-
_suggestProperty(
826-
accessor: getter,
827-
isKeywordNeeded: isKeywordNeeded,
828-
isTypeNeeded: isTypeNeeded,
829-
);
827+
if (getter.isVisibleIn(libraryElement)) {
828+
_suggestProperty(
829+
accessor: getter,
830+
isKeywordNeeded: isKeywordNeeded,
831+
isTypeNeeded: isTypeNeeded,
832+
);
833+
}
830834
} else {
831835
// All fields induce a getter.
832836
var variable = getter.variable;
833837
if (variable is FieldElement) {
834-
_suggestField(
835-
field: variable,
836-
isKeywordNeeded: isKeywordNeeded,
837-
isTypeNeeded: isTypeNeeded,
838-
);
838+
if (variable.isVisibleIn(libraryElement)) {
839+
_suggestField(
840+
field: variable,
841+
isKeywordNeeded: isKeywordNeeded,
842+
isTypeNeeded: isTypeNeeded,
843+
);
844+
}
839845
}
840846
}
841847
}
842-
for (var setter in extension.setters) {
843-
if (!setter.isSynthetic) {
844-
if (includeSetters) {
845-
_suggestProperty(accessor: setter);
846-
}
847-
} else {
848+
if (includeSetters) {
849+
for (var setter in extension.setters) {
848850
// Avoid visiting a field twice. All fields induce a getter, but only
849-
// non-final fields induce a setter, so we don't add a suggestion for a
850-
// synthetic setter.
851+
// non-final fields induce a setter, so we don't add a suggestion for
852+
// a synthetic setter.
853+
if (setter.isSynthetic || !setter.isVisibleIn(libraryElement)) {
854+
continue;
855+
}
856+
_suggestProperty(accessor: setter);
851857
}
852858
}
853859
}

‎pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:analysis_server/src/protocol_server.dart'
77
hide Element, ElementKind;
88
import 'package:analysis_server/src/protocol_server.dart' as protocol;
99
import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
10+
import 'package:analysis_server/src/services/completion/dart/candidate_suggestion.dart';
1011
import 'package:analysis_server/src/services/completion/dart/completion_manager.dart';
1112
import 'package:analysis_server/src/services/completion/dart/dart_completion_suggestion.dart';
1213
import 'package:analysis_server/src/services/completion/dart/relevance_computer.dart';
@@ -1585,6 +1586,9 @@ class SuggestionBuilder {
15851586
}
15861587

15871588
abstract class SuggestionListener {
1589+
/// Invoked when a candidate suggestion has had its relevance score computed.
1590+
void builtCandidate(CandidateSuggestion candidate);
1591+
15881592
/// Invoked when a suggestion has been built.
15891593
void builtSuggestion(CompletionSuggestionBuilder suggestionBuilder);
15901594

‎pkg/analysis_server/lib/src/services/completion/dart/suggestion_collector.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ class SuggestionCollector {
9393
computer.completionLocation = completionLocation;
9494
for (var candidate in suggestions) {
9595
candidate.relevanceScore = computer.computeRelevance(candidate);
96+
computer.listener?.builtCandidate(candidate);
9697
}
9798
// Sort the suggestions based on both the matcher score and the relevance
9899
// score.

‎pkg/analysis_server/test/abstract_context.dart

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ class AbstractContextTest
3333

3434
static final ByteStore _byteStore = MemoryByteStore();
3535

36-
/// Whether to rewrite line endings in test code based on platform.
37-
bool useLineEndingsForPlatform = true;
38-
3936
final Map<String, String> _declaredVariables = {};
4037
AnalysisContextCollectionImpl? _analysisContextCollection;
4138

@@ -203,9 +200,8 @@ class AbstractContextTest
203200
}
204201

205202
/// Convenience function to normalize newlines in [code] for the current
206-
/// platform if [useLineEndingsForPlatform] is `true`.
207-
String normalizeSource(String code) =>
208-
useLineEndingsForPlatform ? normalizeNewlinesForPlatform(code) : code;
203+
/// platform.
204+
String normalizeSource(String code) => normalizeNewlinesForPlatform(code);
209205

210206
Future<AnalysisSession> sessionFor(File file) async {
211207
var analysisContext = _contextFor(file);

0 commit comments

Comments
 (0)