Skip to content

- Set caret location after a template insert using the ^ symbol. #332

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

Open
wants to merge 7 commits into
base: devel
Choose a base branch
from
Open

- Set caret location after a template insert using the ^ symbol. #332

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
95f19c6
- Set caret location after a template insert using the ^ symbol.
Sep 2, 2025
443e007
Update ScintillaHighlighting.pb
spikey-pb Sep 7, 2025
d0feb75
Updates from code review.
Sep 9, 2025
afd28c5
Merge branch 'fantaisie-software:devel' into TemplatesCaret
spikey-pb Sep 9, 2025
05ba61f
Remove mistakenly included 'PureBasicIDE.pbp'.
Sep 9, 2025
f94bff2
Merge branch 'TemplatesCaret' of https://github.com/spikey-pb/purebas…
Sep 9, 2025
279eb0b
Merge branch 'fantaisie-software:devel' into TemplatesCaret
spikey-pb Sep 13, 2025
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
18 changes: 15 additions & 3 deletions PureBasicIDE/ScintillaHighlighting.pb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
; See LICENSE and LICENSE-FANTAISIE in the project root for license information.
; --------------------------------------------------------------------------------------------



CompilerIf #CompileWindows | #CompileLinux | #CompileMac

#SCI_NORM = 0
Expand Down Expand Up @@ -3501,17 +3499,31 @@ CompilerIf #CompileWindows | #CompileLinux | #CompileMac
SetBackgroundColor(Gadget) ; updates the 'disabled background color'
EndProcedure


Procedure InsertCodeString(String$)

If *ActiveSource\Parser\Encoding = 1 ; utf8
Format = #PB_UTF8
Else
Format = #PB_Ascii
EndIf

; Embed insertion into a single transaction, otherwise the insertion mark will reappear in an Undo action.
SendEditorMessage(#SCI_BEGINUNDOACTION, 0, 0)

CurrentPos = SendEditorMessage(#SCI_GETCURRENTPOS, 0, 0)
Converted$ = Space(StringByteLength(String$, Format))
PokeS(@Converted$, String$, -1, Format)
SendEditorMessage(#SCI_REPLACESEL, 0, @Converted$)

; Remove marker and move caret, if a position is specified.
MarkerOffset = FindString(String$, "^")
Copy link
Collaborator

@t-harter t-harter Sep 8, 2025

Choose a reason for hiding this comment

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

You need to take care of possible UTF-8 encoding here (see the Format variable). The scintilla commands usually take byte offsets, not character positions. Best is to do some testing with accented or other special characters and try both UTF8 and Ascii to make sure both work right.

Copy link
Collaborator

@t-harter t-harter Sep 8, 2025

Choose a reason for hiding this comment

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

Also, I just noticed that the procedure you modified (InsertCodeString()) is used in multiple places in the IDE. So placing this caret move code in there could have some side effect on another use case, maybe.

Why not add a new parameter to the procedure to enable/disable this behavior? This way it will not affect anything outside of the template functionality. You can make it an optional parameter so existing code does not need to be changed.

Copy link
Contributor Author

@spikey-pb spikey-pb Sep 9, 2025

Choose a reason for hiding this comment

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

OK, done.

If MarkerOffset > 0
SendEditorMessage(#SCI_GOTOPOS, CurrentPos + MarkerOffset - 1)
SendEditorMessage(#SCI_DELETERANGE, CurrentPos + MarkerOffset - 1, 1)
EndIf

SendEditorMessage(#SCI_ENDUNDOACTION, 0, 0)

EndProcedure

Procedure Undo()
Expand Down