Update Scintilla to v3.3.6 [da3cbb]

5 files changed, 60 insertions, 18 deletions

diff --git a/scintilla/include/ILexer.h b/scintilla/include/ILexer.h
index 5b6ed6f..b859cfd 100644
--- a/scintilla/include/ILexer.h
+++ b/scintilla/include/ILexer.h
@@ -75,6 +75,8 @@ public:
 	virtual int SCI_METHOD AllocateSubStyles(int styleBase, int numberStyles) = 0;

 	virtual int SCI_METHOD SubStylesStart(int styleBase) = 0;

 	virtual int SCI_METHOD SubStylesLength(int styleBase) = 0;

+	virtual int SCI_METHOD StyleFromSubStyle(int subStyle) = 0;

+	virtual int SCI_METHOD PrimaryStyleFromStyle(int style) = 0;

 	virtual void SCI_METHOD FreeSubStyles() = 0;

 	virtual void SCI_METHOD SetIdentifiers(int style, const char *identifiers) = 0;

 	virtual int SCI_METHOD DistanceToSecondaryStyles() = 0;

diff --git a/scintilla/include/Platform.h b/scintilla/include/Platform.h
index 6103301..1d0d321 100644
--- a/scintilla/include/Platform.h
+++ b/scintilla/include/Platform.h
@@ -345,22 +345,10 @@ typedef void (*CallBackAction)(void*);
 class Window {

 protected:

 	WindowID wid;

-#if PLAT_MACOSX

-	void *windowRef;

-	void *control;

-#endif

 public:

 	Window() : wid(0), cursorLast(cursorInvalid) {

-#if PLAT_MACOSX

-	  windowRef = 0;

-	  control = 0;

-#endif

 	}

 	Window(const Window &source) : wid(source.wid), cursorLast(cursorInvalid) {

-#if PLAT_MACOSX

-	  windowRef = 0;

-	  control = 0;

-#endif

 	}

 	virtual ~Window();

 	Window &operator=(WindowID wid_) {

@@ -383,10 +371,6 @@ public:
 	void SetCursor(Cursor curs);

 	void SetTitle(const char *s);

 	PRectangle GetMonitorRect(Point pt);

-#if PLAT_MACOSX

-	void SetWindow(void *ref) { windowRef = ref; }

-	void SetControl(void *_control) { control = _control; }

-#endif

 private:

 	Cursor cursorLast;

 };

@@ -528,9 +512,7 @@ public:
 #endif

 

 #if defined(__GNUC__) && defined(SCINTILLA_QT)

-#pragma GCC diagnostic ignored "-Wmissing-braces"

 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"

-#pragma GCC diagnostic ignored "-Wchar-subscripts"

 #endif

 

 #endif

diff --git a/scintilla/include/SciLexer.h b/scintilla/include/SciLexer.h
index 4028200..420da02 100644
--- a/scintilla/include/SciLexer.h
+++ b/scintilla/include/SciLexer.h
@@ -123,6 +123,7 @@
 #define SCLEX_LITERATEHASKELL 108

 #define SCLEX_STTXT 109

 #define SCLEX_KVIRC 110

+#define SCLEX_RUST 111

 #define SCLEX_AHK 200

 #define SCLEX_AUTOMATIC 1000

 #define SCE_P_DEFAULT 0

@@ -1683,6 +1684,27 @@
 #define SCE_KVIRC_OPERATOR 10

 #define SCE_KVIRC_STRING_FUNCTION 11

 #define SCE_KVIRC_STRING_VARIABLE 12

+#define SCE_RUST_DEFAULT 0

+#define SCE_RUST_COMMENTBLOCK 1

+#define SCE_RUST_COMMENTLINE 2

+#define SCE_RUST_COMMENTBLOCKDOC 3

+#define SCE_RUST_COMMENTLINEDOC 4

+#define SCE_RUST_NUMBER 5

+#define SCE_RUST_WORD 6

+#define SCE_RUST_WORD2 7

+#define SCE_RUST_WORD3 8

+#define SCE_RUST_WORD4 9

+#define SCE_RUST_WORD5 10

+#define SCE_RUST_WORD6 11

+#define SCE_RUST_WORD7 12

+#define SCE_RUST_STRING 13

+#define SCE_RUST_STRINGR 14

+#define SCE_RUST_CHARACTER 15

+#define SCE_RUST_OPERATOR 16

+#define SCE_RUST_IDENTIFIER 17

+#define SCE_RUST_LIFETIME 18

+#define SCE_RUST_MACRO 19

+#define SCE_RUST_LEXERROR 20

 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */

 

 #endif

diff --git a/scintilla/include/Scintilla.h b/scintilla/include/Scintilla.h
index 2d81d71..da5cbea 100644
--- a/scintilla/include/Scintilla.h
+++ b/scintilla/include/Scintilla.h
@@ -987,6 +987,8 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCN_AUTOCCANCELLED 2025

 #define SCN_AUTOCCHARDELETED 2026

 #define SCN_HOTSPOTRELEASECLICK 2027

+#define SCN_FOCUSIN 2028

+#define SCN_FOCUSOUT 2029

 #ifndef SCI_DISABLE_PROVISIONAL

 #define SC_LINE_END_TYPE_DEFAULT 0

 #define SC_LINE_END_TYPE_UNICODE 1

@@ -997,6 +999,8 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_ALLOCATESUBSTYLES 4020

 #define SCI_GETSUBSTYLESSTART 4021

 #define SCI_GETSUBSTYLESLENGTH 4022

+#define SCI_GETSTYLEFROMSUBSTYLE 4027

+#define SCI_GETPRIMARYSTYLEFROMSTYLE 4028

 #define SCI_FREESUBSTYLES 4023

 #define SCI_SETIDENTIFIERS 4024

 #define SCI_DISTANCETOSECONDARYSTYLES 4025

diff --git a/scintilla/include/Scintilla.iface b/scintilla/include/Scintilla.iface
index 12d3384..495bee6 100644
--- a/scintilla/include/Scintilla.iface
+++ b/scintilla/include/Scintilla.iface
@@ -2600,6 +2600,7 @@ val SCLEX_VISUALPROLOG=107
 val SCLEX_LITERATEHASKELL=108

 val SCLEX_STTXT=109

 val SCLEX_KVIRC=110

+val SCLEX_RUST=111

 ## notepad2 custom code for the AHK lexer - start

 val SCLEX_AHK=200

 ## notepad2 custom code for the AHK lexer - end

@@ -4368,6 +4369,29 @@ val SCE_KVIRC_NUMBER=9
 val SCE_KVIRC_OPERATOR=10

 val SCE_KVIRC_STRING_FUNCTION=11

 val SCE_KVIRC_STRING_VARIABLE=12

+# Lexical states for SCLEX_RUST

+lex Rust=SCLEX_RUST SCE_RUST_

+val SCE_RUST_DEFAULT=0

+val SCE_RUST_COMMENTBLOCK=1

+val SCE_RUST_COMMENTLINE=2

+val SCE_RUST_COMMENTBLOCKDOC=3

+val SCE_RUST_COMMENTLINEDOC=4

+val SCE_RUST_NUMBER=5

+val SCE_RUST_WORD=6

+val SCE_RUST_WORD2=7

+val SCE_RUST_WORD3=8

+val SCE_RUST_WORD4=9

+val SCE_RUST_WORD5=10

+val SCE_RUST_WORD6=11

+val SCE_RUST_WORD7=12

+val SCE_RUST_STRING=13

+val SCE_RUST_STRINGR=14

+val SCE_RUST_CHARACTER=15

+val SCE_RUST_OPERATOR=16

+val SCE_RUST_IDENTIFIER=17

+val SCE_RUST_LIFETIME=18

+val SCE_RUST_MACRO=19

+val SCE_RUST_LEXERROR=20

 

 # Events

 

@@ -4399,6 +4423,8 @@ evt void IndicatorRelease=2024(int modifiers, int position)
 evt void AutoCCancelled=2025(void)

 evt void AutoCCharDeleted=2026(void)

 evt void HotSpotReleaseClick=2027(int modifiers, int position)

+evt void FocusIn=2028(void)

+evt void FocusOut=2029(void)

 

 cat Provisional

 

@@ -4431,6 +4457,12 @@ get int GetSubStylesStart=4021(int styleBase,)
 # The number of sub styles associated with a base style

 get int GetSubStylesLength=4022(int styleBase,)

 

+# For a sub style, return the base style, else return the argument.

+get int GetStyleFromSubStyle=4027(int subStyle,)

+

+# For a secondary style, return the primary style, else return the argument.

+get int GetPrimaryStyleFromStyle=4028(int style,)

+

 # Free allocated sub styles

 fun void FreeSubStyles=4023(,)