pkg/analysis_server/lib/src/services/completion/dart/arglist_contributor.dart - Issue 2128693002: fix code completion when enableTrailingCommas is true

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: pkg/analysis_server/lib/src/services/completion/dart/arglist_contributor.dart

Issue 2128693002: fix code completion when enableTrailingCommas is true (Closed) Base URL: git@github.com:dart-lang/sdk.git@master

Patch Set: merge Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « pkg/analysis_server/lib/src/provisional/completion/dart/completion_target.dart ('k') | pkg/analysis_server/lib/src/services/completion/dart/optype.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: pkg/analysis_server/lib/src/services/completion/dart/arglist_contributor.dart

diff --git a/pkg/analysis_server/lib/src/services/completion/dart/arglist_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/arglist_contributor.dart

index 32f9e8e58dcfb63b20bb376f2632c7ba91c9b6f1..102cd90be2b36799c70e1995bb703f7236c2daae 100644

--- a/pkg/analysis_server/lib/src/services/completion/dart/arglist_contributor.dart

+++ b/pkg/analysis_server/lib/src/services/completion/dart/arglist_contributor.dart

@@ -19,6 +19,12 @@ import 'package:analyzer/src/generated/utilities_dart.dart';

int _argCount(DartCompletionRequest request) {

AstNode node = request.target.containingNode;

if (node is ArgumentList) {

+ if (request.target.entity == node.rightParenthesis) {

+ // Parser ignores trailing commas

+ if (node.rightParenthesis.previous?.lexeme == ',') {

+ return node.arguments.length + 1;

+ }

return node.arguments.length;

}

return 0;