From b0e9dfcfe4b7f9d469c4ade2192ba99fbea1019e Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Thu, 25 Jul 2019 20:42:44 +0200 Subject: [PATCH] + chg: Add extensions to StyleLexXXX.c (complete update) - update Changes.txt --- Build/Changes.txt | 19 ++++++++++--------- src/StyleLexers/styleLexCOFFEESCRIPT.c | 2 +- src/StyleLexers/styleLexCONF.c | 2 +- src/StyleLexers/styleLexCPP.c | 2 +- src/StyleLexers/styleLexHTML.c | 2 +- src/StyleLexers/styleLexJS.c | 2 +- src/StyleLexers/styleLexJSON.c | 2 +- src/StyleLexers/styleLexLUA.c | 2 +- src/StyleLexers/styleLexMAK.c | 2 +- src/StyleLexers/styleLexPAS.c | 2 +- src/StyleLexers/styleLexPL.c | 2 +- src/StyleLexers/styleLexPS.c | 2 +- src/StyleLexers/styleLexPY.c | 2 +- src/StyleLexers/styleLexR.c | 2 +- src/StyleLexers/styleLexRUBY.c | 2 +- src/StyleLexers/styleLexStandard.c | 2 +- src/StyleLexers/styleLexTCL.c | 2 +- src/StyleLexers/styleLexXML.c | 2 +- 18 files changed, 27 insertions(+), 26 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 9dbfa7d17..ff2e96adf 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -30,13 +30,13 @@ UCD - (UCD)ARDET is an Encoding Detector Library ================================================== -Current BETA Version 5.19.724.#(build) (2019-07-24) +Current BETA Version 5.19.725.#(build) (2019-07-25) ================================================== -------------------------------------------------- NEW: -------------------------------------------------- -- Add Web Template Action to context menu +- Add settings for allowed AutoComplete fill-up chars - Advanced TOML Lexer - Multiselect Edit Indicator - Color hover and picker (HTML color def only #RRGGBB) @@ -44,14 +44,12 @@ NEW: -------------------------------------------------- CHANGES: -------------------------------------------------- -- Complete impl. of UTF-8Sig MinPath.ini file handler - Use double-quotes as MRU list string limiter - Keep .ini backward compatibility for moved "Text Files" lexer (from "Default Text") - Update to Oniguruma v.6.9.3 - Scintilla Library (SCI) version 4.2.0 (2019-Jul-5) - To force UTF-8 as preffered encoding: activate encoding detection failure fallback for default encoding - Allow Fixedsys font for GDI rendering -- Support Compiler version (VC v1921) 192127702 - VS2019 v16.1.(0-6) - Color MarkOccurrences refactoring: use System's HighLight color as default (alpha:60) - Oniguruma: support static build - Merge current (v.6.9.2) Oniguruma docs @@ -61,8 +59,9 @@ CHANGES: -------------------------------------------------- ENHANCEMENT: -------------------------------------------------- -- Use UTF-8 for themes files -- Use UTF-8 for .ini-File Handler (Initial Version) +- Complete implementation of UTF-8-Sig MinPath.ini file handler +- Use UTF-8-Sig for themes files +- Use UTF-8-Sig for .ini-File Handler (Initial Version) - Multi-Selection with selection restore on undo - Bookmark margin click - Some multi-selection enhancements @@ -70,6 +69,7 @@ ENHANCEMENT: -------------------------------------------------- FIXES: -------------------------------------------------- +- Send NewLine to sci control, if this id no AutoComplete fill-up char - Obsolete newline after .ini-file sections with comments - Enhanced Unicode detection - Oniguruma allow CRLF as newline token @@ -81,6 +81,7 @@ FIXES: -------------------------------------------------- REMOVED: -------------------------------------------------- +- Disable "NewLine" for AutoComplete fill-up - Remove (old) AHK Lexer in favour of modern AHK_L Lexer -------------------------------------------------- @@ -306,7 +307,7 @@ CHANGES: - Default ini for Notepad3Portable. - Scintilla library to v4.04. - uthash library updated to current GitHub dev. -- Encoding of Notepad3 sources to UTF-8 (Sig). +- Encoding of Notepad3 sources to UTF-8-Sig. - Focus View icon. - Prep Scintilla "Position" value type changes for large file support. - Rebases internally used code page on UTF-8 (Scintilla multi-byte conversions). @@ -885,7 +886,7 @@ Version 3.17.1210.729 (10 December 2017) - New: URL Hotspot (first version). - Changed: [Settings2] section default values (and comment out if not changed) of initially distributed Notepad3.ini - Enhancement: Code Cleanup -- Fix: Edit/Special : URL encoding/decoding for full UTF8 (non ASCII) characters. +- Fix: Edit/Special : URL encoding/decoding for full UTF-8 (non ASCII) characters. - Fix: flashing of Search text-box of find/replace dialog in case of Win7 Classic theme - Fix: Gibberish output if URL decoded again (2nd time). - Fix: URL decoding, if encoding has "%#nnn" formatted ASCII chars. @@ -955,7 +956,7 @@ Version 3.17.1124.690 (24 November 2017) - Fix: Issue regarding find/replace empty-string. - Fix: Adapt DeelX RE interface according to enhanced find/replace dialog. - Fix: Issue #173 - regex/wildcard search: replacement string not used if "Check All Occurrences" is active. -- Fix: Recoding minipath's version.h to UTF-8 (Sig), because it contains codepage dependant copyright sign. +- Fix: Recoding minipath's version.h to UTF-8-Sig, because it contains codepage dependant copyright sign. - Fix: Corrections to .vcproj settings inconsistencies (reported in release build process). - Fix: undo/redo issues (if no selection choosen). - Fix: Consecutive DEL/BACKSP undo/redo broken (wrapped by unconditional selection undo/redo). diff --git a/src/StyleLexers/styleLexCOFFEESCRIPT.c b/src/StyleLexers/styleLexCOFFEESCRIPT.c index 3a4dca5a6..e731c8df1 100644 --- a/src/StyleLexers/styleLexCOFFEESCRIPT.c +++ b/src/StyleLexers/styleLexCOFFEESCRIPT.c @@ -6,7 +6,7 @@ KEYWORDLIST KeyWords_COFFEESCRIPT = EMPTY_KEYWORDLIST; EDITLEXER lexCOFFEESCRIPT = { -SCLEX_COFFEESCRIPT, IDS_LEX_COFFEE_SCR, L"Coffeescript", L"coffee; Cakefile", L"", +SCLEX_COFFEESCRIPT, IDS_LEX_COFFEE_SCR, L"Coffeescript", L"coffee; cakefile", L"", &KeyWords_COFFEESCRIPT, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_COFFEESCRIPT_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexCONF.c b/src/StyleLexers/styleLexCONF.c index 1b7cf2b6d..b1433ca3a 100644 --- a/src/StyleLexers/styleLexCONF.c +++ b/src/StyleLexers/styleLexCONF.c @@ -116,7 +116,7 @@ KEYWORDLIST KeyWords_CONF = { EDITLEXER lexCONF = { -SCLEX_CONF, IDS_LEX_APC_CFG, L"Apache Config Files", L"conf; cfg; cnf; htaccess; properties; prefs; iface; prop; po; te", L"", +SCLEX_CONF, IDS_LEX_APC_CFG, L"Apache Config Files", L"conf; cfg; cnf; htaccess; prefs; iface; prop; po; te", L"", &KeyWords_CONF, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_CONF_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexCPP.c b/src/StyleLexers/styleLexCPP.c index 1c50c9c66..54d75d2d9 100644 --- a/src/StyleLexers/styleLexCPP.c +++ b/src/StyleLexers/styleLexCPP.c @@ -40,7 +40,7 @@ KEYWORDLIST KeyWords_CPP = { }; EDITLEXER lexCPP = { -SCLEX_CPP, IDS_LEX_CPP_SRC, L"C/C++ Source Code", L"c; cpp; cxx; cc; h; hpp; hxx; hh; m; mm; idl; midl; inl; odl; xpm", L"", +SCLEX_CPP, IDS_LEX_CPP_SRC, L"C/C++ Source Code", L"c; cpp; cxx; cc; h; hpp; hxx; hh; mm; idl; midl; inl; odl; xpm; pch", L"", &KeyWords_CPP, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_C_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexHTML.c b/src/StyleLexers/styleLexHTML.c index d9c3d817b..efa58c706 100644 --- a/src/StyleLexers/styleLexHTML.c +++ b/src/StyleLexers/styleLexHTML.c @@ -60,7 +60,7 @@ KEYWORDLIST KeyWords_HTML = { EDITLEXER lexHTML = { -SCLEX_HTML, IDS_LEX_WEB_SRC, L"Web Source Code", L"html; htm; asp; aspx; shtml; htd; xhtml; php; php3; phtml; htt; cfm; tpl; dtd; hta; htc", L"", +SCLEX_HTML, IDS_LEX_WEB_SRC, L"Web Source Code", L"html; htm; asp; aspx; shtml; htd; xhtml; php; php3; phtml; htt; cfm; tpl; dtd; hta; htc; jsp; mht; jd", L"", &KeyWords_HTML, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, { {MULTI_STYLE(SCE_H_TAG,SCE_H_TAGEND,0,0)}, IDS_LEX_STR_63136, L"HTML Tag", L"fore:#648000", L"" }, diff --git a/src/StyleLexers/styleLexJS.c b/src/StyleLexers/styleLexJS.c index 85836f4e1..28d57c9a6 100644 --- a/src/StyleLexers/styleLexJS.c +++ b/src/StyleLexers/styleLexJS.c @@ -12,7 +12,7 @@ KEYWORDLIST KeyWords_JS = { EDITLEXER lexJS = { -SCLEX_CPP, IDS_LEX_J_SCR, L"JavaScript", L"js; jse; jsm; as", L"", +SCLEX_CPP, IDS_LEX_J_SCR, L"JavaScript", L"js; jse; jsm; as; mjs; qs", L"", &KeyWords_JS, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_C_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexJSON.c b/src/StyleLexers/styleLexJSON.c index d8a89c485..40cae394c 100644 --- a/src/StyleLexers/styleLexJSON.c +++ b/src/StyleLexers/styleLexJSON.c @@ -9,7 +9,7 @@ KEYWORDLIST KeyWords_JSON = { EDITLEXER lexJSON = { -SCLEX_JSON, IDS_LEX_JSON, L"JSON", L"json; eslintrc; jshintrc; jsonld", L"", +SCLEX_JSON, IDS_LEX_JSON, L"JSON", L"json; eslintrc; jshintrc; jsonld; har; ipynb; wxcp; arcconfig", L"", &KeyWords_JSON, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_C_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexLUA.c b/src/StyleLexers/styleLexLUA.c index 657b27c2a..6f749d0bc 100644 --- a/src/StyleLexers/styleLexLUA.c +++ b/src/StyleLexers/styleLexLUA.c @@ -32,7 +32,7 @@ KEYWORDLIST KeyWords_LUA = { EDITLEXER lexLUA = { -SCLEX_LUA, IDS_LEX_LUA, L"Lua Script", L"lua", L"", +SCLEX_LUA, IDS_LEX_LUA, L"Lua Script", L"lua; wlua; nse; luadoc; luax", L"", &KeyWords_LUA, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_LUA_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexMAK.c b/src/StyleLexers/styleLexMAK.c index 959d4d477..7771e68ae 100644 --- a/src/StyleLexers/styleLexMAK.c +++ b/src/StyleLexers/styleLexMAK.c @@ -5,7 +5,7 @@ KEYWORDLIST KeyWords_MAK = EMPTY_KEYWORDLIST; EDITLEXER lexMAK = { -SCLEX_MAKEFILE, IDS_LEX_MAKEFILES, L"Makefiles", L"mak; make; mk; dsp; msc; msvc; am; pro; pri; gmk; ninja", L"", +SCLEX_MAKEFILE, IDS_LEX_MAKEFILES, L"Makefiles", L"mak; make; mk; dsp; msc; msvc; am; pro; pri; gmk; ninja; dsw", L"", &KeyWords_MAK, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_MAKE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexPAS.c b/src/StyleLexers/styleLexPAS.c index 1ee0dab48..40a528c87 100644 --- a/src/StyleLexers/styleLexPAS.c +++ b/src/StyleLexers/styleLexPAS.c @@ -13,7 +13,7 @@ KEYWORDLIST KeyWords_PAS = { EDITLEXER lexPAS = { -SCLEX_PASCAL, IDS_LEX_PASCAL_SRC, L"Pascal Source Code", L"pas; dpr; dpk; dfm; inc; pp", L"", +SCLEX_PASCAL, IDS_LEX_PASCAL_SRC, L"Pascal Source Code", L"pas; dpr; dpk; dfm; pp; lfm; lpr; fpd", L"", &KeyWords_PAS, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_PAS_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexPL.c b/src/StyleLexers/styleLexPL.c index dcac35afc..6f5454766 100644 --- a/src/StyleLexers/styleLexPL.c +++ b/src/StyleLexers/styleLexPL.c @@ -27,7 +27,7 @@ KEYWORDLIST KeyWords_PL = { EDITLEXER lexPL = { -SCLEX_PERL, IDS_LEX_PERL_SCR, L"Perl Script", L"pl; pm; cgi; pod", L"", +SCLEX_PERL, IDS_LEX_PERL_SCR, L"Perl Script", L"pl; pm; cgi; pod; plx; stp", L"", &KeyWords_PL, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_PL_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexPS.c b/src/StyleLexers/styleLexPS.c index 273b28719..8e95be257 100644 --- a/src/StyleLexers/styleLexPS.c +++ b/src/StyleLexers/styleLexPS.c @@ -59,7 +59,7 @@ KEYWORDLIST KeyWords_PS = { EDITLEXER lexPS = { -SCLEX_POWERSHELL, IDS_LEX_PWRSHELL, L"PowerShell Script", L"ps1; psd1; psm1", L"", +SCLEX_POWERSHELL, IDS_LEX_PWRSHELL, L"PowerShell Script", L"ps1; psd1; psm1; psc1", L"", &KeyWords_PS, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_POWERSHELL_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexPY.c b/src/StyleLexers/styleLexPY.c index fb7590cc1..7e44cae74 100644 --- a/src/StyleLexers/styleLexPY.c +++ b/src/StyleLexers/styleLexPY.c @@ -10,7 +10,7 @@ KEYWORDLIST KeyWords_PY = { EDITLEXER lexPY = { -SCLEX_PYTHON, IDS_LEX_PYTHON, L"Python Script", L"py; pyw", L"", +SCLEX_PYTHON, IDS_LEX_PYTHON, L"Python Script", L"py; pyw; pyx; pxd; pxi; boo; empy; cobra; gs", L"", &KeyWords_PY, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_P_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexR.c b/src/StyleLexers/styleLexR.c index a24832d4b..78972650d 100644 --- a/src/StyleLexers/styleLexR.c +++ b/src/StyleLexers/styleLexR.c @@ -79,7 +79,7 @@ KEYWORDLIST KeyWords_R = { EDITLEXER lexR = { -SCLEX_R, IDS_LEX_R_STAT, L"R-S-SPlus Statistics Code", L"R", L"", +SCLEX_R, IDS_LEX_R_STAT, L"R-S-SPlus Statistics Code", L"r, rdata, rds, rda", L"", &KeyWords_R,{ { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_R_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexRUBY.c b/src/StyleLexers/styleLexRUBY.c index d31dc04f2..f8ee31d15 100644 --- a/src/StyleLexers/styleLexRUBY.c +++ b/src/StyleLexers/styleLexRUBY.c @@ -9,7 +9,7 @@ KEYWORDLIST KeyWords_RUBY = { "", "", "", "", "", "", "", "" }; EDITLEXER lexRUBY = { -SCLEX_RUBY, IDS_LEX_RUBY, L"Ruby Script", L"rb; ruby; rbw; rake; rjs; Rakefile; gemspec", L"", +SCLEX_RUBY, IDS_LEX_RUBY, L"Ruby Script", L"rb; ruby; rbw; rake; rjs; rakefile; gemspec; podspec", L"", &KeyWords_RUBY, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_RB_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexStandard.c b/src/StyleLexers/styleLexStandard.c index b4fd612d2..b999f1626 100644 --- a/src/StyleLexers/styleLexStandard.c +++ b/src/StyleLexers/styleLexStandard.c @@ -71,7 +71,7 @@ SCLEX_NULL, IDS_LEX_ANSI_ART, L"ANSI Art", L"nfo; diz", L"", EDITLEXER lexLATEX = { -SCLEX_LATEX, IDS_LEX_LATEX, L"LaTeX Files", L"tex; latex; sty", L"", +SCLEX_LATEX, IDS_LEX_LATEX, L"LaTeX Files", L"tex; latex; sty; texi; texinfo; txi", L"", &KeyWords_NULL, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_L_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexTCL.c b/src/StyleLexers/styleLexTCL.c index 520e41096..79ae6f8d1 100644 --- a/src/StyleLexers/styleLexTCL.c +++ b/src/StyleLexers/styleLexTCL.c @@ -33,7 +33,7 @@ KEYWORDLIST KeyWords_TCL = { EDITLEXER lexTCL = { -SCLEX_TCL, IDS_LEX_TCL, L"Tcl Script", L"tcl; itcl", L"", +SCLEX_TCL, IDS_LEX_TCL, L"Tcl Script", L"tcl; itcl; tm", L"", &KeyWords_TCL, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_TCL_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexXML.c b/src/StyleLexers/styleLexXML.c index 7501e3438..f623df4ee 100644 --- a/src/StyleLexers/styleLexXML.c +++ b/src/StyleLexers/styleLexXML.c @@ -6,7 +6,7 @@ KEYWORDLIST KeyWords_XML = EMPTY_KEYWORDLIST; EDITLEXER lexXML = { -SCLEX_XML, IDS_LEX_XML_DOC, L"XML Document", L"xml; xsl; rss; svg; xul; xsd; xslt; axl; rdf; xaml; vcproj; ffs_gui; nzb", L"", +SCLEX_XML, IDS_LEX_XML_DOC, L"XML Document", L"xml; xsl; rss; svg; xul; xsd; xslt; axl; rdf; xaml; vcproj; ffs_gui; nzb; resx; plist; xrc; fbp", L"", &KeyWords_XML, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, { {MULTI_STYLE(SCE_H_TAG,SCE_H_TAGUNKNOWN,SCE_H_TAGEND,0)}, IDS_LEX_STR_63187, L"XML Tag", L"fore:#881280", L"" },