Skip to content

Fix copy when focus is not on editor #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndreasArvidsson merged 2 commits into from
Sep 1, 2021
Merged

Fix copy when focus is not on editor #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fa0a98
Fix copy when focus is not on editor
pokey Sep 1, 2021
a6b0257
Fix bug
pokey Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/actions/CommandAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ import {
} from "../typings/Types";
import displayPendingEditDecorations from "../util/editDisplayUtils";
import { runOnTargetsForEachEditor } from "../util/targetUtils";
import { focusEditor } from "../util/setSelectionsAndFocusEditor";
import {
focusEditor,
setSelectionsAndFocusEditor,
} from "../util/setSelectionsAndFocusEditor";
import { flatten } from "lodash";
import { callFunctionAndUpdateSelections } from "../util/updateSelections";
import { ensureSingleEditor } from "../util/targetUtils";
Expand All @@ -32,18 +35,14 @@ export default class CommandAction implements Action {
await runOnTargetsForEachEditor<SelectionWithEditor[]>(
targets,
async (editor, targets) => {
// For command to the work we have to have the correct editor focused
if (editor !== window.activeTextEditor) {
await focusEditor(editor);
}

const originalSelections = editor.selections;

const targetSelections = targets.map(
(target) => target.selection.selection
);

editor.selections = targetSelections;
// For command to the work we have to have the correct editor focused
await setSelectionsAndFocusEditor(editor, targetSelections, false);
Copy link
Copy Markdown
Member Author

@pokey pokey Sep 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When setting selections and focusing editor it is important to first set the selections and then focus the editor. This was fixed in the setSelectionsAndFocusEditor function but because it wasn't used here we didn't get that fix


const [updatedOriginalSelections, updatedTargetSelections] =
await callFunctionAndUpdateSelections(
Expand Down
8 changes: 6 additions & 2 deletions src/util/setSelectionsAndFocusEditor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@ const columnFocusCommands = {

export async function setSelectionsAndFocusEditor(
editor: TextEditor,
selections: Selection[]
selections: Selection[],
revealRange: boolean = true
) {
editor.selections = selections;
editor.revealRange(editor.selection);

if (revealRange) {
editor.revealRange(editor.selection);
}

// NB: We focus the editor after setting the selection because otherwise you see
// an intermediate state where the old selection persists
Expand Down