Scintilla 5.5.3.

zufuliu · Oct 20, 2024 · 3c10615 · 3c10615
1 parent 3b8770d
commit 3c10615
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 64 deletions.
diff --git a/scintilla/lexlib/CharacterCategory.cxx b/scintilla/lexlib/CharacterCategory.cxx
@@ -22,7 +22,7 @@ namespace {
 
 #define CharacterCategoryUseRangeList 0
 //++Autogenerated -- start of section automatically generated
-// Created with Python 3.13.0a1, Unicode 15.1.0
+// Created with Python 3.13.0, Unicode 15.1.0
 #if CharacterCategoryUseRangeList
 const int catRanges[] = {
 };

diff --git a/scintilla/scripts/GenerateCharacterCategory.py b/scintilla/scripts/GenerateCharacterCategory.py
@@ -302,7 +302,7 @@ def buildANSICharClassifyTable(filename):
 	return ANSICharClassifyTable + {result[874]['offset']};
 }}
 *length = 0;
-return NULL;
+return nullptr;
 """.splitlines()
 	output.extend('\t' + line for line in lines)
 	output.append("}")

diff --git a/scintilla/src/CharClassify.cxx b/scintilla/src/CharClassify.cxx
@@ -191,7 +191,7 @@ void ExpandSkipBlock(const IndexType (&indexList)[IndexSize], const ValueType (&
 }
 
 //++Autogenerated -- start of section automatically generated
-// Created with Python 3.13.0a1, Unicode 15.1.0
+// Created with Python 3.13.0, Unicode 15.1.0
 const uint16_t CharClassifyRLE_BMP[] = {
 264, 122, 83, 58, 211, 50, 211, 34, 272, 74, 11, 18, 8, 34, 19, 10, 11, 26, 19, 10,
 27, 10, 187, 10, 251, 10, 3667, 34, 99, 114, 43, 58, 11, 10, 11, 138, 939, 10, 19, 16,
@@ -697,7 +697,7 @@ void CharClassify::InitUnicodeData() noexcept {
 namespace {
 
 //dbcs++Autogenerated -- start of section automatically generated
-// Created with Python 3.13.0a1, Unicode 15.1.0
+// Created with Python 3.13.0, Unicode 15.1.0
 const uint16_t CharClassifyRLE_CP932[] = {
 264, 122, 83, 58, 211, 50, 211, 34, 264, 12, 42, 468, 232, 28, 65528, 65528, 65528, 65528, 552, 138,
 36, 10, 44, 282, 8, 394, 60, 450, 11, 98, 536, 122, 83, 58, 211, 10, 19, 10, 11, 8,

diff --git a/scintilla/src/CharClassify.h b/scintilla/src/CharClassify.h
@@ -95,7 +95,7 @@ class CharClassify {
 	static void InitUnicodeData() noexcept;
 
 //++Autogenerated -- start of section automatically generated
-// Created with Python 3.13.0a1, Unicode 15.1.0
+// Created with Python 3.13.0, Unicode 15.1.0
 	static CharacterClass ClassifyCharacter(uint32_t ch) noexcept {
 		if (ch < sizeof(classifyMap)) {
 			return static_cast<CharacterClass>(classifyMap[ch]);

diff --git a/scintilla/src/Document.cxx b/scintilla/src/Document.cxx
@@ -143,29 +143,6 @@ CharacterExtracted::CharacterExtracted(const unsigned char *charBytes, size_t wi
 Document::Document(DocumentOption options) :
 	cb(!FlagSet(options, DocumentOption::StylesNone), FlagSet(options, DocumentOption::TextLarge)),
 	durationStyleOneUnit(1e-6) {
-	refCount = 0;
-#ifdef _WIN32
-	eolMode = EndOfLine::CrLf;
-#else
-	eolMode = EndOfLine::Lf;
-#endif
-	dbcsCodePage = CpUtf8;
-	lineEndBitSet = LineEndType::Default;
-	endStyled = 0;
-	styleClock = 0;
-	enteredModification = 0;
-	enteredStyling = 0;
-	enteredReadOnlyCount = 0;
-	matchesValid = false;
-	insertionSet = false;
-	tabInChars = 8;
-	indentInChars = 0;
-	actualIndentInChars = 8;
-	useTabs = true;
-	tabIndents = true;
-	forwardSafeChar = 0x80;
-	backwardSafeChar = 0x80;
-	backspaceUnindents = false;
 
 	perLineData[ldMarkers] = std::make_unique<LineMarkers>();
 	perLineData[ldLevels] = std::make_unique<LineLevels>();

diff --git a/scintilla/src/Document.h b/scintilla/src/Document.h
@@ -275,22 +275,21 @@ class Document : PerLine, public Scintilla::IDocument, public Scintilla::ILoader
 	};
 
 private:
-	int refCount;
+	int refCount = 0;
 	CellBuffer cb;
 	CharClassify charClass;
 #if 0
 	CharacterCategoryMap charMap;
 #endif
 	std::unique_ptr<CaseFolder> pcf;
-	Sci::Position endStyled;
-	int styleClock;
-	int enteredModification;
-	int enteredStyling;
-	int enteredReadOnlyCount;
+	Sci::Position endStyled = 0;
+	int styleClock = 0;
+	int enteredModification = 0;
+	int enteredStyling = 0;
+	int enteredReadOnlyCount = 0;
 
 	std::optional<bool> delaySavePoint;
-	bool matchesValid;
-	bool insertionSet;
+	bool insertionSet = false;
 	std::string insertion;
 
 	std::vector<WatcherWithUserData> watchers;
@@ -313,18 +312,18 @@ class Document : PerLine, public Scintilla::IDocument, public Scintilla::ILoader
 
 public:
 
-	Scintilla::EndOfLine eolMode;
+	Scintilla::EndOfLine eolMode = Scintilla::EndOfLine::CrLf;
 	/// Can also be SC_CP_UTF8 to enable UTF-8 mode
-	int dbcsCodePage;
-	Scintilla::LineEndType lineEndBitSet;
-	int tabInChars;
-	int indentInChars;
-	int actualIndentInChars;
-	bool useTabs;
-	bool tabIndents;
-	uint8_t forwardSafeChar;
-	uint8_t backwardSafeChar;
-	uint8_t backspaceUnindents;
+	int dbcsCodePage = Scintilla::CpUtf8;
+	Scintilla::LineEndType lineEndBitSet = Scintilla::LineEndType::Default;
+	int tabInChars = 8;
+	int indentInChars = 0;
+	int actualIndentInChars = 8;
+	bool useTabs = true;
+	bool tabIndents = true;
+	uint8_t forwardSafeChar = 0x80;
+	uint8_t backwardSafeChar = 0x80;
+	uint8_t backspaceUnindents = false;
 	ActionDuration durationStyleOneUnit;
 
 	std::unique_ptr<IDecorationList> decorations;

diff --git a/scintilla/src/PositionCache.cxx b/scintilla/src/PositionCache.cxx
@@ -353,7 +353,7 @@ enum class WrapBreak {
 
 constexpr uint8_t ASCIIWrapBreakTable[128] = {
 //++Autogenerated -- start of section automatically generated
-// Created with Python 3.13.0a1, Unicode 15.1.0
+// Created with Python 3.13.0, Unicode 15.1.0
 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
 2, 2, 0, 1, 1, 2, 2, 0, 1, 2, 2, 1, 2, 2, 2, 2,

diff --git a/scintilla/src/ViewStyle.cxx b/scintilla/src/ViewStyle.cxx
@@ -111,6 +111,7 @@ ViewStyle::ViewStyle(size_t stylesSize_):
 	constexpr ColourRGBA modified(0xFF, 0x80, 0x0);
 	// Reverted to change
 	constexpr ColourRGBA revertedToChange(0xA0, 0xC0, 0x0);
+	const ColourRGBA chrome = Platform::Chrome();
 
 	// Edition indicators
 	constexpr size_t indexHistory = static_cast<size_t>(IndicatorNumbers::HistoryRevertedToOriginInsertion);
@@ -140,7 +141,7 @@ ViewStyle::ViewStyle(size_t stylesSize_):
 	markers[indexHistorySaved].markType = MarkerSymbol::Bar;
 	// Modified
 	constexpr size_t indexHistoryModified = static_cast<size_t>(MarkerOutline::HistoryModified);
-	markers[indexHistoryModified].back = Platform::Chrome();
+	markers[indexHistoryModified].back = chrome;
 	markers[indexHistoryModified].fore = modified;
 	markers[indexHistoryModified].markType = MarkerSymbol::Bar;
 	// Reverted to change
@@ -184,10 +185,10 @@ ViewStyle::ViewStyle(size_t stylesSize_):
 
 	controlCharSymbol = 0;	/* Draw the control characters */
 	controlCharWidth = 0;
-	selbar = Platform::Chrome();
+	selbar = chrome;
 	selbarlight = Platform::ChromeHighlight();
 	styles[StyleLineNumber].fore = black;
-	styles[StyleLineNumber].back = Platform::Chrome();
+	styles[StyleLineNumber].back = chrome;
 
 	hotspotUnderline = true;
 	marginInside = true;

diff --git a/src/EditEncoding.cpp b/src/EditEncoding.cpp
@@ -365,7 +365,7 @@ static NP2EncodingGroup sEncodingGroupList[] = {
 
 // see buildANSICharClassifyTable() in scintilla/scripts/GenerateCharacterCategory.py
 //++Autogenerated -- start of section automatically generated
-// Created with Python 3.13.0a1, Unicode 15.1.0
+// Created with Python 3.13.0, Unicode 15.1.0
 static const uint8_t ANSICharClassifyTable[] = {
 // Central European (Windows-1250)
 0x22, 0xAA, 0xB8, 0xFF, 0xA8, 0xAA, 0xB8, 0xFF, 0xEC, 0xAE, 0xBA, 0xE2, 0xEA, 0xAE, 0xBE, 0xFB,
@@ -2460,7 +2460,7 @@ int EditDetermineEncoding(LPCWSTR pszFile, char *lpData, DWORD cbData, int *enco
 
 // see updateCaseSensitivityBlock() in scintilla/scripts/GenerateCaseConvert.py
 //case++Autogenerated -- start of section automatically generated
-// Created with Python 3.13.0a1, Unicode 15.1.0
+// Created with Python 3.13.0, Unicode 15.1.0
 #define kUnicodeCaseSensitiveFirst	0x0600U
 #define kUnicodeCaseSensitiveMax	0x1e943U
 

diff --git a/src/EditLexers/stlDefault.cpp b/src/EditLexers/stlDefault.cpp
@@ -17,14 +17,14 @@ static EDITSTYLE Styles_Global[] = {
 	{ SC_ELEMENT_WHITE_SPACE, NP2StyleX_Whitespace, L"size:2; fore:#FF4000; alpha:65" },
 	{ SC_ELEMENT_CARET_LINE_BACK, NP2StyleX_CurrentLine, L"size:2; fore:#C2C0C3; back:#FFFF00; alpha:90; outline:90" },
 	{ SC_ELEMENT_CARET, NP2StyleX_Caret, L"back:#FF0000" },
-	{ 0, NP2StyleX_IMEIndicator, L"fore:#108010" },
+	{ INDICATOR_IME, NP2StyleX_IMEIndicator, L"fore:#108010" },
 	{ SCI_SETEDGECOLOUR, NP2StyleX_LongLineMarker, L"fore:#FFC000" },
 	{ SCI_SETEXTRAASCENT + SCI_SETEXTRADESCENT, NP2StyleX_ExtraLineSpacing, L"size:2" },
 	{ 0, NP2StyleX_CodeFolding, L"" },
-	{ 0, NP2StyleX_FoldingMarker, L"fore:#8080FF; back:#ADD8E6" },
+	{ SC_MARKNUM_FOLDER, NP2StyleX_FoldingMarker, L"fore:#8080FF; back:#ADD8E6" },
 	{ STYLE_FOLDDISPLAYTEXT, NP2StyleX_FoldEllipsis, L"font:$(Code); size:-2; bold; fore:#808080" },
 	{ 0, NP2StyleX_MarkOccurrences, L"alpha:25; outline:150" },
-	{ 0, NP2StyleX_Bookmark, L"fore:#408040; back:#00FF00; alpha:40" },
+	{ SC_MARK_VERTICALBOOKMARK, NP2StyleX_Bookmark, L"fore:#408040; back:#00FF00; alpha:40" },
 	{ SC_MARKNUM_HISTORY_SAVED + SC_MARKNUM_HISTORY_MODIFIED, NP2StyleX_ChangeHistoryMarker, L"fore:#008000; back:#0080FF" },
 	{ STYLE_CALLTIP, NP2StyleX_CallTip, L"" },
 	{ STYLE_LINK, NP2StyleX_Link, L"fore:#648000" },

diff --git a/src/Version.h b/src/Version.h
@@ -37,7 +37,7 @@
 #define HELP_LINK_FEATURE_REQUEST	L"https://github.com/zufuliu/notepad4/issues"
 #define HELP_LINK_ONLINE_WIKI		L"https://github.com/zufuliu/notepad4/wiki"
 
-#define VERSION_BUILD_INFO_LIB		L",\nScintilla 5.5.2."
+#define VERSION_BUILD_INFO_LIB		L",\nScintilla 5.5.3."
 #define VERSION_BUILD_INFO_FORMAT	L"Compiled on " __DATE__ L" with %s %d.%d.%d" VERSION_BUILD_INFO_LIB
 #if defined(__INTEL_LLVM_COMPILER)
 #define VERSION_BUILD_TOOL_NAME		L"Intel oneAPI"

diff --git a/version.txt b/version.txt
@@ -4,18 +4,18 @@ git clone https://github.com/XhmikosR/notepad2-mod.git
 
 Scintilla (upstream)
 hg clone http://hg.code.sf.net/p/scintilla/code scintilla
-5.5.2
-2024-09-02 9583:b185609d02e2
+5.5.3
+2024-10-19 9595:71d4ce5533b4
 
 Lexilla (upstream)
 git clone https://github.com/ScintillaOrg/lexilla.git
-5.4.0
-2024-09-15 ff40f9889d00bdc0acc06550fc6015bc6351f239
+5.4.1
+2024-10-19 1498fb254376a1be3bc4e3433f45cbd97c86b214
 
 SciTE (upstream)
 hg clone http://hg.code.sf.net/p/scintilla/scite
-5.5.2
-2024-09-06 6340:2b1b1f5b0fa8
+5.5.3
+2024-10-19 6354:c1fb7359e0cf
 
 Boost regex 7.0.1
 1.86 https://github.com/boostorg/regex

diff --git a/wiki b/wiki