fix: use SCI_GOTOPOS(matchPos) for upstream parity in Go to Matching Brace

Brian Tabone · claude · Brian Tabone · commit 0836ff5898cd · 2026-03-22T16:43:45.000-05:00
Switch from matchPos+1 to matchPos to match upstream Notepad++ behavior
(NppCommands.cpp IDM_SEARCH_GOTOMATCHINGBRACE). Also add SCI_CHOOSECARETX
after the jump to stabilize subsequent Up/Down column navigation.

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/macos/platform/brace_match.mm b/macos/platform/brace_match.mm
@@ -76,7 +76,10 @@ void doGoToMatchingBrace(void* sci)
 	{
 		intptr_t matchPos = ScintillaBridge_sendMessage(sci, SCI_BRACEMATCH, bracePos, 0);
 		if (matchPos >= 0)
-			ScintillaBridge_sendMessage(sci, SCI_GOTOPOS, matchPos + 1, 0);
+		{
+			ScintillaBridge_sendMessage(sci, SCI_GOTOPOS, matchPos, 0);
+			ScintillaBridge_sendMessage(sci, SCI_CHOOSECARETX, 0, 0);
+		}
 	}
 }
 
diff --git a/macos/platform/npp_constants.h b/macos/platform/npp_constants.h
@@ -288,6 +288,7 @@ enum {
 	SCI_BRACEHIGHLIGHT = 2351,
 	SCI_BRACEBADLIGHT = 2352,
 	SCI_BRACEMATCH = 2353,
+	SCI_CHOOSECARETX = 2399,
 
 	// Indentation queries
 	SCI_GETUSETABS = 2125,

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,10 @@ void doGoToMatchingBrace(void* sci)`
`76`	`76`	`{`
`77`	`77`	`intptr_t matchPos = ScintillaBridge_sendMessage(sci, SCI_BRACEMATCH, bracePos, 0);`
`78`	`78`	`if (matchPos >= 0)`
`79`		`- ScintillaBridge_sendMessage(sci, SCI_GOTOPOS, matchPos + 1, 0);`
	`79`	`+ {`
	`80`	`+ ScintillaBridge_sendMessage(sci, SCI_GOTOPOS, matchPos, 0);`
	`81`	`+ ScintillaBridge_sendMessage(sci, SCI_CHOOSECARETX, 0, 0);`
	`82`	`+ }`
`80`	`83`	`}`
`81`	`84`	`}`
`82`	`85`