Merge pull request #84 from hybridmachine/sprint/editing-power-ui-polish

Sprint: Editing Power & UI Polish (6 features)

Author: hybridmachine

macos/CMakeLists.txt

@@ -346,6 +346,8 @@ add_executable(MacOSNotePP
     "${CMAKE_CURRENT_SOURCE_DIR}/platform/incremental_search.mm"
     "${CMAKE_CURRENT_SOURCE_DIR}/platform/find_in_files.mm"
     "${CMAKE_CURRENT_SOURCE_DIR}/platform/search_results_panel.mm"
+    "${CMAKE_CURRENT_SOURCE_DIR}/platform/toolbar.mm"
+    "${CMAKE_CURRENT_SOURCE_DIR}/platform/print_support.mm"
 )
 target_include_directories(MacOSNotePP PRIVATE
     "${CMAKE_CURRENT_SOURCE_DIR}/platform"

macos/platform/app_delegate.mm

@@ -24,6 +24,7 @@
 #include "brace_match.h"
 #include "smart_highlight.h"
 #include "auto_indent.h"
+#include "toolbar.h"
 #include "scintilla_notify.h"
 #include "windows.h"
 #include "commctrl.h"
@@ -168,6 +169,8 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification
 
 	SetMenu(ctx().mainHwnd, hMenuBar);
 
+	setupToolbar(ctx().mainWindow);
+
 	NSView* contentView = ctx().mainWindow.contentView;
 
 	ctx().tabHwnd = CreateWindowExW(

macos/platform/brace_match.h

@@ -4,5 +4,8 @@
 // Call this on every SCN_UPDATEUI notification.
 void doBraceMatch(void* sci);
 
+// Jump the caret to the matching brace.
+void doGoToMatchingBrace(void* sci);
+
 // Configure brace highlight styles for light/dark mode.
 void configureBraceStyles(void* sci, bool isDark);

macos/platform/brace_match.mm

@@ -50,6 +50,39 @@ void doBraceMatch(void* sci)
 	}
 }
 
+void doGoToMatchingBrace(void* sci)
+{
+	if (!sci) return;
+
+	intptr_t caretPos = ScintillaBridge_sendMessage(sci, SCI_GETCURRENTPOS, 0, 0);
+	intptr_t bracePos = -1;
+
+	// Reuse same before-caret / at-caret priority as doBraceMatch
+	if (caretPos > 0)
+	{
+		int ch = static_cast<int>(ScintillaBridge_sendMessage(sci, SCI_GETCHARAT, caretPos - 1, 0));
+		if (isBraceChar(ch))
+			bracePos = caretPos - 1;
+	}
+
+	if (bracePos < 0)
+	{
+		int ch = static_cast<int>(ScintillaBridge_sendMessage(sci, SCI_GETCHARAT, caretPos, 0));
+		if (isBraceChar(ch))
+			bracePos = caretPos;
+	}
+
+	if (bracePos >= 0)
+	{
+		intptr_t matchPos = ScintillaBridge_sendMessage(sci, SCI_BRACEMATCH, bracePos, 0);
+		if (matchPos >= 0)
+		{
+			ScintillaBridge_sendMessage(sci, SCI_GOTOPOS, matchPos, 0);
+			ScintillaBridge_sendMessage(sci, SCI_CHOOSECARETX, 0, 0);
+		}
+	}
+}
+
 void configureBraceStyles(void* sci, bool isDark)
 {
 	if (!sci) return;

macos/platform/edit_commands.h

@@ -11,3 +11,5 @@ void doSortLines(bool ascending);
 void doJoinLines();
 void doTabsToSpaces();
 void doSpacesToTabs();
+void insertDateTimeShort();
+void insertDateTimeLong();

macos/platform/edit_commands.mm

@@ -1,6 +1,7 @@
 // edit_commands.mm — Edit menu commands (case, line ops, comments, sort, join)
 // Part of the Notepad++ macOS port modular refactor.
 
+#import <Foundation/Foundation.h>
 #include "edit_commands.h"
 #include "npp_constants.h"
 #include "app_state.h"
@@ -351,3 +352,34 @@ void doSpacesToTabs()
 	}
 	ScintillaBridge_sendMessage(sci, SCI_ENDUNDOACTION, 0, 0);
 }
