Rename VB and VBS lexer styles from SCE_B_* to SCE_VB_*.

scintilla/include/SciLexer.h

@@ -402,27 +402,31 @@
 #define SCE_RB_BUILTIN_CONSTANT 48
 #define SCE_RB_BUILTIN_FUNCTION 49
 #define SCE_RB_UPPER_BOUND 50
-#define SCE_B_DEFAULT 0
-#define SCE_B_COMMENT 1
-#define SCE_B_NUMBER 2
-#define SCE_B_KEYWORD 3
-#define SCE_B_STRING 4
-#define SCE_B_PREPROCESSOR 5
-#define SCE_B_OPERATOR 6
-#define SCE_B_IDENTIFIER 7
-#define SCE_B_DATE 8
-#define SCE_B_STRINGEOL 9
-#define SCE_B_KEYWORD2 10
-#define SCE_B_KEYWORD3 11
-#define SCE_B_KEYWORD4 12
-#define SCE_B_CONSTANT 13
-#define SCE_B_ASM 14
-#define SCE_B_LABEL 15
-#define SCE_B_ERROR 16
-#define SCE_B_HEXNUMBER 17
-#define SCE_B_BINNUMBER 18
-#define SCE_B_OCTNUMBER 19
-#define SCE_B_ATTRIBUTE 20
+#define SCE_VB_DEFAULT 0
+#define SCE_VB_COMMENTLINE 1
+#define SCE_VB_LINE_CONTINUATION 2
+#define SCE_VB_OPERATOR 3
+#define SCE_VB_OPERATOR2 4
+#define SCE_VB_NUMBER 5
+#define SCE_VB_STRING 6
+#define SCE_VB_INTERPOLATED_STRING 7
+#define SCE_VB_ESCAPECHAR 8
+#define SCE_VB_FORMAT_SPECIFIER 9
+#define SCE_VB_PLACEHOLDER 10
+#define SCE_VB_IDENTIFIER 11
+#define SCE_VB_DATE 12
+#define SCE_VB_KEYWORD 13
+#define SCE_VB_KEYWORD2 14
+#define SCE_VB_KEYWORD3 15
+#define SCE_VB_CLASS 16
+#define SCE_VB_INTERFACE 17
+#define SCE_VB_ENUM 18
+#define SCE_VB_ATTRIBUTE 19
+#define SCE_VB_CONSTANT 20
+#define SCE_VB_BASIC_FUNCTION 21
+#define SCE_VB_PREPROCESSOR 22
+#define SCE_VB_PREPROCESSOR_WORD 23
+#define SCE_VB_LABEL 24
 #define SCE_PROPS_DEFAULT 0
 #define SCE_PROPS_COMMENT 1
 #define SCE_PROPS_SECTION 2

scintilla/include/SciLexer.iface

@@ -523,37 +523,37 @@ val SCE_RB_BUILTIN_CONSTANT=
 val SCE_RB_BUILTIN_FUNCTION=
 val SCE_RB_UPPER_BOUND=
 # Lexical states for SCLEX_VISUALBASIC, SCLEX_VBSCRIPT, SCLEX_POWERBASIC, SCLEX_BLITZBASIC, SCLEX_PUREBASIC, SCLEX_FREEBASIC
-lex VisualBasic=SCLEX_VISUALBASIC SCE_B_
-lex VBScript=SCLEX_VBSCRIPT SCE_B_
+lex VisualBasic=SCLEX_VISUALBASIC SCE_VB_
+lex VBScript=SCLEX_VBSCRIPT SCE_VB_
 #lex PowerBasic=SCLEX_POWERBASIC SCE_B_
 #lex BlitzBasic=SCLEX_BLITZBASIC SCE_B_
 #lex PureBasic=SCLEX_PUREBASIC SCE_B_
 #lex FreeBasic=SCLEX_FREEBASIC SCE_B_
-val SCE_B_DEFAULT=0
-val SCE_B_COMMENT=1
-val SCE_B_NUMBER=2
-val SCE_B_KEYWORD=3
-val SCE_B_STRING=4
-val SCE_B_PREPROCESSOR=5
-val SCE_B_OPERATOR=6
-val SCE_B_IDENTIFIER=7
-val SCE_B_DATE=8
-val SCE_B_STRINGEOL=9
-val SCE_B_KEYWORD2=10
-val SCE_B_KEYWORD3=11
-val SCE_B_KEYWORD4=12
-val SCE_B_CONSTANT=13
-val SCE_B_ASM=14
-val SCE_B_LABEL=15
-val SCE_B_ERROR=16
-val SCE_B_HEXNUMBER=17
-val SCE_B_BINNUMBER=18
-val SCE_B_OCTNUMBER=19
-val SCE_B_ATTRIBUTE=20
-#val SCE_B_COMMENTBLOCK=19
-#val SCE_B_DOCLINE=20
-#val SCE_B_DOCBLOCK=21
-#val SCE_B_DOCKEYWORD=22
+val SCE_VB_DEFAULT=
+val SCE_VB_COMMENTLINE=
+val SCE_VB_LINE_CONTINUATION=
+val SCE_VB_OPERATOR=
+val SCE_VB_OPERATOR2=
+val SCE_VB_NUMBER=
+val SCE_VB_STRING=
+val SCE_VB_INTERPOLATED_STRING=
+val SCE_VB_ESCAPECHAR=
+val SCE_VB_FORMAT_SPECIFIER=
+val SCE_VB_PLACEHOLDER=
+val SCE_VB_IDENTIFIER=
+val SCE_VB_DATE=
+val SCE_VB_KEYWORD=
+val SCE_VB_KEYWORD2=
+val SCE_VB_KEYWORD3=
+val SCE_VB_CLASS=
+val SCE_VB_INTERFACE=
+val SCE_VB_ENUM=
+val SCE_VB_ATTRIBUTE=
+val SCE_VB_CONSTANT=
+val SCE_VB_BASIC_FUNCTION=
+val SCE_VB_PREPROCESSOR=
+val SCE_VB_PREPROCESSOR_WORD=
+val SCE_VB_LABEL=
 # Lexical states for SCLEX_PROPERTIES
 lex Properties=SCLEX_PROPERTIES SCE_PROPS_
 val SCE_PROPS_DEFAULT=0

scintilla/lexers/LexMarkdown.cxx

@@ -1742,7 +1742,6 @@ void MarkdownLexer::HighlightInlineText(int visibleChars) {
 	if (handled || current != sc.state) {
 		SaveOuterStyle(current);
 	} else if (visibleChars != 0
-		&& (current == SCE_MARKDOWN_DEFAULT || (current >= SCE_MARKDOWN_EM_ASTERISK && current <= SCE_MARKDOWN_STRIKEOUT))
 		&& ((sc.ch == '\\' && IsEOLChar(sc.chNext)) || (sc.Match(' ', ' ') && IsEOLChar(sc.GetRelative(2))))) {
 		sc.SetState(SCE_MARKDOWN_HARD_LINE_BREAK);
 		if (sc.ch == ' ') {