Skip to content

Commit 0831245

Browse files
bwilkersoncommit-bot@chromium.org
authored andcommitted
Fix a bug in the convert_to_null_aware assist/fix
Bug: #44173 Change-Id: I3b09732fe79577fc394b41a18d58fa8627be5eae Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/171703 Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Brian Wilkerson <[email protected]>
1 parent b4dbbe2 commit 0831245

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

pkg/analysis_server/lib/src/services/correction/dart/convert_to_null_aware.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class ConvertToNullAware extends CorrectionProducer {
8686
} else {
8787
return;
8888
}
89-
if (operator.type != TokenType.PERIOD) {
89+
if (operator == null || operator.type != TokenType.PERIOD) {
9090
return;
9191
}
9292
if (!(target is SimpleIdentifier &&

pkg/analysis_server/test/src/services/correction/assist/convert_to_null_aware_test.dart

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import 'assist_processor.dart';
1111

1212
void main() {
1313
defineReflectiveSuite(() {
14-
defineReflectiveTests(ConvertToNormalParameterTest);
14+
defineReflectiveTests(ConvertToNullAwareTest);
1515
});
1616
}
1717

1818
@reflectiveTest
19-
class ConvertToNormalParameterTest extends AssistProcessorTest {
19+
class ConvertToNullAwareTest extends AssistProcessorTest {
2020
@override
2121
AssistKind get kind => DartAssistKind.CONVERT_TO_NULL_AWARE;
2222

@@ -138,6 +138,18 @@ int f(A a) => a?.p;
138138
''');
139139
}
140140

141+
Future<void> test_notEqual_noTarget() async {
142+
// https://github.com/dart-lang/sdk/issues/44173
143+
verifyNoTestUnitErrors = false;
144+
await resolveTestCode('''
145+
foo() {
146+
var range = 1;
147+
var rangeStart = range != null ? toOffset() : null;
148+
}
149+
''');
150+
await assertNoAssistAt(' null;');
151+
}
152+
141153
Future<void> test_notEqual_notNullPreserving() async {
142154
await resolveTestCode('''
143155
abstract class A {

0 commit comments

Comments
 (0)