Version 2.18.0-50.0.dev
Merge commit '3428b449d191d5837558faf492cd60480496ea8d' into 'dev'
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/feature_computer.dart b/pkg/analysis_server/lib/src/services/completion/dart/feature_computer.dart
index 983ff52..0996659 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/feature_computer.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/feature_computer.dart
@@ -540,10 +540,12 @@
if (offset <= argument.offset) {
return typeOfIndexPositionalParameter();
}
- if (argument.contains(offset) && offset >= argument.name.end) {
- return argument.staticParameterElement?.type;
+ if (argument.contains(offset)) {
+ if (offset >= argument.name.end) {
+ return argument.staticParameterElement?.type;
+ }
+ return null;
}
- return null;
} else {
if (previousArgument == null || previousArgument.end < offset) {
if (offset <= argument.end) {
diff --git a/pkg/analysis_server/test/src/services/completion/dart/feature_computer_test.dart b/pkg/analysis_server/test/src/services/completion/dart/feature_computer_test.dart
index bfa63e0..f866620 100644
--- a/pkg/analysis_server/test/src/services/completion/dart/feature_computer_test.dart
+++ b/pkg/analysis_server/test/src/services/completion/dart/feature_computer_test.dart
@@ -109,6 +109,16 @@
''', 'int');
}
+ Future<void> test_argumentList_named_second() async {
+ await assertContextType('''
+void f({String p1, int p2}) {}
+
+void g() {
+ f(p1: '', p2: ^);
+}
+''', 'int');
+ }
+
Future<void> test_argumentList_named_unresolved_hasNamedParameters() async {
await assertContextType('''
void f({int i}) {}
diff --git a/tools/VERSION b/tools/VERSION
index 216faab..03b2173 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 18
PATCH 0
-PRERELEASE 49
+PRERELEASE 50
PRERELEASE_PATCH 0
\ No newline at end of file
