fixed reformat broken with escaped backslashes between quotes

Author: maxijabase

.editorconfig

@@ -131,7 +131,7 @@ csharp_new_line_between_query_expression_clauses = true
 csharp_indent_block_contents = true
 csharp_indent_braces = false
 csharp_indent_case_contents = true
-csharp_indent_case_contents_when_block = true
+csharp_indent_case_contents_when_block =false
 csharp_indent_labels = one_less_than_current
 csharp_indent_switch_labels = true
 

UI/MainWindow/MainWindowCommands.cs

@@ -569,9 +569,9 @@ private void Command_TidyCode(bool All)
                         var line = ee.editor.Document.GetLineByOffset(currentCaret);
                         var lineNumber = line.LineNumber;
                         // 0 - start | any other - middle | -1 - EOS
-                        var curserLinePos = currentCaret == line.Offset ? 0 : currentCaret == line.EndOffset ? -1 : currentCaret - line.Offset;
+                        var cursorLinePos = currentCaret == line.Offset ? 0 : currentCaret == line.EndOffset ? -1 : currentCaret - line.Offset;
 
-                        if (curserLinePos > 0)
+                        if (cursorLinePos > 0)
                         {
                             numOfSpacesOrTabsBefore = ee.editor.Document.GetText(line).Count(c => c == ' ' || c == '\t');
                         }
@@ -585,14 +585,14 @@ private void Command_TidyCode(bool All)
 
                         line = ee.editor.Document.GetLineByNumber(lineNumber);
                         var newCaretPos = line.Offset;
-                        if (curserLinePos == -1)
+                        if (cursorLinePos == -1)
                         {
                             newCaretPos += line.Length;
                         }
-                        else if (curserLinePos != 0)
+                        else if (cursorLinePos != 0)
                         {
                             var numOfSpacesOrTabsAfter = ee.editor.Document.GetText(line).Count(c => c == ' ' || c == '\t');
-                            newCaretPos += curserLinePos + (numOfSpacesOrTabsAfter - numOfSpacesOrTabsBefore);
+                            newCaretPos += cursorLinePos + (numOfSpacesOrTabsAfter - numOfSpacesOrTabsBefore);
                         }
                         ee.editor.TextArea.Caret.Offset = newCaretPos;
                     }

Utils/SPSyntaxTidy/SPTokenizer.cs

@@ -18,14 +18,15 @@ public static SPToken[] Tokenize(string source)
 
                 #region Newline
 
-                if (c == '\n'
-                ) //just fetch \n. \r will be killed by the whitestrip but it's reintroduced in Environment.NewLine
+                //just fetch \n. \r will be killed by the whitestrip but it's reintroduced in Environment.NewLine
+                if (c == '\n')
                 {
+                    //add them before the whitestrip-killer will get them ^^
                     token.Add(new SPToken()
                     {
                         Kind = SPTokenKind.Newline,
                         Value = Environment.NewLine
-                    }); //add them before the whitestrip-killer will get them ^^
+                    });
                     continue;
                 }
 
@@ -42,17 +43,49 @@ public static SPToken[] Tokenize(string source)
 
                 #region Quotes
 
-                if (c == '"') //sigh...
+                if (c == '"')
                 {
                     var startIndex = i;
-                    var
-                        foundOccurence =
-                            false; //these suckers are here because we want to continue the main-for-loop but cannot do it from the for-loop in the nextline
+                    var foundOccurence = false;
+
+                    // keep searching for next quote
                     for (var j = i + 1; j < length; ++j)
                     {
+                        // if found, search for an escape slash before it
                         if (buffer[j] == '"')
                         {
-                            if (buffer[j - 1] != '\\') //is the quote not escaped?
+                            if (buffer[j - 1] == '\\')
+                            {
+                                // if found, count the amount of them
+                                var slashAmount = 0;
+                                for (int k = j - 1; k >= 0; k--)
+                                {
+                                    if (buffer[k - 1] == '\\')
+                                    {
+                                        slashAmount++;
+                                        continue;
+                                    }
+                                    break;
+                                }
+                                // if amount is even (slashAmout + 1 already counted = it's even)
+                                // quote is not escaped and counts as closing quote, we add it as token
+                                if (slashAmount % 2 != 0)
+                                {
+                                    token.Add(new SPToken()
+                                    {
+                                        Kind = SPTokenKind.Quote,
+                                        Value = source.Substring(startIndex, j - startIndex + 1)
+                                    });
+                                    foundOccurence = true;
+                                    i = j; //skip it in the main loop
+                                    break;
+                                }
+                                else
+                                {
+                                    continue;
+                                }
+                            }
+                            else
                             {
                                 token.Add(new SPToken()
                                 {
@@ -124,8 +157,8 @@ public static SPToken[] Tokenize(string source)
                             ++i;
                             for (var j = i; j < length; ++j)
                             {
-                                if (buffer[j] == '\r' || buffer[j] == '\n'
-                                ) //different line ending specifications...horribly...
+                                //different line ending specifications...horribly...
+                                if (buffer[j] == '\r' || buffer[j] == '\n')
                                 {
                                     break;
                                 }
@@ -259,8 +292,7 @@ public static SPToken[] Tokenize(string source)
                     }
                 }
 
-                if (c == '<' || c == '>' || c == '!' || c == '|' || c == '&' || c == '+' || c == '-' || c == '*' ||
-                    c == '/' || c == '^' || c == '%')
+                if (c is '<' or '>' or '!' or '|' or '&' or '+' or '-' or '*' or '/' or '^' or '%')
                 {
                     if ((i + 1) < length)
                     {
@@ -272,8 +304,8 @@ public static SPToken[] Tokenize(string source)
                         }
                     }
 
-                    if (c != '!' && c != '|' && c != '&' && c != '+' && c != '-' && c != '<' && c != '>'
-                    ) //they can have another meaning so they are handled on their own
+                    //they can have another meaning so they are handled on their own
+                    if (c is not '!' and not '|' and not '&' and not '+' and not '-' and not '<' and not '>')
                     {
                         token.Add(new SPToken() { Kind = SPTokenKind.Operator, Value = source.Substring(i, 1) });
                         continue;
@@ -342,8 +374,8 @@ public static SPToken[] Tokenize(string source)
                     }
                 }
 
-                if (c == '&'
-                ) //the & operator is a little bit problematic. It can mean bitwise AND or address of variable. This is not easy to determinate
+                //the & operator is a little bit problematic. It can mean bitwise AND or address of variable. This is not easy to determinate
+                if (c == '&')
                 {
                     var canMatchSingle = true;
                     if ((i + 1) < length)