Revert "Support block delete with word and line modifiers (#79695)" (#79968)

This reverts commit 0ba2f6a8.

Revert "Support block delete with word and line modifiers (#79695)" (#79968)
This reverts commit 0ba2f6a8.
a637fcd3 · Jenn Magder · GitHub · 0ba2f6a8 · a637fcd3 · a637fcd3
Unverified Commit a637fcd3 authored Apr 07, 2021 by Jenn Magder Committed by GitHub Apr 07, 2021
5 changed files
--- a/packages/flutter/lib/src/rendering/editable.dart
+++ b/packages/flutter/lib/src/rendering/editable.dart
--- a/packages/flutter/lib/src/widgets/default_text_editing_actions.dart
+++ b/packages/flutter/lib/src/widgets/default_text_editing_actions.dart
@@ -36,12 +36,6 @@ class DefaultTextEditingActions extends Actions{
  // are called on which platform.
  static final Map<Type, Action<Intent>> _shortcutsActions = <Type, Action<Intent>>{
    DoNothingAndStopPropagationTextIntent: _DoNothingAndStopPropagationTextAction(),
-    DeleteTextIntent: _DeleteTextAction(),
-    DeleteByWordTextIntent: _DeleteByWordTextAction(),
-    DeleteByLineTextIntent: _DeleteByLineTextAction(),
-    DeleteForwardTextIntent: _DeleteForwardTextAction(),
-    DeleteForwardByWordTextIntent: _DeleteForwardByWordTextAction(),
-    DeleteForwardByLineTextIntent: _DeleteForwardByLineTextAction(),
    ExtendSelectionDownTextIntent: _ExtendSelectionDownTextAction(),
    ExtendSelectionLeftByLineTextIntent: _ExtendSelectionLeftByLineTextAction(),
    ExtendSelectionLeftByWordTextIntent: _ExtendSelectionLeftByWordTextAction(),
@@ -82,48 +76,6 @@ class _DoNothingAndStopPropagationTextAction extends TextEditingAction<DoNothing
  void invoke(DoNothingAndStopPropagationTextIntent intent, [BuildContext? context]) {}
 }

-class _DeleteTextAction extends TextEditingAction<DeleteTextIntent> {
-  @override
-  Object? invoke(DeleteTextIntent intent, [BuildContext? context]) {
-    textEditingActionTarget!.renderEditable.delete(SelectionChangedCause.keyboard);
-  }
-}
-
-class _DeleteByWordTextAction extends TextEditingAction<DeleteByWordTextIntent> {
-  @override
-  Object? invoke(DeleteByWordTextIntent intent, [BuildContext? context]) {
-    textEditingActionTarget!.renderEditable.deleteByWord(SelectionChangedCause.keyboard, false);
-  }
-}
-
-class _DeleteByLineTextAction extends TextEditingAction<DeleteByLineTextIntent> {
-  @override
-  Object? invoke(DeleteByLineTextIntent intent, [BuildContext? context]) {
-    textEditingActionTarget!.renderEditable.deleteByLine(SelectionChangedCause.keyboard);
-  }
-}
-
-class _DeleteForwardTextAction extends TextEditingAction<DeleteForwardTextIntent> {
-  @override
-  Object? invoke(DeleteForwardTextIntent intent, [BuildContext? context]) {
-    textEditingActionTarget!.renderEditable.deleteForward(SelectionChangedCause.keyboard);
-  }
-}
-
-class _DeleteForwardByWordTextAction extends TextEditingAction<DeleteForwardByWordTextIntent> {
-  @override
-  Object? invoke(DeleteForwardByWordTextIntent intent, [BuildContext? context]) {
-    textEditingActionTarget!.renderEditable.deleteForwardByWord(SelectionChangedCause.keyboard, false);
-  }
-}
-
-class _DeleteForwardByLineTextAction extends TextEditingAction<DeleteForwardByLineTextIntent> {
-  @override
-  Object? invoke(DeleteForwardByLineTextIntent intent, [BuildContext? context]) {
-    textEditingActionTarget!.renderEditable.deleteForwardByLine(SelectionChangedCause.keyboard);
-  }
-}
-
 class _ExpandSelectionLeftByLineTextAction extends TextEditingAction<ExpandSelectionLeftByLineTextIntent> {
  @override
  Object? invoke(ExpandSelectionLeftByLineTextIntent intent, [BuildContext? context]) {

--- a/packages/flutter/lib/src/widgets/default_text_editing_shortcuts.dart
+++ b/packages/flutter/lib/src/widgets/default_text_editing_shortcuts.dart
@@ -161,12 +161,6 @@ class DefaultTextEditingShortcuts extends Shortcuts {
  );

  static final Map<LogicalKeySet, Intent> _androidShortcuts = <LogicalKeySet, Intent>{
-    LogicalKeySet(LogicalKeyboardKey.backspace): const DeleteTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.backspace): const DeleteByWordTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.backspace): const DeleteByLineTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.delete): const DeleteForwardTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.delete): const DeleteForwardByWordTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.delete): const DeleteForwardByLineTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowDown): const MoveSelectionToEndTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowLeft): const MoveSelectionLeftByLineTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowRight): const MoveSelectionRightByLineTextIntent(),
@@ -201,17 +195,9 @@ class DefaultTextEditingShortcuts extends Shortcuts {
    //   * Meta + shift + arrow up
    //   * Shift + end
    //   * Shift + home
-    //   * Meta + delete
-    //   * Meta + backspace
  };

  static final Map<LogicalKeySet, Intent> _fuchsiaShortcuts = <LogicalKeySet, Intent>{
-    LogicalKeySet(LogicalKeyboardKey.backspace): const DeleteTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.backspace): const DeleteByWordTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.backspace): const DeleteByLineTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.delete): const DeleteForwardTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.delete): const DeleteForwardByWordTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.delete): const DeleteForwardByLineTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowDown): const MoveSelectionToEndTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowLeft): const MoveSelectionLeftByLineTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowRight): const MoveSelectionRightByLineTextIntent(),
@@ -246,17 +232,9 @@ class DefaultTextEditingShortcuts extends Shortcuts {
    //   * Meta + shift + arrow up
    //   * Shift + end
    //   * Shift + home
-    //   * Meta + delete
-    //   * Meta + backspace
  };

  static final Map<LogicalKeySet, Intent> _iOSShortcuts = <LogicalKeySet, Intent>{
-    LogicalKeySet(LogicalKeyboardKey.backspace): const DeleteTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.backspace): const DeleteByWordTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.backspace): const DeleteByLineTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.delete): const DeleteForwardTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.delete): const DeleteForwardByWordTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.delete): const DeleteForwardByLineTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowDown): const MoveSelectionToEndTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowLeft): const MoveSelectionLeftByLineTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowRight): const MoveSelectionRightByLineTextIntent(),
@@ -291,17 +269,9 @@ class DefaultTextEditingShortcuts extends Shortcuts {
    //   * Meta + shift + arrow up
    //   * Shift + end
    //   * Shift + home
-    //   * Meta + delete
-    //   * Meta + backspace
  };

  static final Map<LogicalKeySet, Intent> _linuxShortcuts = <LogicalKeySet, Intent>{
-    LogicalKeySet(LogicalKeyboardKey.backspace): const DeleteTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.backspace): const DeleteByWordTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.backspace): const DeleteByLineTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.delete): const DeleteForwardTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.delete): const DeleteForwardByWordTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.delete): const DeleteForwardByLineTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowDown): const MoveSelectionToEndTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowLeft): const MoveSelectionLeftByLineTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowRight): const MoveSelectionRightByLineTextIntent(),
@@ -336,17 +306,9 @@ class DefaultTextEditingShortcuts extends Shortcuts {
    //   * Meta + shift + arrow up
    //   * Shift + end
    //   * Shift + home
-    //   * Meta + delete
-    //   * Meta + backspace
  };

  static final Map<LogicalKeySet, Intent> _macShortcuts = <LogicalKeySet, Intent>{
-    LogicalKeySet(LogicalKeyboardKey.backspace): const DeleteTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.backspace): const DeleteByWordTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.meta, LogicalKeyboardKey.backspace): const DeleteByLineTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.delete): const DeleteForwardTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.delete): const DeleteForwardByWordTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.meta, LogicalKeyboardKey.delete): const DeleteForwardByLineTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowDown): const MoveSelectionRightByLineTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowLeft): const MoveSelectionLeftByWordTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowRight): const MoveSelectionRightByWordTextIntent(),
@@ -381,17 +343,9 @@ class DefaultTextEditingShortcuts extends Shortcuts {
    //   * Home
    //   * Shift + end
    //   * Shift + home
-    //   * Control + delete
-    //   * Control + backspace
  };

  static final Map<LogicalKeySet, Intent> _windowsShortcuts = <LogicalKeySet, Intent>{
-    LogicalKeySet(LogicalKeyboardKey.backspace): const DeleteTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.backspace): const DeleteByWordTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.backspace): const DeleteByLineTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.delete): const DeleteForwardTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.delete): const DeleteForwardByWordTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.delete): const DeleteForwardByLineTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowDown): const MoveSelectionToEndTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowLeft): const MoveSelectionLeftByLineTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowRight): const MoveSelectionRightByLineTextIntent(),
@@ -426,21 +380,11 @@ class DefaultTextEditingShortcuts extends Shortcuts {
    //   * Meta + shift + arrow left
    //   * Meta + shift + arrow right
    //   * Meta + shift + arrow up
-    //   * Meta + delete
-    //   * Meta + backspace
  };

  // Web handles its text selection natively and doesn't use any of these
  // shortcuts in Flutter.
  static final Map<LogicalKeySet, Intent> _webShortcuts = <LogicalKeySet, Intent>{
-    LogicalKeySet(LogicalKeyboardKey.backspace): const DoNothingAndStopPropagationTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.delete): const DoNothingAndStopPropagationTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.backspace): const DoNothingAndStopPropagationTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.delete): const DoNothingAndStopPropagationTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.backspace): const DoNothingAndStopPropagationTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.delete): const DoNothingAndStopPropagationTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.meta, LogicalKeyboardKey.backspace): const DoNothingAndStopPropagationTextIntent(),
-    LogicalKeySet(LogicalKeyboardKey.meta, LogicalKeyboardKey.delete): const DoNothingAndStopPropagationTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowDown): const DoNothingAndStopPropagationTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowLeft): const DoNothingAndStopPropagationTextIntent(),
    LogicalKeySet(LogicalKeyboardKey.alt, LogicalKeyboardKey.arrowRight): const DoNothingAndStopPropagationTextIntent(),

