Version 3.5.0-148.0.dev

Merge ee43e8b into dev

pkg/analysis_server/test/src/services/correction/fix/convert_to_flutter_style_todo_test.dart

@@ -50,17 +50,6 @@ class ConvertToFlutterStyleTodoTest extends FixProcessorLintTest {
   @override
   String get lintCode => LintNames.flutter_style_todos;
 
-  Future<void> test_commentContent() async {
-    await resolveTestCode('''
-// Here's a TODO and a todo and a   TODO.
-void f() { }
-''');
-    await assertHasFix('''
-// Here's a `TODO` and a `todo` and a   `TODO`.
-void f() { }
-''', errorFilter: (e) => e.errorCode != TodoCode.TODO);
-  }
-
   Future<void> test_docComment() async {
     await resolveTestCode('''
 /// Docs.

pkg/linter/lib/src/rules/flutter_style_todos.dart

@@ -37,7 +37,7 @@ class FlutterStyleTodos extends LintRule {
       'flutter_style_todos', "To-do comment doesn't follow the Flutter style.",
       correctionMessage: 'Try following the Flutter style for to-do comments.');
 
-  static final _todoRegExp = RegExp(r'//+(.* )?TODO\b', caseSensitive: false);
+  static final _todoRegExp = RegExp(r'//+\s*TODO\b', caseSensitive: false);
 
   static final RegExp _todoExpectedRegExp =
       RegExp(r'// TODO\([a-zA-Z0-9][-a-zA-Z0-9\.]*\): ');

pkg/linter/test/rules/flutter_style_todos_test.dart

@@ -65,6 +65,16 @@ class FlutterStyleTodosTest extends LintRuleTest {
     );
   }
 
+  test_charactersBeforeTODO() async {
+    await assertNoDiagnostics(
+      r'''
+// comment TODO(user): bla
+/// final todo = Todo(name: 'test todo', description: 'todo description');
+/// Something interesting. TODO(someone): this is an ugly test case.
+''',
+    );
+  }
+
   test_docComment() async {
     await assertDiagnostics(
       r'/// TODO(user): bla',
@@ -110,15 +120,6 @@ class FlutterStyleTodosTest extends LintRuleTest {
     );
   }
 
-  test_leadingText() async {
-    await assertDiagnostics(
-      r'// comment TODO(user): bla',
-      [
-        lint(0, 26),
-      ],
-    );
-  }
-
   test_missingColon() async {
     await assertDiagnostics(
       r'// TODO(user) bla',

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 3
 MINOR 5
 PATCH 0
-PRERELEASE 147
+PRERELEASE 148
 PRERELEASE_PATCH 0