Skip to content

Commit d32a39a

Browse files
elsassphelsassph
committed
Merge pull request #1041 from Gama11/UpdateScintilla
Update Scintilla to 3.6.3
2 parents bba44d7 + 0b25e2c commit d32a39a

File tree

5 files changed

+56
-52
lines changed

5 files changed

+56
-52
lines changed

‎External/3rdParty/Scintilla/additional_keywords.patch

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
1-
diff -r 1092d3d24959 include/SciLexer.h
2-
--- a/include/SciLexer.h Tue Jan 15 09:51:15 2013 +1100
3-
+++ b/include/SciLexer.h Wed Feb 06 22:13:27 2013 +0100
4-
@@ -161,6 +161,9 @@
5-
#define SCE_C_TRIPLEVERBATIM 21
6-
#define SCE_C_HASHQUOTEDSTRING 22
7-
#define SCE_C_PREPROCESSORCOMMENT 23
8-
+#define SCE_C_WORD3 24
9-
+#define SCE_C_WORD4 25
10-
+#define SCE_C_WORD5 26
1+
diff --git a/include/SciLexer.h b/include/SciLexer.h
2+
--- a/include/SciLexer.h
3+
+++ b/include/SciLexer.h
4+
@@ -177,6 +177,9 @@
5+
#define SCE_C_USERLITERAL 25
6+
#define SCE_C_TASKMARKER 26
7+
#define SCE_C_ESCAPESEQUENCE 27
8+
+#define SCE_C_WORD3 100
9+
+#define SCE_C_WORD4 101
10+
+#define SCE_C_WORD5 102
1111
#define SCE_D_DEFAULT 0
1212
#define SCE_D_COMMENT 1
1313
#define SCE_D_COMMENTLINE 2
14-
diff -r 1092d3d24959 lexers/LexCPP.cxx
15-
--- a/lexers/LexCPP.cxx Tue Jan 15 09:51:15 2013 +1100
16-
+++ b/lexers/LexCPP.cxx Wed Feb 06 22:13:27 2013 +0100
17-
@@ -247,6 +247,9 @@
18-
"Documentation comment keywords",
14+
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
15+
--- a/lexers/LexCPP.cxx
16+
+++ b/lexers/LexCPP.cxx
17+
@@ -353,6 +353,9 @@
1918
"Global classes and typedefs",
2019
"Preprocessor definitions",
20+
"Task marker and error marker keywords",
2121
+ "Extended(1) keywords and identifiers",
2222
+ "Extended(2) keywords and identifiers",
2323
+ "Extended(3) keywords and identifiers",
2424
0,
2525
};
2626

