AVS lexer: remove SCE_AVS_STRINGEOL

Patch by Bruno Barbieri [brunorex]

git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@703 28bd50df-7adb-d945-0439-6e466c6a13cc

4 files changed, 14 insertions, 31 deletions

diff --git a/scintilla/include/SciLexer.h b/scintilla/include/SciLexer.h
index 15fb3e6..e494bd4 100644
--- a/scintilla/include/SciLexer.h
+++ b/scintilla/include/SciLexer.h
@@ -1486,13 +1486,12 @@
 #define SCE_AVS_IDENTIFIER 6

 #define SCE_AVS_STRING 7

 #define SCE_AVS_TRIPLESTRING 8

-#define SCE_AVS_STRINGEOL 9

-#define SCE_AVS_KEYWORD 10

-#define SCE_AVS_FILTER 11

-#define SCE_AVS_PLUGIN 12

-#define SCE_AVS_FUNCTION 13

-#define SCE_AVS_CLIPPROP 14

-#define SCE_AVS_USERDFN 15

+#define SCE_AVS_KEYWORD 9

+#define SCE_AVS_FILTER 10

+#define SCE_AVS_PLUGIN 11

+#define SCE_AVS_FUNCTION 12

+#define SCE_AVS_CLIPPROP 13

+#define SCE_AVS_USERDFN 14

 #define SCE_A68K_DEFAULT 0

 #define SCE_A68K_COMMENT 1

 #define SCE_A68K_NUMBER_DEC 2

diff --git a/scintilla/include/Scintilla.iface b/scintilla/include/Scintilla.iface
index d553cfe..b468229 100644
--- a/scintilla/include/Scintilla.iface
+++ b/scintilla/include/Scintilla.iface
@@ -4019,13 +4019,12 @@ val SCE_AVS_OPERATOR=5
 val SCE_AVS_IDENTIFIER=6

 val SCE_AVS_STRING=7

 val SCE_AVS_TRIPLESTRING=8

-val SCE_AVS_STRINGEOL=9

-val SCE_AVS_KEYWORD=10

-val SCE_AVS_FILTER=11

-val SCE_AVS_PLUGIN=12

-val SCE_AVS_FUNCTION=13

-val SCE_AVS_CLIPPROP=14

-val SCE_AVS_USERDFN=15

+val SCE_AVS_KEYWORD=9

+val SCE_AVS_FILTER=10

+val SCE_AVS_PLUGIN=11

+val SCE_AVS_FUNCTION=12

+val SCE_AVS_CLIPPROP=13

+val SCE_AVS_USERDFN=14

 ## notepad2 custom code for the AVS lexer - end

 # Lexical states for SCLEX_A68K

 lex A68k=SCLEX_A68K SCE_A68K_

diff --git a/scintilla/lexers/LexAVS.cxx b/scintilla/lexers/LexAVS.cxx
index f925333..e8ac4d6 100644
--- a/scintilla/lexers/LexAVS.cxx
+++ b/scintilla/lexers/LexAVS.cxx
@@ -65,7 +65,7 @@ static void ColouriseAvsDoc(
 	}

 

 	// Do not leak onto next line

-	if (initStyle == SCE_AVS_STRINGEOL || initStyle == SCE_AVS_COMMENTLINE) {

+	if (initStyle == SCE_AVS_COMMENTLINE) {

 		initStyle = SCE_AVS_DEFAULT;

 	}

 

@@ -84,11 +84,6 @@ static void ColouriseAvsDoc(
 			}

 		}

 

-		if (sc.atLineStart && (sc.state == SCE_AVS_STRING)) {

-			// Prevent SCE_AVS_STRINGEOL from leaking back to previous line

-			sc.SetState(SCE_AVS_STRING);

-		}

-

 		// Determine if the current state should terminate.

 		if (sc.state == SCE_AVS_OPERATOR) {

 			sc.SetState(SCE_AVS_DEFAULT);

@@ -146,9 +141,6 @@ static void ColouriseAvsDoc(
 		} else if (sc.state == SCE_AVS_STRING) {

 			if (sc.ch == '\"') {

 				sc.ForwardSetState(SCE_AVS_DEFAULT);

-			} else if (sc.atLineEnd) {

-				sc.ChangeState(SCE_AVS_STRINGEOL);

-				sc.ForwardSetState(SCE_AVS_DEFAULT);

 			}

 		} else if (sc.state == SCE_AVS_TRIPLESTRING) {

 			if (sc.Match("\"\"\"")) {

@@ -156,15 +148,8 @@ static void ColouriseAvsDoc(
 				sc.Forward();

 				sc.ForwardSetState(SCE_AVS_DEFAULT);

 			}

-		} else if (sc.state == SCE_AVS_STRINGEOL) {

-			if (sc.ch == '\"') {

-				sc.ForwardSetState(SCE_AVS_DEFAULT);

-			} else if (sc.atLineEnd) {

-				sc.ForwardSetState(SCE_AVS_DEFAULT);

-			}

 		}

 

-

 		// Determine if a new state should be entered.

 		if (sc.state == SCE_AVS_DEFAULT) {

 			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {

diff --git a/src/Styles.c b/src/Styles.c
index e6cd8d2..bfd424f 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -1651,7 +1651,7 @@ EDITLEXER lexAVS = { SCLEX_AVS, 63332, L"AviSynth Script", L"avs; avsi", L"", &K
                     //{ SCE_AVS_DEFAULT, L"Default", L"", L"" },

                     { MULTI_STYLE(SCE_AVS_COMMENTLINE,SCE_AVS_COMMENTBLOCK,SCE_AVS_COMMENTBLOCKN,0), 63127, L"Comment", L"fore:#008000", L"" },

                     { SCE_AVS_OPERATOR, 63132, L"Operator", L"", L"" },

-                    { MULTI_STYLE(SCE_AVS_STRING,SCE_AVS_TRIPLESTRING,SCE_AVS_STRINGEOL,0), 63131, L"String", L"fore:#7F007F", L"" },

+                    { MULTI_STYLE(SCE_AVS_STRING,SCE_AVS_TRIPLESTRING,0,0), 63131, L"String", L"fore:#7F007F", L"" },

                     { SCE_AVS_NUMBER, 63130, L"Number", L"fore:#007F7F", L"" },

                     { SCE_AVS_KEYWORD, 63334, L"Keywords", L"fore:#00007F; bold", L"" },

                     { SCE_AVS_FILTER, 63335, L"Filter", L"fore:#00007F; bold", L"" },