X Tutup
Skip to content

Add script editor join_lines keybind#111547

Merged
Repiteo merged 1 commit intogodotengine:masterfrom
sockeye-d:script-editor-join-lines
Feb 27, 2026
Merged

Add script editor join_lines keybind#111547
Repiteo merged 1 commit intogodotengine:masterfrom
sockeye-d:script-editor-join-lines

Conversation

@sockeye-d
Copy link
Contributor

@sockeye-d sockeye-d commented Oct 12, 2025

Turns out, Ctrl+J was already used for toggling the bottom panel display, so I swapped it out for Ctrl+Shift+J. I think it lines up nicely with the Ctrl+Shift+K (delete lines, like ctrl-shift-kut).

Screencast_20251012_013505.webm

Resolves godotengine/godot-proposals#13368

@sockeye-d sockeye-d requested review from a team as code owners October 12, 2025 08:35
@sockeye-d sockeye-d force-pushed the script-editor-join-lines branch from 14cd877 to abc86d9 Compare October 12, 2025 08:42
@Mickeon Mickeon added this to the 4.x milestone Oct 12, 2025
@sockeye-d sockeye-d force-pushed the script-editor-join-lines branch from abc86d9 to b8597ae Compare October 12, 2025 22:32
@sockeye-d sockeye-d requested a review from a team as a code owner October 12, 2025 22:32
@sockeye-d sockeye-d force-pushed the script-editor-join-lines branch from b8597ae to 74d7a72 Compare October 12, 2025 22:42
kitbdev
kitbdev reviewed Oct 13, 2025
View reviewed changes
kitbdev
kitbdev reviewed Oct 13, 2025
View reviewed changes
@sockeye-d sockeye-d force-pushed the script-editor-join-lines branch from 74d7a72 to 11baf0b Compare October 13, 2025 04:40
kitbdev
kitbdev reviewed Oct 13, 2025
View reviewed changes
Copy link
Contributor

@kitbdev kitbdev left a comment

Choose a reason for hiding this comment

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

This behavior exists in VSCode, Rider, and Kate, so it makes sense to have.

@sockeye-d sockeye-d force-pushed the script-editor-join-lines branch from 11baf0b to 49bf8f8 Compare October 13, 2025 21:37
kitbdev
kitbdev reviewed Oct 13, 2025
View reviewed changes
@sockeye-d sockeye-d force-pushed the script-editor-join-lines branch from 49bf8f8 to 47ae3aa Compare October 13, 2025 22:43
@kitbdev
Copy link
Contributor

kitbdev commented Nov 1, 2025

BTW there is a review comment that has not been addressed #111547 (comment)
about changing it to be consistently plural.

@sockeye-d
Copy link
Contributor Author

sockeye-d commented Nov 1, 2025

What would it be consistently plural with, if I did make it join_lines?

@kitbdev
Copy link
Contributor

kitbdev commented Nov 1, 2025

The shortcut name (join_lines), the shortcut display name (Join Lines), and the enum name (EDIT_JOIN_LINES) should all be consistent with the method name (CodeEdit::join_lines).

In other editors too it seems to always be called "Join Lines".

@sockeye-d sockeye-d force-pushed the script-editor-join-lines branch from 47ae3aa to 3c36b68 Compare November 1, 2025 22:22
@sockeye-d
Copy link
Contributor Author

sockeye-d commented Nov 1, 2025

Fixed

kitbdev
kitbdev reviewed Nov 1, 2025
View reviewed changes
@sockeye-d sockeye-d force-pushed the script-editor-join-lines branch 2 times, most recently from 264af7e to 7220535 Compare November 2, 2025 01:43
@kitbdev kitbdev modified the milestones: 4.x, 4.6 Nov 2, 2025
kitbdev
kitbdev approved these changes Nov 2, 2025
View reviewed changes
Copy link
Contributor

@kitbdev kitbdev left a comment

Choose a reason for hiding this comment

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

Looks good

@akien-mga akien-mga changed the title Add script editor join_line keybind Add script editor join_line keybind Nov 4, 2025
AThousandShips
AThousandShips reviewed Nov 4, 2025
View reviewed changes
@sockeye-d sockeye-d force-pushed the script-editor-join-lines branch from 7220535 to b8b6504 Compare November 4, 2025 09:30
@kitbdev kitbdev changed the title Add script editor join_line keybind Add script editor join_lines keybind Nov 4, 2025
@Repiteo Repiteo modified the milestones: 4.6, 4.x Jan 20, 2026
@sockeye-d sockeye-d force-pushed the script-editor-join-lines branch from b8b6504 to 00f0aec Compare February 6, 2026 07:05
@Repiteo Repiteo requested a review from a team as a code owner February 17, 2026 20:10
AdriaandeJongh
AdriaandeJongh reviewed Feb 20, 2026
View reviewed changes
Copy link
Contributor

@AdriaandeJongh AdriaandeJongh left a comment

Choose a reason for hiding this comment

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

Downloaded the artifact for the macOS editor and got the following error when I hit Ctrl + J:

ERROR: Unknown Shortcut: script_text_editor/join_lines.

Am I doing something wrong here?

Ctrl + Shift + J does work as expected, and I agree it works nicely next to Ctrl + Shift + K for deleting the line.

kitbdev
kitbdev reviewed Feb 20, 2026
View reviewed changes
Copy link
Contributor

@kitbdev kitbdev left a comment

Choose a reason for hiding this comment

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

Looks like some things got lost in a rebase.

@sockeye-d sockeye-d force-pushed the script-editor-join-lines branch from 00f0aec to 4d294ca Compare February 20, 2026 23:59
AdriaandeJongh
AdriaandeJongh approved these changes Feb 27, 2026
View reviewed changes
Copy link
Contributor

@AdriaandeJongh AdriaandeJongh left a comment

Choose a reason for hiding this comment

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

Gave it another spin and works from a usability perspective.

@Repiteo Repiteo modified the milestones: 4.x, 4.7 Feb 27, 2026
@Repiteo Repiteo merged commit 28c3784 into godotengine:master Feb 27, 2026
20 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Feb 27, 2026

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AdriaandeJongh AdriaandeJongh AdriaandeJongh approved these changes

@kitbdev kitbdev kitbdev approved these changes

@AThousandShips AThousandShips Awaiting requested review from AThousandShips

Assignees

No one assigned

Labels

enhancement topic:editor topic:gui usability

Projects

None yet

Milestone

4.7

Development

Successfully merging this pull request may close these issues.

Script editor join_line keybind

7 participants

@sockeye-d @kitbdev @Repiteo @AdriaandeJongh @AThousandShips @Calinou @Mickeon
X Tutup