+
+void insertDateTimeShort()
+{
+	void* sci = ctx().activeScintillaView();
+	if (!sci) return;
+
+	NSDateFormatter* formatter = [[NSDateFormatter alloc] init];
+	[formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
+	NSString* dateStr = [formatter stringFromDate:[NSDate date]];
+	const char* utf8 = [dateStr UTF8String];
+
+	ScintillaBridge_sendMessage(sci, SCI_BEGINUNDOACTION, 0, 0);
+	ScintillaBridge_sendMessage(sci, SCI_REPLACESEL, 0, reinterpret_cast<intptr_t>(utf8));
+	ScintillaBridge_sendMessage(sci, SCI_ENDUNDOACTION, 0, 0);
+}
+
+void insertDateTimeLong()
+{
+	void* sci = ctx().activeScintillaView();
+	if (!sci) return;
+
+	NSDateFormatter* formatter = [[NSDateFormatter alloc] init];
+	[formatter setDateStyle:NSDateFormatterFullStyle];
+	[formatter setTimeStyle:NSDateFormatterMediumStyle];
+	NSString* dateStr = [formatter stringFromDate:[NSDate date]];
+	const char* utf8 = [dateStr UTF8String];
+
+	ScintillaBridge_sendMessage(sci, SCI_BEGINUNDOACTION, 0, 0);
+	ScintillaBridge_sendMessage(sci, SCI_REPLACESEL, 0, reinterpret_cast<intptr_t>(utf8));
+	ScintillaBridge_sendMessage(sci, SCI_ENDUNDOACTION, 0, 0);
+}

macos/platform/language_defs.h

@@ -14,6 +14,42 @@ struct LangDef
 	int menuId;                // Menu command ID
 };
 
+// Named language indices for type-safe references
+constexpr int LANG_NORMAL_TEXT = 0;
+constexpr int LANG_C = 1;
+constexpr int LANG_CPP = 2;
+constexpr int LANG_JAVA = 3;
+constexpr int LANG_PYTHON = 4;
+constexpr int LANG_JAVASCRIPT = 5;
+constexpr int LANG_HTML = 6;
+constexpr int LANG_CSS = 7;
+constexpr int LANG_XML = 8;
+constexpr int LANG_JSON = 9;
+constexpr int LANG_MARKDOWN = 10;
+constexpr int LANG_SQL = 11;
+constexpr int LANG_SHELL = 12;
+constexpr int LANG_RUST = 13;
+constexpr int LANG_GO = 14;
+constexpr int LANG_OBJC = 15;
+constexpr int LANG_SWIFT = 16;
+constexpr int LANG_TYPESCRIPT = 17;
+constexpr int LANG_PHP = 18;
+constexpr int LANG_RUBY = 19;
+constexpr int LANG_PERL = 20;
+constexpr int LANG_LUA = 21;
+constexpr int LANG_YAML = 22;
+constexpr int LANG_TOML = 23;
+constexpr int LANG_INI = 24;
+constexpr int LANG_MAKEFILE = 25;
+constexpr int LANG_DIFF = 26;
+constexpr int LANG_DOCKERFILE = 27;
+constexpr int LANG_CMAKE = 28;
+constexpr int LANG_POWERSHELL = 29;
+constexpr int LANG_R = 30;
+constexpr int LANG_KOTLIN = 31;
+constexpr int LANG_SCALA = 32;
+constexpr int LANG_LATEX = 33;
+
 extern const LangDef g_languages[];
 extern const int g_numLanguages;