Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(579)

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

Issue 2727343002: Calculate text ranges for default args. (Closed)
Patch Set: Created 3 years, 10 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
Index: pkg/analysis_server/lib/src/services/completion/dart/utilities.dart
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart b/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart
index f64f5d07c1c15dd79c2daecf5dad510f760aab9c..80002537ba2f696601afd7b98ca51cd537c446f8 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart
@@ -30,18 +30,44 @@ final TypeName NO_RETURN_TYPE = astFactory.typeName(
null);
/**
- * Build a default argument list based on the given [requiredParams] and
- * [namedParams].
+ * Add default argument list text and ranges based on the given [requiredParams]
+ * and [namedParams].
*/
-String buildDefaultArgList(Iterable<ParameterElement> requiredParams,
+void addDefaultArgDetails(
+ CompletionSuggestion suggestion,
+ Iterable<ParameterElement> requiredParams,
Iterable<ParameterElement> namedParams) {
- List<String> args = requiredParams.map((p) => p.name).toList();
- List<String> requiredArgs = namedParams
- .where((p) => p.isRequired)
- .map((p) => '${p.name}: null')
- .toList();
- args.addAll(requiredArgs);
- return args.isEmpty ? null : args.join(', ');
+ StringBuffer sb = new StringBuffer();
+ List<int> ranges = <int>[];
+
+ int offset;
+
+ for (ParameterElement param in requiredParams) {
+ if (sb.isNotEmpty) {
+ sb.write(', ');
+ }
+ offset = sb.length;
+ String name = param.name;
+ sb.write(name);
+ ranges.addAll([offset, name.length]);
+ }
+
+ for (ParameterElement param in namedParams) {
+ if (param.isRequired) {
+ if (sb.isNotEmpty) {
+ sb.write(', ');
+ }
+ String name = param.name;
+ sb.write('$name: ');
+ offset = sb.length;
+ String defaultValue = _getDefaultValue(param);
+ sb.write(defaultValue);
+ ranges.addAll([offset, defaultValue.length]);
+ }
+ }
+
+ suggestion.defaultArgumentListString = sb.isNotEmpty ? sb.toString() : null;
+ suggestion.defaultArgumentListTextRanges = ranges.isNotEmpty ? ranges : null;
}
/**
@@ -171,3 +197,5 @@ String nameForType(TypeAnnotation type) {
}
return DYNAMIC;
}
+
+String _getDefaultValue(ParameterElement param) => 'null';

Powered by Google App Engine
This is Rietveld 408576698