diff --git a/PowerEditor/installer/themes/Bespin.xml b/PowerEditor/installer/themes/Bespin.xml index a4894ffd46e8..317c6a224547 100644 --- a/PowerEditor/installer/themes/Bespin.xml +++ b/PowerEditor/installer/themes/Bespin.xml @@ -596,6 +596,23 @@ Credits: + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Black board.xml b/PowerEditor/installer/themes/Black board.xml index 19b384edd0ce..5c3b781f0274 100644 --- a/PowerEditor/installer/themes/Black board.xml +++ b/PowerEditor/installer/themes/Black board.xml @@ -594,6 +594,23 @@ Credits: + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Choco.xml b/PowerEditor/installer/themes/Choco.xml index d5f7862ea3de..008353aa8389 100644 --- a/PowerEditor/installer/themes/Choco.xml +++ b/PowerEditor/installer/themes/Choco.xml @@ -586,6 +586,23 @@ Credits: + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/DansLeRuSH-Dark.xml b/PowerEditor/installer/themes/DansLeRuSH-Dark.xml index d154811a4705..25b2b4d5726d 100644 --- a/PowerEditor/installer/themes/DansLeRuSH-Dark.xml +++ b/PowerEditor/installer/themes/DansLeRuSH-Dark.xml @@ -983,6 +983,23 @@ Installation : Copy this file to "%APPDATA%\Notepad++\themes" and in a portable + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/DarkModeDefault.xml b/PowerEditor/installer/themes/DarkModeDefault.xml index 84b3847bf79e..2be0e48570a5 100644 --- a/PowerEditor/installer/themes/DarkModeDefault.xml +++ b/PowerEditor/installer/themes/DarkModeDefault.xml @@ -1519,6 +1519,23 @@ License: GPL2 + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Deep Black.xml b/PowerEditor/installer/themes/Deep Black.xml index e1c9431c104f..ccb9bcbbf093 100644 --- a/PowerEditor/installer/themes/Deep Black.xml +++ b/PowerEditor/installer/themes/Deep Black.xml @@ -568,6 +568,23 @@ https://notepad-plus-plus.org/donate/ + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Hello Kitty.xml b/PowerEditor/installer/themes/Hello Kitty.xml index df7d2ebe736d..e7af7c2a9adf 100644 --- a/PowerEditor/installer/themes/Hello Kitty.xml +++ b/PowerEditor/installer/themes/Hello Kitty.xml @@ -841,6 +841,23 @@ so your enhanced file can be included in Notepad++ future release. + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/HotFudgeSundae.xml b/PowerEditor/installer/themes/HotFudgeSundae.xml index 1523ccc1dc8b..bf6a1dc0a493 100644 --- a/PowerEditor/installer/themes/HotFudgeSundae.xml +++ b/PowerEditor/installer/themes/HotFudgeSundae.xml @@ -1006,6 +1006,23 @@ Installation: if else for while bool long int char + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Mono Industrial.xml b/PowerEditor/installer/themes/Mono Industrial.xml index 86e524d14bca..6d27abeac2c5 100644 --- a/PowerEditor/installer/themes/Mono Industrial.xml +++ b/PowerEditor/installer/themes/Mono Industrial.xml @@ -590,6 +590,23 @@ Credits: + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Monokai.xml b/PowerEditor/installer/themes/Monokai.xml index 0ef1fb4b143a..5f4f8c9fcd5a 100644 --- a/PowerEditor/installer/themes/Monokai.xml +++ b/PowerEditor/installer/themes/Monokai.xml @@ -590,6 +590,23 @@ Credits: + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/MossyLawn.xml b/PowerEditor/installer/themes/MossyLawn.xml index a6840b4110c8..e0b12f2a8452 100644 --- a/PowerEditor/installer/themes/MossyLawn.xml +++ b/PowerEditor/installer/themes/MossyLawn.xml @@ -1006,6 +1006,23 @@ Installation: + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Navajo.xml b/PowerEditor/installer/themes/Navajo.xml index 94f575a5ff3e..5355e4f9e494 100644 --- a/PowerEditor/installer/themes/Navajo.xml +++ b/PowerEditor/installer/themes/Navajo.xml @@ -1003,6 +1003,23 @@ Installation: + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Obsidian.xml b/PowerEditor/installer/themes/Obsidian.xml index 10bde97ee1ca..5c5886e83b42 100644 --- a/PowerEditor/installer/themes/Obsidian.xml +++ b/PowerEditor/installer/themes/Obsidian.xml @@ -856,6 +856,23 @@ Notepad++ Custom Style + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Plastic Code Wrap.xml b/PowerEditor/installer/themes/Plastic Code Wrap.xml index d2d61c1d407b..ab5a73436103 100644 --- a/PowerEditor/installer/themes/Plastic Code Wrap.xml +++ b/PowerEditor/installer/themes/Plastic Code Wrap.xml @@ -602,6 +602,23 @@ Credits: + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Ruby Blue.xml b/PowerEditor/installer/themes/Ruby Blue.xml index 03290b2ab2c6..22fe337ed7fa 100644 --- a/PowerEditor/installer/themes/Ruby Blue.xml +++ b/PowerEditor/installer/themes/Ruby Blue.xml @@ -585,6 +585,23 @@ http://sourceforge.net/donate/index.php?group_id=95717 + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Solarized-light.xml b/PowerEditor/installer/themes/Solarized-light.xml index 74488d18d9b7..3f19c4e4755f 100644 --- a/PowerEditor/installer/themes/Solarized-light.xml +++ b/PowerEditor/installer/themes/Solarized-light.xml @@ -1014,6 +1014,23 @@ Installation: + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Solarized.xml b/PowerEditor/installer/themes/Solarized.xml index 1556b79a7109..c156071aabb8 100644 --- a/PowerEditor/installer/themes/Solarized.xml +++ b/PowerEditor/installer/themes/Solarized.xml @@ -1376,6 +1376,23 @@ Installation: + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Twilight.xml b/PowerEditor/installer/themes/Twilight.xml index 349c5c2a82c6..ee5e39200568 100644 --- a/PowerEditor/installer/themes/Twilight.xml +++ b/PowerEditor/installer/themes/Twilight.xml @@ -591,6 +591,23 @@ Credits: + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Vibrant Ink.xml b/PowerEditor/installer/themes/Vibrant Ink.xml index bc0161bef93c..1fdb8ef502bf 100644 --- a/PowerEditor/installer/themes/Vibrant Ink.xml +++ b/PowerEditor/installer/themes/Vibrant Ink.xml @@ -566,6 +566,23 @@ http://sourceforge.net/donate/index.php?group_id=95717 + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Zenburn.xml b/PowerEditor/installer/themes/Zenburn.xml index 4e1b771f9e6f..a44c357bf21d 100644 --- a/PowerEditor/installer/themes/Zenburn.xml +++ b/PowerEditor/installer/themes/Zenburn.xml @@ -1487,6 +1487,23 @@ License: GPL2 + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/khaki.xml b/PowerEditor/installer/themes/khaki.xml index 4db06a19bfbe..13a64f83a747 100644 --- a/PowerEditor/installer/themes/khaki.xml +++ b/PowerEditor/installer/themes/khaki.xml @@ -1003,6 +1003,23 @@ Installation: + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/vim Dark Blue.xml b/PowerEditor/installer/themes/vim Dark Blue.xml index 523d62e6636e..dd45e715f9a4 100644 --- a/PowerEditor/installer/themes/vim Dark Blue.xml +++ b/PowerEditor/installer/themes/vim Dark Blue.xml @@ -832,6 +832,23 @@ + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h index d94f642765c2..97b77dbb7689 100644 --- a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h +++ b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h @@ -39,7 +39,7 @@ enum LangType {L_TEXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\ L_MMIXAL, L_NIM, L_NNCRONTAB, L_OSCRIPT, L_REBOL, \ L_REGISTRY, L_RUST, L_SPICE, L_TXT2TAGS, L_VISUALPROLOG,\ L_TYPESCRIPT, L_JSON5, L_MSSQL, L_GDSCRIPT, L_HOLLYWOOD,\ - L_GOLANG, L_RAKU,\ + L_GOLANG, L_RAKU, L_TOML,\ // Don't use L_JS, use L_JAVASCRIPT instead // The end of enumated language type, so it should be always at the end L_EXTERNAL}; diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index f668d33696cd..e4247796c746 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -4058,6 +4058,8 @@ LangType Notepad_plus::menuID2LangType(int cmdID) return L_GOLANG; case IDM_LANG_RAKU: return L_RAKU; + case IDM_LANG_TOML: + return L_TOML; case IDM_LANG_USER: return L_USER; default: diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index bb48bd5c2335..6fa7c696d205 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -1041,6 +1041,7 @@ BEGIN MENUITEM "TCL", IDM_LANG_TCL MENUITEM "Tektronix extended HEX", IDM_LANG_TEHEX MENUITEM "TeX", IDM_LANG_TEX + MENUITEM "TOML", IDM_LANG_TOML MENUITEM "txt2tags", IDM_LANG_TXT2TAGS MENUITEM "TypeScript", IDM_LANG_TYPESCRIPT MENUITEM "Verilog", IDM_LANG_VERILOG @@ -1193,6 +1194,7 @@ BEGIN MENUITEM "TCL", IDM_LANG_TCL MENUITEM "Tektronix extended HEX",IDM_LANG_TEHEX MENUITEM "TeX", IDM_LANG_TEX + MENUITEM "TOML", IDM_LANG_TOML MENUITEM "txt2tags", IDM_LANG_TXT2TAGS MENUITEM "TypeScript", IDM_LANG_TYPESCRIPT END diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp index b0012f473ff4..5edf7cd1c83f 100644 --- a/PowerEditor/src/NppCommands.cpp +++ b/PowerEditor/src/NppCommands.cpp @@ -3845,6 +3845,7 @@ void Notepad_plus::command(int id) case IDM_LANG_HOLLYWOOD: case IDM_LANG_GOLANG: case IDM_LANG_RAKU: + case IDM_LANG_TOML: case IDM_LANG_USER : { setLanguage(menuID2LangType(id)); diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index ba58025f4e8d..20603100df97 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -8266,6 +8266,9 @@ int NppParameters::langTypeToCommandID(LangType lt) const case L_RAKU: id = IDM_LANG_RAKU; break; + + case L_TOML: + id = IDM_LANG_TOML; break; case L_SEARCHRESULT : id = -1; break; diff --git a/PowerEditor/src/ScintillaComponent/Buffer.cpp b/PowerEditor/src/ScintillaComponent/Buffer.cpp index dbd163289008..e3fee87d7fb8 100644 --- a/PowerEditor/src/ScintillaComponent/Buffer.cpp +++ b/PowerEditor/src/ScintillaComponent/Buffer.cpp @@ -134,7 +134,7 @@ void Buffer::setLangType(LangType lang, const wchar_t* userLangName) _userLangExt = userLangName; _needLexer = true; //change of lang means lexern needs updating - doNotify(BufferChangeLanguage|BufferChangeLexing); + doNotify(BufferChangeLanguage | BufferChangeLexing); } diff --git a/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp index c51c8a64ee98..36e2e3616d4f 100644 --- a/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp @@ -161,6 +161,7 @@ LanguageNameInfo ScintillaEditView::_langNameInfoArray[L_EXTERNAL + 1] = { {L"hollywood", L"Hollywood", L"Hollywood script", L_HOLLYWOOD, "hollywood"}, {L"go", L"Go", L"Go source file", L_GOLANG, "cpp"}, {L"raku", L"Raku", L"Raku source file", L_RAKU, "raku"}, + {L"toml", L"TOML", L"Tom's Obvious Minimal Language file", L_TOML, "toml"}, {L"ext", L"External", L"External", L_EXTERNAL, "null"} }; @@ -2063,6 +2064,9 @@ void ScintillaEditView::defineDocType(LangType typeDoc) case L_RAKU: setRakuLexer(); break; + case L_TOML: + setTomlLexer(); break; + case L_TEXT : default : if (typeDoc >= L_EXTERNAL && typeDoc < NppParameters::getInstance().L_END) diff --git a/PowerEditor/src/ScintillaComponent/ScintillaEditView.h b/PowerEditor/src/ScintillaComponent/ScintillaEditView.h index 30d00431a43a..b1326ff909e5 100644 --- a/PowerEditor/src/ScintillaComponent/ScintillaEditView.h +++ b/PowerEditor/src/ScintillaComponent/ScintillaEditView.h @@ -1252,6 +1252,10 @@ friend class Finder; execute(SCI_SETPROPERTY, reinterpret_cast("fold.raku.comment.pod"), reinterpret_cast("1")); }; + void setTomlLexer(){ + setLexer(L_TOML, LIST_0); + }; + //-------------------- void setSearchResultLexer() { diff --git a/PowerEditor/src/langs.model.xml b/PowerEditor/src/langs.model.xml index 61f06099794f..f5d0f7f8cd1b 100644 --- a/PowerEditor/src/langs.model.xml +++ b/PowerEditor/src/langs.model.xml @@ -565,6 +565,9 @@ + + false inf nan true + addhandler addressof aggregate alias and andalso ansi as assembly async attribute auto await begin binary boolean by byref byte byval call case catch cbool cbyte cchar ccur cdate cdbl cdec char cint class clng clnglng clngptr cobj compare const continue csbyte cshort csng cstr ctype cuint culng currency cushort custom cvar date decimal declare default defbool defbyte defcur defdate defdbl defdec defint deflng deflnglng deflngptr defobj defsng defstr defvar delegate dim directcast distinct do double each else elseif end endif enum equals erase error event exit explicit false finally for friend from function get gettype global gosub goto group handles if implement implements imports in inherits integer interface into is isfalse isnot istrue iterator join key let lib like load long longlong longptr loop lset me mid mod module mustinherit mustoverride mybase myclass namespace narrowing new next not nothing notinheritable notoverridable object of off on operator option optional or order orelse out overloads overridable overrides paramarray partial preserve private property protected ptrsafe public raiseevent readonly redim rem removehandler resume return rset sbyte select set shadows shared short single skip static step stop strict string structure sub synclock take text then throw to true try trycast type typeof uinteger ulong unicode unload until ushort using variant vbarray vbboolean vbbyte vbcurrency vbdataobject vbdate vbdecimal vbdouble vbempty vberror vbinteger vblong vblonglong vbnull vbobject vbsingle vbuserdefinedtype vbvariant wend when where while widening with withevents writeonly xor yield diff --git a/PowerEditor/src/menuCmdID.h b/PowerEditor/src/menuCmdID.h index 6895bc209352..ffe43b6e17c0 100644 --- a/PowerEditor/src/menuCmdID.h +++ b/PowerEditor/src/menuCmdID.h @@ -561,6 +561,7 @@ #define IDM_LANG_HOLLYWOOD (IDM_LANG + 88) #define IDM_LANG_GOLANG (IDM_LANG + 89) #define IDM_LANG_RAKU (IDM_LANG + 90) + #define IDM_LANG_TOML (IDM_LANG + 91) #define IDM_LANG_EXTERNAL (IDM_LANG + 165) #define IDM_LANG_EXTERNAL_LIMIT (IDM_LANG + 179) diff --git a/PowerEditor/src/stylers.model.xml b/PowerEditor/src/stylers.model.xml index fa892f4dd050..1e5dd4cb6093 100644 --- a/PowerEditor/src/stylers.model.xml +++ b/PowerEditor/src/stylers.model.xml @@ -542,6 +542,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -837,10 +864,10 @@ - - - - + + + + @@ -1012,47 +1039,47 @@ - - carp croak - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + carp croak + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1187,36 +1214,36 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + @@ -1495,6 +1522,23 @@ + + + + + + + + + + + + + + + + + @@ -1550,33 +1594,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -