Skip to content

Commit 339dfd4

Browse files
committed
Revert Scintilla 3.6.3 changes for 5.1, patch is still intact for later release
1 parent 919034a commit 339dfd4

3 files changed

Lines changed: 9 additions & 12 deletions

File tree

‎External/Plugins/ASCompletion/Completion/ASComplete.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3707,9 +3707,9 @@ static public bool IsLiteralStyle(int style)
37073707
/// </summary>
37083708
static public bool IsTextStyle(int style)
37093709
{
3710-
return style == 0 || style == 10 /*punctuation*/ || style == 11 /*identifier*/
3710+
return style == 0 || style == 10 /*punctuation*/ || style == 11 /*identifier*/
37113711
|| style == 16 /*word2 (secondary keywords: class name)*/
3712-
|| style == 101 /*word4 (add keywords4)*/ || style == 102 /*word5 (add keywords5)*/
3712+
|| style == 24 /*word4 (add keywords4)*/ || style == 25 /*word5 (add keywords5)*/
37133713
|| style == 127 /*PHP*/;
37143714
}
37153715

@@ -3719,10 +3719,10 @@ static public bool IsTextStyle(int style)
37193719
static public bool IsTextStyleEx(int style)
37203720
{
37213721
return style == 0 || style == 5 /*word (secondary keywords)*/
3722-
|| style == 10 /*punctuation*/ || style == 11 /*identifier*/
3723-
|| style == 16 /*word2 (secondary keywords: class name)*/
3724-
|| style == 19 /*globalclass (primary keywords)*/ || style == 100 /*word3 (add keywords3)*/
3725-
|| style == 101 /*word4 (add keywords4)*/ || style == 102 /*word5 (add keywords5)*/
3722+
|| style == 10 /*punctuation*/ || style == 11 /*identifier*/
3723+
|| style == 16 /*word2 (secondary keywords: class name)*/
3724+
|| style == 19 /*globalclass (primary keywords)*/ || style == 23 /*word3 (add keywords3)*/
3725+
|| style == 24 /*word4 (add keywords4)*/ || style == 25 /*word5 (add keywords5)*/
37263726
|| style == 127 /*PHP*/;
37273727
}
37283728

-157 KB
Binary file not shown.

‎PluginCore/ScintillaNet/Lexers.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,9 @@ public enum CPP
8181
HASHQUOTEDSTRING = 22,
8282
PREPROCESSORCOMMENT = 23,
8383
PREPROCESSORCOMMENTDOC = 24,
84-
USERLITERAL = 25,
85-
TASKMARKER = 26,
86-
ESCAPESEQUENCE = 27,
87-
WORD3 = 100,
88-
WORD4 = 101,
89-
WORD5 = 102,
84+
WORD3 = 24,
85+
WORD4 = 25,
86+
WORD5 = 26,
9087
GDEFAULT = 32,
9188
LINENUMBER = 33,
9289
BRACELIGHT = 34,

0 commit comments

Comments
 (0)