Skip to content

Commit 90805f1

Browse files
donhogithub-actions[bot]
authored andcommitted
1 parent e1313d6 commit 90805f1

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

src/DockingFeature/Docking.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ struct tTbData {
5555
// user modifications
5656
UINT uMask = 0; // mask params: look to above defines
5757
HICON hIconTab = nullptr; // icon for tabs
58-
const wchar_t* pszAddInfo = nullptr; // for plugin to display additional informations
58+
const wchar_t* pszAddInfo = nullptr; // for plugin to display additional information
5959

6060
// internal data, do not use !!!
6161
RECT rcFloat = {}; // floating position

src/Notepad_plus_msgs.h

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ enum LangType {L_TEXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\
4040
L_TYPESCRIPT, L_JSON5, L_MSSQL, L_GDSCRIPT, L_HOLLYWOOD,\
4141
L_GOLANG, L_RAKU, L_TOML, L_SAS, L_ERRORLIST, \
4242
// Don't use L_JS, use L_JAVASCRIPT instead
43-
// The end of enumated language type, so it should be always at the end
43+
// The end of enumerated language type, so it should be always at the end
4444
L_EXTERNAL};
4545
enum class ExternalLexerAutoIndentMode { Standard, C_Like, Custom };
4646
enum class MacroStatus { Idle, RecordInProgress, RecordingStopped, PlayingBack };
@@ -85,7 +85,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
8585

8686
#define NPPM_GETOPENFILENAMES_DEPRECATED (NPPMSG + 8)
8787
// BOOL NPPM_GETOPENFILENAMES_DEPRECATED(wchar_t** fileNames, int nbFileNames) - DEPRECATED: It is kept for the compatibility. Use NPPM_GETBUFFERIDFROMPOS & NPPM_GETFULLPATHFROMBUFFERID instead.
88-
// Get the open files full paths of both views. User is responsible to allocate an big enough fileNames array by using NPPM_GETNBOPENFILES.
88+
// Get the open files full paths of both views. User is responsible to allocate a big enough fileNames array by using NPPM_GETNBOPENFILES.
8989
// wParam[out]: fileNames - array of file path
9090
// lParam[in]: nbFileNames is the number of file path.
9191
// return value: The number of files copied into fileNames array
@@ -160,7 +160,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
160160

161161
#define NPPM_DESTROYSCINTILLAHANDLE_DEPRECATED (NPPMSG + 21)
162162
// BOOL NPPM_DESTROYSCINTILLAHANDLE_DEPRECATED(0, HWND hScintilla) - DEPRECATED: It is kept for the compatibility.
163-
// Notepad++ will deallocate every createed Scintilla control on exit, this message returns TRUE but does nothing.
163+
// Notepad++ will deallocate every created Scintilla control on exit, this message returns TRUE but does nothing.
164164
// wParam: 0 (not used)
165165
// lParam[in]: hScintilla is Scintilla handle
166166
// Return TRUE
@@ -241,14 +241,14 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
241241

242242
#define NPPM_DMMSHOW (NPPMSG + 30)
243243
// BOOL NPPM_DMMSHOW(0, HWND hDlg)
244-
// Show the dialog which was previously regeistered by NPPM_DMMREGASDCKDLG.
244+
// Show the dialog which was previously registered by NPPM_DMMREGASDCKDLG.
245245
// wParam: 0 (not used)
246246
// lParam[in]: hDlg is the handle of dialog to show
247247
// Return TRUE
248248

249249
#define NPPM_DMMHIDE (NPPMSG + 31)
250250
// BOOL NPPM_DMMHIDE(0, HWND hDlg)
251-
// Hide the dialog which was previously regeistered by NPPM_DMMREGASDCKDLG.
251+
// Hide the dialog which was previously registered by NPPM_DMMREGASDCKDLG.
252252
// wParam: 0 (not used)
253253
// lParam[in]: hDlg is the handle of dialog to hide
254254
// Return TRUE
@@ -265,8 +265,8 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
265265
// Pass the necessary dockingData to Notepad++ in order to make your dialog dockable.
266266
// wParam: 0 (not used)
267267
// lParam[in]: pData is the pointer of tTbData. Please check tTbData structure in "Docking.h"
268-
// Minimum informations which needs to be filled out are hClient, pszName, dlgID, uMask and pszModuleName.
269-
// Notice that rcFloatand iPrevCont shouldn't be filled. They are used internally.
268+
// Minimum information which needs to be filled out are hClient, pszName, dlgID, uMask and pszModuleName.
269+
// Notice that rcFloat and iPrevCont shouldn't be filled. They are used internally.
270270
// Return TRUE
271271

272272
#define NPPM_LOADSESSION (NPPMSG + 34)
@@ -336,7 +336,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
336336
// Get OS (Windows) version.
337337
// wParam: 0 (not used)
338338
// lParam: 0 (not used)
339-
// Return enum winVer, which is defined at the begining of this file
339+
// Return enum winVer, which is defined at the beginning of this file
340340

341341
#define NPPM_DMMGETPLUGINHWNDBYNAME (NPPMSG + 43)
342342
// HWND NPPM_DMMGETPLUGINHWNDBYNAME(const wchar_t *windowName, const wchar_t *moduleName)
@@ -371,9 +371,9 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
371371

372372
#define NPPM_MSGTOPLUGIN (NPPMSG + 47)
373373
struct CommunicationInfo {
374-
long internalMsg; // an integer defined by plugin Y, known by plugin X, identifying the message being sent.
375-
const wchar_t * srcModuleName; // the complete module name (with the extesion .dll) of caller (plugin X).
376-
void* info; // defined by plugin, the informations to be exchanged between X and Y. It's a void pointer so it should be defined by plugin Y and known by plugin X.
374+
long internalMsg; // an integer defined by plugin Y, known by plugin X, identifying the message being sent.
375+
const wchar_t * srcModuleName; // the complete module name (with the extension .dll) of caller (plugin X).
376+
void* info; // defined by plugin, the information to be exchanged between X and Y. It's a void pointer so it should be defined by plugin Y and known by plugin X.
377377
};
378378
// BOOL NPPM_MSGTOPLUGIN(wchar_t *destModuleName, CommunicationInfo *info)
379379
// Send a private information to a plugin with given plugin name. This message allows the communication between 2 plugins.
@@ -526,7 +526,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
526526
// Get the EOL format of the document with given bufferID.
527527
// wParam[in]: BufferID to get EolType format from
528528
// lParam: 0 (not used)
529-
// Returned value is -1 on error, otherwize EolType format:
529+
// Returned value is -1 on error, otherwise EolType format:
530530
// 0: Windows (CRLF)
531531
// 1: Macos (CR)
532532
// 2: Unix (LF)
@@ -633,7 +633,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
633633
// BOOL isAllocatedSuccessful = ::SendMessage(nppData._nppHandle, NPPM_ALLOCATECMDID, 4, &idBegin);
634634
//
635635
// if isAllocatedSuccessful is TRUE, and value of idBegin is 46581
636-
// then menu iten ID 46581, 46582, 46583 and 46584 are preserved by Notepad++, and they are safe to be used by the plugin.
636+
// then menu item ID 46581, 46582, 46583 and 46584 are preserved by Notepad++, and they are safe to be used by the plugin.
637637

638638
#define NPPM_ALLOCATEMARKER (NPPMSG + 82)
639639
// BOOL NPPM_ALLOCATEMARKER(int numberRequested, int* startNumber)
@@ -655,7 +655,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
655655
// int NPPM_GETLANGUAGENAME(LangType langType, wchar_t* langName)
656656
// Get programming language name from the given language type (enum LangType).
657657
// wParam[in]: langType is the number of LangType
658-
// lParam[out]: langName is the buffer to recieve the language name string
658+
// lParam[out]: langName is the buffer to receive the language name string
659659
// Return value is the number of copied character / number of character to copy (\0 is not included)
660660
//
661661
// You should call this function 2 times - the first time you pass langName as NULL to get the number of characters to copy.
@@ -666,7 +666,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
666666
// INT NPPM_GETLANGUAGEDESC(int langType, wchar_t *langDesc)
667667
// Get programming language short description from the given language type (enum LangType)
668668
// wParam[in]: langType is the number of LangType
669-
// lParam[out]: langDesc is the buffer to recieve the language description string
669+
// lParam[out]: langDesc is the buffer to receive the language description string
670670
// Return value is the number of copied character / number of character to copy (\0 is not included)
671671
//
672672
// You should call this function 2 times - the first time you pass langDesc as NULL to get the number of characters to copy.
@@ -814,7 +814,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
814814
// BOOL NPPM_GETEXTERNALLEXERAUTOINDENTMODE(const wchar_t* languageName, ExternalLexerAutoIndentMode* autoIndentMode)
815815
// Get ExternalLexerAutoIndentMode for an installed external programming language.
816816
// wParam[in]: languageName is external language name to search
817-
// lParam[out]: autoIndentMode could recieve one of three following values
817+
// lParam[out]: autoIndentMode could receive one of three following values
818818
// - Standard (0) means Notepad++ will keep the same TAB indentation between lines;
819819
// - C_Like (1) means Notepad++ will perform a C-Language style indentation for the selected external language;
820820
// - Custom (2) means a Plugin will be controlling auto-indentation for the current language.
@@ -824,7 +824,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
824824
// BOOL NPPM_SETEXTERNALLEXERAUTOINDENTMODE(const wchar_t* languageName, ExternalLexerAutoIndentMode autoIndentMode)
825825
// Set ExternalLexerAutoIndentMode for an installed external programming language.
826826
// wParam[in]: languageName is external language name to set
827-
// lParam[in]: autoIndentMode could recieve one of three following values
827+
// lParam[in]: autoIndentMode could receive one of three following values
828828
// - Standard (0) means Notepad++ will keep the same TAB indentation between lines;
829829
// - C_Like (1) means Notepad++ will perform a C-Language style indentation for the selected external language;
830830
// - Custom (2) means a Plugin will be controlling auto-indentation for the current language.
@@ -904,7 +904,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
904904

905905
#define NPPM_GETBOOKMARKID (NPPMSG + 111)
906906
// int NPPM_GETBOOKMARKID(0, 0)
907-
// Get the bookmark ID - use this API to get bookmark ID dynamically that garantees you get always the right bookmark ID even it's been changed through the different versions.
907+
// Get the bookmark ID - use this API to get bookmark ID dynamically that guarantees you get always the right bookmark ID even it's been changed through the different versions.
908908
// wParam: 0 (not used)
909909
// lParam: 0 (not used)
910910
// Return bookmark ID
@@ -924,7 +924,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
924924
// Might not work properly in C# plugins.
925925
// wParam[in]: dmFlags has 2 possible value dmfInit (0x0000000BUL) & dmfHandleChange (0x0000000CUL) - see above definition
926926
// lParam[in]: hwnd is the dialog handle of plugin - Docking panels don't need to call NPPM_DARKMODESUBCLASSANDTHEME
927-
// Returns succesful combinations of flags.
927+
// Returns successful combinations of flags.
928928

929929
// Examples:
930930
//
@@ -970,7 +970,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
970970
// lParam[in]: tabIndex - index (in the view indicated above). -1 for currently active tab
971971
// Return tab color ID which contains the following values: 0 (yellow), 1 (green), 2 (blue), 3 (orange), 4 (pink) or -1 (no color)
972972
//
973-
// Note: there's no symetric command NPPM_SETTABCOLORID. Plugins can use NPPM_MENUCOMMAND to set current tab color with the desired tab color ID.
973+
// Note: there's no symmetric command NPPM_SETTABCOLORID. Plugins can use NPPM_MENUCOMMAND to set current tab color with the desired tab color ID.
974974

975975
#define NPPM_SETUNTITLEDNAME (NPPMSG + 115)
976976
// BOOL NPPM_SETUNTITLEDNAME(BufferID id, const wchar_t* newName)
@@ -990,14 +990,14 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
990990
// Return the number of char copied/to copy
991991

992992
#define NPPM_ADDSCNMODIFIEDFLAGS (NPPMSG + 117)
993-
// BOOL NPPM_ADDSCNMODIFIEDFLAGS(0, unsigned long scnMotifiedFlags2Add)
993+
// BOOL NPPM_ADDSCNMODIFIEDFLAGS(0, unsigned long scnModifiedFlags2Add)
994994
// Add the necessary SCN_MODIFIED flags so that your plugin will receive the SCN_MODIFIED notification for these events, enabling your specific treatments.
995995
// By default, Notepad++ only forwards SCN_MODIFIED with the following 5 flags/events:
996996
// SC_MOD_DELETETEXT | SC_MOD_INSERTTEXT | SC_PERFORMED_UNDO | SC_PERFORMED_REDO | SC_MOD_CHANGEINDICATOR to plugins.
997997
// If your plugin needs to process other SCN_MODIFIED events, you should add the required flags by sending this message to Notepad++. You can send it immediately after receiving NPPN_READY,
998998
// or only when your plugin needs to listen to specific events (to avoid penalizing Notepad++'s performance). Just ensure that the message is sent only once.
999999
// wParam: 0 (not used)
1000-
// lParam[in]: scnMotifiedFlags2Add - Scintilla SCN_MODIFIED flags to add.
1000+
// lParam[in]: scnModifiedFlags2Add - Scintilla SCN_MODIFIED flags to add.
10011001
// Return TRUE
10021002
//
10031003
// Example:
@@ -1019,7 +1019,7 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
10191019

10201020
#define NPPM_GETTOOLBARICONSETCHOICE (NPPMSG + 118)
10211021
// BOOL NPPM_GETTOOLBARICONSETCHOICE(0, 0)
1022-
// Get Notepad++ toobar icon set choice (Fluent UI: small, Fluent UI: large, Filled Fluent UI: small, Filled Fluent UI: large and Standard icons: small.
1022+
// Get Notepad++ toolbar icon set choice (Fluent UI: small, Fluent UI: large, Filled Fluent UI: small, Filled Fluent UI: large and Standard icons: small.
10231023
// wParam: 0 (not used)
10241024
// lParam: 0 (not used)
10251025
// Return toolbar icon set choice as an integer value. Here are 5 possible values:

src/menuCmdID.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#define IDM_FILE_OPEN_FOLDER (IDM_FILE + 19)
4444
#define IDM_FILE_OPEN_CMD (IDM_FILE + 20)
4545
#define IDM_FILE_RESTORELASTCLOSEDFILE (IDM_FILE + 21)
46-
#define IDM_FILE_OPENFOLDERASWORSPACE (IDM_FILE + 22)
46+
#define IDM_FILE_OPENFOLDERASWORKSPACE (IDM_FILE + 22)
4747
#define IDM_FILE_OPEN_DEFAULT_VIEWER (IDM_FILE + 23)
4848
#define IDM_FILE_CLOSEALL_UNCHANGED (IDM_FILE + 24)
4949
#define IDM_FILE_CONTAININGFOLDERASWORKSPACE (IDM_FILE + 25)
@@ -283,17 +283,17 @@
283283
//#define IDM_VIEW_REDUCETABBAR (IDM_VIEW + 5)
284284
//#define IDM_VIEW_LOCKTABBAR (IDM_VIEW + 6)
285285
//#define IDM_VIEW_DRAWTABBAR_TOPBAR (IDM_VIEW + 7)
286-
//#define IDM_VIEW_DRAWTABBAR_INACIVETAB (IDM_VIEW + 8)
286+
//#define IDM_VIEW_DRAWTABBAR_INACTIVETAB (IDM_VIEW + 8)
287287
#define IDM_VIEW_POSTIT (IDM_VIEW + 9)
288288
#define IDM_VIEW_FOLDALL (IDM_VIEW + 10)
289289
#define IDM_VIEW_DISTRACTIONFREE (IDM_VIEW + 11)
290290
//#define IDM_VIEW_LINENUMBER (IDM_VIEW + 12)
291291
//#define IDM_VIEW_SYMBOLMARGIN (IDM_VIEW + 13)
292-
//#define IDM_VIEW_FOLDERMAGIN (IDM_VIEW + 14)
293-
//#define IDM_VIEW_FOLDERMAGIN_SIMPLE (IDM_VIEW + 15)
294-
//#define IDM_VIEW_FOLDERMAGIN_ARROW (IDM_VIEW + 16)
295-
//#define IDM_VIEW_FOLDERMAGIN_CIRCLE (IDM_VIEW + 17)
296-
//#define IDM_VIEW_FOLDERMAGIN_BOX (IDM_VIEW + 18)
292+
//#define IDM_VIEW_FOLDERMARGIN (IDM_VIEW + 14)
293+
//#define IDM_VIEW_FOLDERMARGIN_SIMPLE (IDM_VIEW + 15)
294+
//#define IDM_VIEW_FOLDERMARGIN_ARROW (IDM_VIEW + 16)
295+
//#define IDM_VIEW_FOLDERMARGIN_CIRCLE (IDM_VIEW + 17)
296+
//#define IDM_VIEW_FOLDERMARGIN_BOX (IDM_VIEW + 18)
297297
#define IDM_VIEW_ALL_CHARACTERS (IDM_VIEW + 19)
298298
#define IDM_VIEW_INDENT_GUIDE (IDM_VIEW + 20)
299299
//#define IDM_VIEW_CURLINE_HILITING (IDM_VIEW + 21)
@@ -571,7 +571,7 @@
571571
#define IDM_LANG_EXTERNAL_LIMIT (IDM_LANG + 179)
572572

573573
#define IDM_LANG_USER (IDM_LANG + 180) //46180: Used for translation
574-
#define IDM_LANG_USER_LIMIT (IDM_LANG + 210) //46210: Ajust with IDM_LANG_USER
574+
#define IDM_LANG_USER_LIMIT (IDM_LANG + 210) //46210: Adjust with IDM_LANG_USER
575575
#define IDM_LANG_USER_DLG (IDM_LANG + 250) //46250: Used for translation
576576
#define IDM_LANG_OPENUDLDIR (IDM_LANG + 300)
577577
#define IDM_LANG_UDLCOLLECTION_PROJECT_SITE (IDM_LANG + 301)
@@ -595,7 +595,7 @@
595595

596596
#define IDM_SETTING (IDM + 8000)
597597
// #define IDM_SETTING_TAB_SIZE (IDM_SETTING + 1)
598-
// #define IDM_SETTING_TAB_REPLCESPACE (IDM_SETTING + 2)
598+
// #define IDM_SETTING_TAB_REPLACESPACE (IDM_SETTING + 2)
599599
// #define IDM_SETTING_HISTORY_SIZE (IDM_SETTING + 3)
600600
// #define IDM_SETTING_EDGE_SIZE (IDM_SETTING + 4)
601601
#define IDM_SETTING_IMPORTPLUGIN (IDM_SETTING + 5)

0 commit comments

Comments
 (0)