DAS: Add assist to remove digit separators from number literal

Fixes #56467

Cq-Include-Trybots: luci.dart.try:flutter-analyze-try,analyzer-win-release-try,pkg-win-release-try
Change-Id: I711d0d483db0e61f907c884e33fb7511168dde2d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/380686
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: srawlins

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

@@ -48,7 +48,7 @@ abstract final class DartAssistKind {
     'Add a debug reference to this property',
   );
   static const ADD_DIGIT_SEPARATORS = AssistKind(
-    'dart.assist.add.addDigitSeparators',
+    'dart.assist.add.digitSeparators',
     DartAssistKindPriority.DEFAULT,
     'Add digit separators',
   );
@@ -362,6 +362,11 @@ abstract final class DartAssistKind {
     DartAssistKindPriority.DEFAULT,
     'Join variable declaration',
   );
+  static const REMOVE_DIGIT_SEPARATORS = AssistKind(
+    'dart.assist.remove.digitSeparators',
+    DartAssistKindPriority.DEFAULT,
+    'Remove digit separators',
+  );
   static const REMOVE_TYPE_ANNOTATION = AssistKind(
     // TODO(pq): unify w/ fix
     'dart.assist.remove.typeAnnotation',

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

@@ -62,6 +62,7 @@ import 'package:analysis_server/src/services/correction/dart/invert_if_statement
 import 'package:analysis_server/src/services/correction/dart/join_if_with_inner.dart';
 import 'package:analysis_server/src/services/correction/dart/join_if_with_outer.dart';
 import 'package:analysis_server/src/services/correction/dart/join_variable_declaration.dart';
+import 'package:analysis_server/src/services/correction/dart/remove_digit_separators.dart';
 import 'package:analysis_server/src/services/correction/dart/remove_type_annotation.dart';
 import 'package:analysis_server/src/services/correction/dart/replace_conditional_with_if_else.dart';
 import 'package:analysis_server/src/services/correction/dart/replace_if_else_with_conditional.dart';
@@ -147,6 +148,7 @@ class AssistProcessor {
     JoinIfWithInner.new,
     JoinIfWithOuter.new,
     JoinVariableDeclaration.new,
+    RemoveDigitSeparators.new,
     RemoveTypeAnnotation.other,
     ReplaceConditionalWithIfElse.new,
     ReplaceIfElseWithConditional.new,

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

@@ -0,0 +1,36 @@
+// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:_fe_analyzer_shared/src/parser/util.dart';
+import 'package:analysis_server/src/services/correction/assist.dart';
+import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer_plugin/utilities/assist/assist.dart';
+import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
+import 'package:analyzer_plugin/utilities/range_factory.dart';
+
+class RemoveDigitSeparators extends ResolvedCorrectionProducer {
+  RemoveDigitSeparators({required super.context});
+
+  @override
+  CorrectionApplicability get applicability =>
+      CorrectionApplicability.automatically;
+
+  @override
+  AssistKind get assistKind => DartAssistKind.REMOVE_DIGIT_SEPARATORS;
+
+  @override
+  Future<void> compute(ChangeBuilder builder) async {
+    if (node case IntegerLiteral(:var literal) || DoubleLiteral(:var literal)) {
+      var source = literal.lexeme;
+
+      var withoutSeparators = stripSeparators(source);
+      // Don't offer the correction if the result is unchanged.
+      if (withoutSeparators == source) return;
+      await builder.addDartFileEdit(file, (builder) {
+        builder.addSimpleReplacement(range.node(node), withoutSeparators);
+      });
+    }
+  }
+}

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

@@ -0,0 +1,81 @@
+// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:analysis_server/src/services/correction/assist.dart';
+import 'package:analyzer_plugin/utilities/assist/assist.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+import 'assist_processor.dart';
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(RemoveDigitSeparatorsTest);
+  });
+}
+
+@reflectiveTest
+class RemoveDigitSeparatorsTest extends AssistProcessorTest {
+  @override
+  AssistKind get kind => DartAssistKind.REMOVE_DIGIT_SEPARATORS;
+
+  Future<void> test_double_noSeparators() async {
+    await resolveTestCode('var i = /*caret*/123456.78;');
+    await assertNoAssist();
+  }
+
+  Future<void> test_double_separators() async {
+    await resolveTestCode('var i = /*caret*/111_222.333_444;');
+    await assertHasAssist('var i = 111222.333444;');
+  }
+
+  Future<void> test_doubleScientific_fractional_separators() async {
+    await resolveTestCode('var i = /*caret*/1_2.3_4e5_6;');
+    await assertHasAssist('var i = 12.34e56;');
+  }
+
+  Future<void> test_doubleScientific_negative_separators() async {
+    await resolveTestCode('var i = /*caret*/12_34e-56_78;');
+    await assertHasAssist('var i = 1234e-5678;');
+  }
+
+  Future<void> test_doubleScientific_noSeparators() async {
+    await resolveTestCode('var i = /*caret*/123e456;');
+    await assertNoAssist();
+  }
+
+  Future<void> test_doubleScientific_separators() async {
+    await resolveTestCode('var i = /*caret*/12_34e56_78;');
+    await assertHasAssist('var i = 1234e5678;');
+  }
+
+  Future<void> test_intDecimal_negative_separators() async {
+    await resolveTestCode('var i = -/*caret*/12___34__56_78;');
+    await assertHasAssist('var i = -12345678;');
+  }
+
+  Future<void> test_intDecimal_noSeparators() async {
+    await resolveTestCode('var i = /*caret*/123456;');
+    await assertNoAssist();
+  }
+
+  Future<void> test_intDecimal_separators() async {
+    await resolveTestCode('var i = /*caret*/123__456_78;');
+    await assertHasAssist('var i = 12345678;');
+  }
+
+  Future<void> test_intHex_noSeparators() async {
+    await resolveTestCode('var i = /*caret*/0x123456;');
+    await assertNoAssist();
+  }
+
+  Future<void> test_intHex_separators() async {
+    await resolveTestCode('var i = /*caret*/0x1___234__5_6;');
+    await assertHasAssist('var i = 0x123456;');
+  }
+
+  Future<void> test_intHex_upperCase_separators() async {
+    await resolveTestCode('var i = /*caret*/0X12_34_56;');
+    await assertHasAssist('var i = 0X123456;');
+  }
+}

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

@@ -77,6 +77,7 @@ import 'invert_if_statement_test.dart' as invert_if_statement;
 import 'join_if_with_inner_test.dart' as join_if_with_inner;
 import 'join_if_with_outer_test.dart' as join_if_with_outer;
 import 'join_variable_declaration_test.dart' as join_variable_declaration;
+import 'remove_digit_separators_test.dart' as remove_digit_separators;
 import 'remove_type_annotation_test.dart' as remove_type_annotation;
 import 'replace_conditional_with_if_else_test.dart'
     as replace_conditional_with_if_else;
@@ -162,6 +163,7 @@ void main() {
     join_if_with_inner.main();
     join_if_with_outer.main();
     join_variable_declaration.main();
+    remove_digit_separators.main();
     remove_type_annotation.main();
     replace_conditional_with_if_else.main();
     replace_if_else_with_conditional.main();