27-
@@ -323,6 +326,9 @@
27+
@@ -443,6 +446,9 @@
2828
WordList keywords2;
2929
WordList keywords3;
3030
WordList keywords4;
31-
+ WordList keywords5;
32-
+ WordList keywords6;
33-
+ WordList keywords7;
31+
+ WordList keywords5;
32+
+ WordList keywords6;
33+
+ WordList keywords7;
3434
WordList ppDefinitions;
35-
std::map<std::string, std::string> preprocessorDefinitionsStart;
36-
OptionsCPP options;
37-
@@ -411,6 +417,15 @@
38-
case 4:
39-
wordListN = &ppDefinitions;
35+
WordList markerList;
36+
struct SymbolValue {
37+
@@ -589,6 +595,15 @@
38+
case 5:
39+
wordListN = &markerList;
4040
break;
41-
+ case 5:
42-
+ wordListN = &keywords5;
43-
+ break;
44-
+ case 6:
45-
+ wordListN = &keywords6;
46-
+ break;
47-
+ case 7:
48-
+ wordListN = &keywords7;
49-
+ break;
41+
+ case 6:
42+
+ wordListN = &keywords5;
43+
+ break;
44+
+ case 7:
45+
+ wordListN = &keywords6;
46+
+ break;
47+
+ case 8:
48+
+ wordListN = &keywords7;
49+
+ break;
5050
}
51-
int firstModification = -1;
51+
Sci_Position firstModification = -1;
5252
if (wordListN) {
53-
@@ -605,6 +620,12 @@
53+
@@ -809,6 +824,12 @@
5454
sc.ChangeState(SCE_C_WORD2|activitySet);
5555
} else if (keywords4.InList(s)) {
5656
sc.ChangeState(SCE_C_GLOBALCLASS|activitySet);
5757
+ } else if (keywords5.InList(s)) {
58-
+ sc.ChangeState(SCE_C_WORD3|activitySet);
59-
+ } else if (keywords6.InList(s)) {
60-
+ sc.ChangeState(SCE_C_WORD4|activitySet);
61-
+ } else if (keywords7.InList(s)) {
62-
+ sc.ChangeState(SCE_C_WORD5|activitySet);
63-
}
64-
const bool literalString = sc.ch == '\"';
65-
if (literalString || sc.ch == '\'') {
58+
+ sc.ChangeState(SCE_C_WORD3|activitySet);
59+
+ } else if (keywords6.InList(s)) {
60+
+ sc.ChangeState(SCE_C_WORD4|activitySet);
61+
+ } else if (keywords7.InList(s)) {
62+
+ sc.ChangeState(SCE_C_WORD5|activitySet);
63+
} else {
64+
int subStyle = classifierIdentifiers.ValueFor(s);
65+
if (subStyle >= 0) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3674,7 +3674,7 @@ static public bool IsTextStyle(int style)
36743674
{
36753675
return style == 0 || style == 10 /*punctuation*/ || style == 11 /*identifier*/
36763676
|| style == 16 /*word2 (secondary keywords: class name)*/
3677-
|| style == 24 /*word4 (add keywords4)*/ || style == 25 /*word5 (add keywords5)*/
3677+
|| style == 101 /*word4 (add keywords4)*/ || style == 102 /*word5 (add keywords5)*/
36783678
|| style == 127 /*PHP*/;
36793679
}
36803680

@@ -3686,8 +3686,8 @@ static public bool IsTextStyleEx(int style)
36863686
return style == 0 || style == 5 /*word (secondary keywords)*/
36873687
|| style == 10 /*punctuation*/ || style == 11 /*identifier*/
36883688
|| style == 16 /*word2 (secondary keywords: class name)*/
3689-
|| style == 19 /*globalclass (primary keywords)*/ || style == 23 /*word3 (add keywords3)*/
3690-
|| style == 24 /*word4 (add keywords4)*/ || style == 25 /*word5 (add keywords5)*/
3689+
|| style == 19 /*globalclass (primary keywords)*/ || style == 100 /*word3 (add keywords3)*/
3690+
|| style == 101 /*word4 (add keywords4)*/ || style == 102 /*word5 (add keywords5)*/
36913691
|| style == 127 /*PHP*/;
36923692
}
36933693

‎FlashDevelop/Bin/Debug/SciLexer.dll

157 KB
Binary file not shown.

‎FlashDevelop/Bin/Debug/Settings/Languages/Haxe.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
<keyword key="1" class="haxe-additional-keywords" />
4040
<keyword key="2" class="haxe-documentation-keywords" />
4141
<keyword key="3" class="haxe-primary-keywords" />
42-
<keyword key="5" class="haxe-additional-keywords3" />
43-
<keyword key="6" class="haxe-additional-keywords4" />
44-
<keyword key="7" class="haxe-additional-keywords5" />
42+
<keyword key="6" class="haxe-additional-keywords3" />
43+
<keyword key="7" class="haxe-additional-keywords4" />
44+
<keyword key="8" class="haxe-additional-keywords5" />
4545
</use-keywords>
4646
<!-- COLORING_START -->
4747
<editor-style caret-fore="0x000000" caretline-back="0xececec" selection-fore="0xffffff" selection-back="0x3399ff" colorize-marker-back="true" margin-fore="0xffffff" margin-back="0xffffff" marker-back="0xbcbcbc" />

‎PluginCore/ScintillaNet/Lexers.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,13 @@ public enum CPP
8080
TRIPLEVERBATIM = 21,
8181
HASHQUOTEDSTRING = 22,
8282
PREPROCESSORCOMMENT = 23,
83-
WORD3 = 24,
84-
WORD4 = 25,
85-
WORD5 = 26,
83+
PREPROCESSORCOMMENTDOC = 24,
84+
USERLITERAL = 25,
85+
TASKMARKER = 26,
86+
ESCAPESEQUENCE = 27,
87+
WORD3 = 100,
88+
WORD4 = 101,
89+
WORD5 = 102,
8690
GDEFAULT = 32,
8791
LINENUMBER = 33,
8892
BRACELIGHT = 34,

0 commit comments

Comments
 (0)