Skip to content

Commit 21cbcff

Browse files
committed
replaces usage of indexesFromArray
1 parent c92c467 commit 21cbcff

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/texter/general/markdown/MarkdownBlocks.hx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ using texter.general.TextTools;
2525
function parseLanguage(text) {
2626
var interp:Array<{color:Int, start:Int, end:Int}> = [];
2727
var indexOfKeyColor1 = text.indexesFromEReg(~/(?: |\n|^)(keywords|that|need|to|be|colored|blue)/m),
28-
indexOfKeyColor2 = text.indexesFromArray([ "You", "can", "also", "add", "words", "with", "an", "array"]),
28+
indexOfKeyColor2 = text.indexesOfSubs([ "You", "can", "also", "add", "words", "with", "an", "array"]),
2929
indexOfFunctionName = text.indexesFromEReg(~/([a-zA-Z_]+)\(/m), //detects function syntax, camal/snake/Title case
3030
indexOfClassName = text.indexesFromEReg(~/(?:\(| |\n|^)[A-Z]+[a-z]+/m), // detects Title Case
3131
indexOfString = text.indexesFromEReg(~/"[^"]*"|'[^']*'/), // detects "" and ''
32-
indexOfNumbers = text.indexesFromArray(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]),
32+
indexOfNumbers = text.indexesOfSubs(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]),
3333
indexOfComment = text.indexesFromEReg(~/\/\/[^\n]*|\/\*[^]*?\*\//m); // detects //
3434
3535
//add the indexes to the interp array
@@ -72,11 +72,11 @@ class MarkdownBlocks
7272
public static dynamic function parseJSON(text:String):Array<{color:Int, start:Int, end:Int}>
7373
{
7474
var interp:Array<{color:Int, start:Int, end:Int}> = [];
75-
var indexOfBool = text.indexesFromArray(["true", "false", "null"]),
76-
indexOfCB = text.indexesFromArray(["{", "}"]),
77-
indexOfEnd = text.indexesFromArray(['"\n', '",']),
75+
var indexOfBool = text.indexesOfSubs(["true", "false", "null"]),
76+
indexOfCB = text.indexesOfSubs(["{", "}"]),
77+
indexOfEnd = text.indexesOfSubs(['"\n', '",']),
7878
indexOfKeyEnd = text.indexesOf('":'),
79-
indexOfNumbers = text.indexesFromArray(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]);
79+
indexOfNumbers = text.indexesOfSubs(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]);
8080

8181
for (i in indexOfBool)
8282
interp.push({color: 0x4169E1, start: i.startIndex, end: i.endIndex});
@@ -108,13 +108,13 @@ class MarkdownBlocks
108108
{
109109
var interp:Array<{color:Int, start:Int, end:Int}> = [];
110110
var indexOfBlue = text.indexesFromEReg(~/(?:\(| |\n|^)(overload|true|false|null|public|static|dynamic|extern|inline|override|macro|abstract|final|var|function|package|enum|typedef|in|is|trace|new|this|class|super|extends|implements|interface|->)/m),
111-
indexOfPurple = text.indexesFromArray([
111+
indexOfPurple = text.indexesOfSubs([
112112
"if", "else", "for", "while", "do", "switch", "case", "default", "break", "continue", "try", "catch", "throw", "import"
113113
]),
114114
indexOfFunctionName = text.indexesFromEReg(~/([a-zA-Z_]+)\(/m),
115115
indexOfClassName = text.indexesFromEReg(~/(?::|\(| |\n|^)[A-Z][a-zA-Z]+/m),
116116
indexOfString = text.indexesFromEReg(~/"[^"]*"|'[^']*'/),
117-
indexOfNumbers = text.indexesFromArray(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]),
117+
indexOfNumbers = text.indexesOfSubs(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]),
118118
indexOfComments = text.indexesFromEReg(~/\/\/.*/m),
119119
indexOfConditionals = text.indexesFromEReg(~/#(?:if|end|elseif) [^\n]*/m);
120120

@@ -145,7 +145,7 @@ class MarkdownBlocks
145145
indexOfFunctionName = text.indexesFromEReg(~/([a-zA-Z_]+)\(/m),
146146
indexOfClassName = text.indexesFromEReg(~/(?:\(| |\n|^)[A-Z]+[a-z]+/m),
147147
indexOfString = text.indexesFromEReg(~/"[^"]*"|'[^']*'|\$".*?"/),
148-
indexOfNumbers = text.indexesFromArray(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]),
148+
indexOfNumbers = text.indexesOfSubs(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]),
149149
indexOfComments = text.indexesFromEReg(~/\/\/.*/m);
150150
trace("endParse");
151151

@@ -173,7 +173,7 @@ class MarkdownBlocks
173173
indexOfPurple = text.indexesFromEReg(~/(?:\(| |\n|^)(break|case|continue|default|do|else|for|if|return|switch|while)/m),
174174
indexOfFunctionName = text.indexesFromEReg(~/(?:\(| |\n|^)([a-zA-Z_]+)\(/m),
175175
indexOfString = text.indexesFromEReg(~/"[^"]*"|'[^']*'/),
176-
indexOfNumbers = text.indexesFromArray(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]),
176+
indexOfNumbers = text.indexesOfSubs(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]),
177177
indexOfComments = text.indexesFromEReg(~/\/\/.*/m),
178178
indexOfPink = text.indexesFromEReg(~/^#[^\n]*/m);
179179

0 commit comments

Comments
 (0)