Skip to content

Commit 020b3ef

Browse files
committed
Version 2.14.3
* Cherry-pick 06bb799 to stable * Cherry-pick 6207d1d to stable * Cherry-pick d16ad3d to stable
2 parents 3300f32 + 2dc34aa commit 020b3ef

File tree

15 files changed

+315
-63
lines changed

15 files changed

+315
-63
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 2.14.3 - 2021-09-30
2+
3+
This is a patch release that fixes:
4+
5+
- a code completion performance regression [flutter/flutter-intellij#5761][].
6+
- debug information emitted by the Dart VM [#47289][].
7+
8+
[flutter/flutter-intellij#5761]:
9+
https://github.com/flutter/flutter-intellij/issues/5761
10+
[#47289]: https://github.com/dart-lang/sdk/issues/47289
11+
112
## 2.14.2 - 2021-09-16
213

314
This is a patch release that fixes:

pkg/analysis_server/lib/src/cider/completion.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ class CiderCompletionComputer {
9999
return await manager.computeSuggestions(
100100
performance,
101101
completionRequest,
102-
enableImportedReferenceContributor: false,
103102
enableOverrideContributor: false,
104103
enableUriContributor: false,
105104
);

pkg/analysis_server/lib/src/domains/completion/available_suggestions.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ void computeIncludedSetList(
3838
) {
3939
int relevance;
4040
if (importedUriSet.contains(library.uri)) {
41-
return;
42-
}
43-
if (library.isDeprecated) {
41+
relevance = importedRelevance;
42+
} else if (library.isDeprecated) {
4443
relevance = deprecatedRelevance;
4544
} else {
4645
relevance = otherwiseRelevance;

pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ class DartCompletionManager {
9292
Future<List<CompletionSuggestion>> computeSuggestions(
9393
OperationPerformanceImpl performance,
9494
CompletionRequest request, {
95-
bool enableImportedReferenceContributor = true,
9695
bool enableOverrideContributor = true,
9796
bool enableUriContributor = true,
9897
CompletionPreference? completionPreference,
@@ -131,7 +130,6 @@ class DartCompletionManager {
131130
CombinatorContributor(),
132131
ExtensionMemberContributor(),
133132
FieldFormalContributor(),
134-
if (enableImportedReferenceContributor) ImportedReferenceContributor(),
135133
KeywordContributor(),
136134
LabelContributor(),
137135
LibraryMemberContributor(),
@@ -150,6 +148,8 @@ class DartCompletionManager {
150148
if (includedElementKinds != null) {
151149
_addIncludedElementKinds(dartRequest);
152150
_addIncludedSuggestionRelevanceTags(dartRequest);
151+
} else {
152+
contributors.add(ImportedReferenceContributor());
153153
}
154154

155155
try {

pkg/analysis_server/test/client/completion_driver_test.dart

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,13 @@ abstract class AbstractCompletionDriverTest with ResourceProviderMixin {
7171
}
7272

7373
void assertSuggestion({
74-
bool allowMultiple = false,
7574
required String completion,
7675
ElementKind? element,
7776
CompletionSuggestionKind? kind,
7877
String? file,
7978
}) {
8079
expect(
8180
suggestionWith(
82-
allowMultiple: allowMultiple,
8381
completion: completion,
8482
element: element,
8583
kind: kind,
@@ -184,17 +182,14 @@ project:${toUri('$projectPath/lib')}
184182
completion: completion, element: element, kind: kind, file: file));
185183

186184
CompletionSuggestion suggestionWith({
187-
bool allowMultiple = false,
188185
required String completion,
189186
ElementKind? element,
190187
CompletionSuggestionKind? kind,
191188
String? file,
192189
}) {
193190
final matches = suggestionsWith(
194191
completion: completion, element: element, kind: kind, file: file);
195-
if (!allowMultiple) {
196-
expect(matches, hasLength(1));
197-
}
192+
expect(matches, hasLength(1));
198193
return matches.first;
199194
}
200195

@@ -269,10 +264,7 @@ void f() {
269264
}
270265
''');
271266

272-
// TODO(brianwilkerson) There should be a single suggestion here after we
273-
// figure out how to stop the duplication.
274267
assertSuggestion(
275-
allowMultiple: true,
276268
completion: 'A',
277269
element: ElementKind.CONSTRUCTOR,
278270
kind: CompletionSuggestionKind.INVOCATION);
@@ -296,11 +288,7 @@ void f() {
296288
^
297289
}
298290
''');
299-
300-
// TODO(brianwilkerson) There should be a single suggestion here after we
301-
// figure out how to stop the duplication.
302291
assertSuggestion(
303-
allowMultiple: true,
304292
completion: 'E.e',
305293
element: ElementKind.ENUM_CONSTANT,
306294
kind: CompletionSuggestionKind.INVOCATION);
@@ -325,10 +313,7 @@ void f() {
325313
}
326314
''');
327315

328-
// TODO(brianwilkerson) There should be a single suggestion here after we
329-
// figure out how to stop the duplication.
330316
assertSuggestion(
331-
allowMultiple: true,
332317
completion: 'A.a',
333318
element: ElementKind.CONSTRUCTOR,
334319
kind: CompletionSuggestionKind.INVOCATION);
@@ -656,15 +641,13 @@ void f() {
656641
}
657642
''');
658643

659-
// TODO(brianwilkerson) There should be a single suggestion here after we
660-
// figure out how to stop the duplication.
661644
expect(
662645
suggestionsWith(
663646
completion: 'Future.value',
664647
file: '/sdk/lib/async/async.dart',
665648
element: ElementKind.CONSTRUCTOR,
666649
kind: CompletionSuggestionKind.INVOCATION),
667-
hasLength(2));
650+
hasLength(1));
668651
}
669652

670653
Future<void> test_sdk_lib_suggestions() async {

pkg/analysis_server/test/lsp/completion_dart_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1560,7 +1560,7 @@ void f() {
15601560
expect(completions, hasLength(1));
15611561
final resolved = await resolveCompletion(completions.first);
15621562
// It should not include auto-import text since it's already imported.
1563-
expect(resolved.detail, isNot(contains('Auto import from')));
1563+
expect(resolved.detail, isNull);
15641564
}
15651565

15661566
Future<void> test_suggestionSets_filtersOutAlreadyImportedSymbols() async {

pkg/analysis_server/test/services/completion/dart/relevance/bool_assignment_test.dart

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@ void main() {
1515

1616
@reflectiveTest
1717
class BoolAssignmentTest extends CompletionRelevanceTest {
18-
@failingTest
1918
Future<void> test_boolLiterals_imported() async {
20-
// TODO(brianwilkerson) This test is arguably invalid given that there's no
21-
// data to suggest that the boolean keywords should appear before a
22-
// constructor in the list, but it does seem likely to be valid in this
23-
// case, so we should investigate features that might cause this test to
24-
// start passing again.
2519
await addTestFile('''
2620
foo() {
2721
bool b;

pkg/native_stack_traces/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 0.4.4
4+
5+
- Added handling of dynamic tables for testing.
6+
37
## 0.4.3
48

59
- Exported some more of the ELF utilities for use in Dart tests.

pkg/native_stack_traces/lib/elf.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
export 'src/elf.dart' show Elf, Section, Symbol;
5+
export 'src/elf.dart' show DynamicTable, DynamicTableTag, Elf, Section, Symbol;
66
export 'src/constants.dart'
77
show
88
isolateDataSymbolName,

0 commit comments

Comments
 (0)