Skip to content

Commit dfe1d9b

Browse files
committed
Disable OverrideContributor for Cider.
We see that it is slow, about 600ms, at least in some cases. [email protected], [email protected] Change-Id: I5c1170a84c06aa9c28000c03fbc138d2909e7f2c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/155504 Reviewed-by: Brian Wilkerson <[email protected]>
1 parent aea99b2 commit dfe1d9b

File tree

7 files changed

+7
-21
lines changed

7 files changed

+7
-21
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ class CiderCompletionComputer {
9797
return await manager.computeSuggestions(
9898
performance,
9999
completionRequest,
100+
enableOverrideContributor: false,
100101
enableUriContributor: false,
101102
);
102103
});

pkg/analysis_server/lib/src/domain_completion.dart

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,7 @@ class CompletionDomainHandler extends AbstractRequestHandler {
104104
await perf.runAsync(contributorTag, (performance) async {
105105
try {
106106
suggestions.addAll(
107-
await manager.computeSuggestions(
108-
performance,
109-
request,
110-
enableUriContributor: true,
111-
),
107+
await manager.computeSuggestions(performance, request),
112108
);
113109
} on AbortCompletion {
114110
suggestions.clear();

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ class RuntimeCompletionComputer {
9696
return await contributor.computeSuggestions(
9797
performance,
9898
request,
99-
enableUriContributor: true,
10099
);
101100
},
102101
);

pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ class CompletionHandler
217217
final serverSuggestions = await contributor.computeSuggestions(
218218
perf,
219219
completionRequest,
220-
enableUriContributor: true,
221220
);
222221

223222
if (token.isCancellationRequested) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ import 'package:analyzer_plugin/protocol/protocol_common.dart';
5151
import 'package:analyzer_plugin/protocol/protocol_common.dart' as protocol;
5252
import 'package:analyzer_plugin/src/utilities/completion/completion_target.dart';
5353
import 'package:analyzer_plugin/src/utilities/completion/optype.dart';
54-
import 'package:meta/meta.dart';
5554

5655
/// [DartCompletionManager] determines if a completion request is Dart specific
5756
/// and forwards those requests to all [DartCompletionContributor]s.
@@ -103,7 +102,8 @@ class DartCompletionManager {
103102
Future<List<CompletionSuggestion>> computeSuggestions(
104103
OperationPerformanceImpl performance,
105104
CompletionRequest request, {
106-
@required bool enableUriContributor,
105+
bool enableOverrideContributor = true,
106+
bool enableUriContributor = true,
107107
}) async {
108108
request.checkAborted();
109109
if (!AnalysisEngine.isDartFileName(request.result.path)) {
@@ -146,7 +146,7 @@ class DartCompletionManager {
146146
LocalLibraryContributor(),
147147
LocalReferenceContributor(),
148148
NamedConstructorContributor(),
149-
OverrideContributor(),
149+
if (enableOverrideContributor) OverrideContributor(),
150150
StaticMemberContributor(),
151151
TypeMemberContributor(),
152152
if (enableUriContributor) UriContributor(),

pkg/analysis_server/test/stress/completion/completion_runner.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ class CompletionRunner {
106106
return await contributor.computeSuggestions(
107107
performance,
108108
request,
109-
enableUriContributor: true,
110109
);
111110
},
112111
);

pkg/analysis_server/tool/completion_metrics/completion_metrics.dart

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -721,11 +721,7 @@ class CompletionMetricsComputer {
721721
suggestions = await DartCompletionManager(
722722
dartdocDirectiveInfo: DartdocDirectiveInfo(),
723723
listener: listener,
724-
).computeSuggestions(
725-
performance,
726-
request,
727-
enableUriContributor: true,
728-
);
724+
).computeSuggestions(performance, request);
729725
} else {
730726
// available suggestions == true
731727
var includedElementKinds = <protocol.ElementKind>{};
@@ -739,11 +735,7 @@ class CompletionMetricsComputer {
739735
includedElementNames: includedElementNames,
740736
includedSuggestionRelevanceTags: includedSuggestionRelevanceTagList,
741737
listener: listener,
742-
).computeSuggestions(
743-
performance,
744-
request,
745-
enableUriContributor: true,
746-
);
738+
).computeSuggestions(performance, request);
747739

748740
computeIncludedSetList(declarationsTracker, request.result,
749741
includedSuggestionSetList, includedElementNames);

0 commit comments

Comments
 (0)