diff options
| author | Lluis Sanchez <llsan@microsoft.com> | 2018-07-19 23:18:31 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 23:18:31 +0300 |
| commit | 8499c223e73efdb42f7b5dd7cd53d3477cc31d24 (patch) | |
| tree | 8ee9a0104591c8b58b7148baa50e20fe16c990d1 | |
| parent | 6d96adbb6cf16c47b8cd75a98aecf44058813dff (diff) | |
| parent | dbcaebb35901ccb4d7c35af197cfc41a2f14d815 (diff) | |
Merge pull request #5455 from mono/backport-pr-5407-to-release-7.6monodevelop-7.6.0.2086
[release-7.6] [Editor] Ensure preedit committed before all selections actions
| -rw-r--r-- | main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs | 9 | ||||
| -rw-r--r-- | main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Actions/SelectionActions.cs | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs index 1e4ff3a048..971ca476e5 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs @@ -730,11 +730,6 @@ namespace MonoDevelop.SourceEditor info.Bypass = HasFocus == false; } - void EnsurePreeditCommitted() - { - TextArea.CommitPreedit (); - } - [CommandHandler (MonoDevelop.Ide.Commands.TextEditorCommands.LineEnd)] internal void OnLineEnd () { @@ -864,16 +859,12 @@ namespace MonoDevelop.SourceEditor [CommandHandler (MonoDevelop.Ide.Commands.TextEditorCommands.SelectionMoveLeft)] internal void OnSelectionMoveLeft () { - EnsurePreeditCommitted (); - RunAction (SelectionActions.MoveLeft); } [CommandHandler (MonoDevelop.Ide.Commands.TextEditorCommands.SelectionMoveRight)] internal void OnSelectionMoveRight () { - EnsurePreeditCommitted (); - RunAction (SelectionActions.MoveRight); } diff --git a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Actions/SelectionActions.cs b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Actions/SelectionActions.cs index 6f15a7d5ba..08a3250cca 100644 --- a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Actions/SelectionActions.cs +++ b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Actions/SelectionActions.cs @@ -77,6 +77,8 @@ namespace Mono.TextEditor public static void Select (TextEditorData data, Action<TextEditorData> caretMoveAction) { + data?.Parent?.CommitPreedit (); + using (var undoGroup = data.OpenUndoGroup ()) { PositionChangedHandler handler = new PositionChangedHandler (data); data.Caret.PositionChanged += handler.DataCaretPositionChanged; |