--- a/packages/flutter/lib/src/widgets/text_editing_intents.dart
+++ b/packages/flutter/lib/src/widgets/text_editing_intents.dart
@@ -4,54 +4,6 @@

 import 'actions.dart';

-/// An [Intent] to delete a character in the backwards direction.
-///
-/// {@macro flutter.widgets.TextEditingIntents.seeAlso}
-class DeleteTextIntent extends Intent{
-  /// Creates an instance of DeleteTextIntent.
-  const DeleteTextIntent();
-}
-
-/// An [Intent] to delete a word in the backwards direction.
-///
-/// {@macro flutter.widgets.TextEditingIntents.seeAlso}
-class DeleteByWordTextIntent extends Intent{
-  /// Creates an instance of DeleteByWordTextIntent.
-  const DeleteByWordTextIntent();
-}
-
-/// An [Intent] to delete a line in the backwards direction.
-///
-/// {@macro flutter.widgets.TextEditingIntents.seeAlso}
-class DeleteByLineTextIntent extends Intent{
-  /// Creates an instance of DeleteByLineTextIntent.
-  const DeleteByLineTextIntent();
-}
-
-/// An [Intent] to delete in the forward direction.
-///
-/// {@macro flutter.widgets.TextEditingIntents.seeAlso}
-class DeleteForwardTextIntent extends Intent{
-  /// Creates an instance of DeleteForwardTextIntent.
-  const DeleteForwardTextIntent();
-}
-
-/// An [Intent] to delete a word in the forward direction.
-///
-/// {@macro flutter.widgets.TextEditingIntents.seeAlso}
-class DeleteForwardByWordTextIntent extends Intent{
-  /// Creates an instance of DeleteByWordTextIntent.
-  const DeleteForwardByWordTextIntent();
-}
-
-/// An [Intent] to delete a line in the forward direction.
-///
-/// {@macro flutter.widgets.TextEditingIntents.seeAlso}
-class DeleteForwardByLineTextIntent extends Intent{
-  /// Creates an instance of DeleteByLineTextIntent.
-  const DeleteForwardByLineTextIntent();
-}
-
 /// An [Intent] to send the event straight to the engine, but only if a
 /// TextEditingTarget is focused.
 ///

--- a/packages/flutter/test/rendering/editable_test.dart
+++ b/packages/flutter/test/rendering/editable_test.dart