Switch back to using Tokens for everything

Author: Jaykul

Rules/UseConsistentCasing.cs

@@ -63,61 +63,35 @@ public override IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string file
             {
                 throw new ArgumentNullException(Strings.NullAstErrorMessage);
             }
+            TokenFlags operators = TokenFlags.BinaryOperator | TokenFlags.UnaryOperator;
 
-            Token[] tokens;
-            ParseError[] errors;
-
-            if (CheckKeyword) {
-                // sorry, but we had to re-parse, because the AST doesn't give us keywords...
-                Parser.ParseInput(ast.Extent.Text, out tokens, out errors);
+            // Iterates all keywords and check the case
+            for (int i = 0; i < Helper.Instance.Tokens.Length; i++)
+            {
+                Token token = Helper.Instance.Tokens[i];
 
-                // Iterates all keywords and check the case
-                for (int i = 0; i < Helper.Tokens.Length; i++)
+                if (CheckKeyword && ((token.TokenFlags & TokenFlags.Keyword) != 0))
                 {
-                    Token currToken = Helper.Tokens[i];
-                    
-                    if ((currToken.TokenFlags & TokenFlags.Keyword) == 0)
-                    {
-                        continue;
-                    }
-                    
-                    string correctCase = currToken.Text.ToLowerInvariant();
-                    if (!currToken.Text.Equals(correctCase, StringComparison.Ordinal))
+                    string correctCase = token.Text.ToLowerInvariant();
+                    if (!token.Text.Equals(correctCase, StringComparison.Ordinal))
                     {
-                        yield return GetDiagnosticRecord(keyword, fileName, correctCase);
+                        yield return GetDiagnosticRecord(token, fileName, correctCase, Strings.UseConsistentCasingKeywordError);
                     }
+                    continue;
                 }
-            }
 
-            if (CheckOperator) {
-                // find them all at once for performance reasons
-                foreach (ExpressionAst oper in ast.FindAll(a => a is UnaryExpressionAst || a is BinaryExpressionAst, true))
+                if (CheckOperator && ((token.TokenFlags & operators) != 0))
                 {
-                    // but handle them separately
-                    switch (oper)
+                    string correctCase = token.Text.ToLowerInvariant();
+                    if (!token.Text.Equals(correctCase, StringComparison.Ordinal))
                     {
-                        case UnaryExpressionAst unary:
-                            string correctCase = "-" + unary.TokenKind.ToString().ToLowerInvariant();
-                            string actualCase = unary.Extent.Text.Substring(0, correctCase.Length);
-                            if (!actualCase.Equals(correctCase, StringComparison.Ordinal))
-                            {
-                                yield return GetDiagnosticRecord(unary, fileName, correctCase);
-                            }
-                            continue;
-
-                        case BinaryExpressionAst binary:
-                            string correctCase = binary.ErrorPosition.Text.ToLowerInvariant();
-                            if (!binary.ErrorPosition.Text.Equals(correctCase, StringComparison.Ordinal))
-                            {
-                                yield return GetDiagnosticRecord(binary, fileName, correctCase);
-                            }
-                            continue;
+                        yield return GetDiagnosticRecord(token, fileName, correctCase, Strings.UseConsistentCasingOperatorError);
                     }
                 }
             }
         }
 
-        private DiagnosticRecord GetDiagnosticRecord(Token token, string fileName, string correction)
+        private DiagnosticRecord GetDiagnosticRecord(Token token, string fileName, string correction, string message)
         {
             var extents = new[]
             {
@@ -132,7 +106,7 @@ private DiagnosticRecord GetDiagnosticRecord(Token token, string fileName, strin
             };
 
             return new DiagnosticRecord(
-                string.Format(CultureInfo.CurrentCulture, Strings.UseConsistentCasingKeywordError, token.Text, correction),
+                string.Format(CultureInfo.CurrentCulture, message, token.Text, correction),
                 token.Extent,
                 GetName(),
                 DiagnosticSeverity.Information,
@@ -141,56 +115,6 @@ private DiagnosticRecord GetDiagnosticRecord(Token token, string fileName, strin
                 suggestedCorrections: extents);
         }
 
-        private DiagnosticRecord GetDiagnosticRecord(UnaryExpressionAst unary, string fileName, string correction)
-        {
-            var extent = new ScriptExtent(
-                new ScriptPosition(
-                    unary.Extent.StartScriptPosition.File,
-                    unary.Extent.StartScriptPosition.LineNumber,
-                    unary.Extent.StartScriptPosition.ColumnNumber,
-                    unary.Extent.StartScriptPosition.Line),
-                new ScriptPosition(
-                    unary.Extent.StartScriptPosition.File,
-                    unary.Extent.StartLineNumber,
-                    unary.Extent.StartColumnNumber + unary.TokenKind.ToString().Length + 1, // add one for the -
-                    unary.Extent.StartScriptPosition.Line));
-
-            var extents = new CorrectionExtent[] {
-                new CorrectionExtent(
-                    extent,
-                    correction,
-                    fileName,
-                    GetDescription())};
-
-            return new DiagnosticRecord(
-                string.Format(CultureInfo.CurrentCulture, Strings.UseConsistentCasingOperatorError, extent.Text, correction),
-                extent,
-                GetName(),
-                DiagnosticSeverity.Information,
-                fileName,
-                correction,
-                suggestedCorrections: extents);
-        }
-
-        private DiagnosticRecord GetDiagnosticRecord(BinaryExpressionAst binary, string fileName, string correction)
-        {
-            var extents = new CorrectionExtent[] {
-                new CorrectionExtent(
-                    binary.ErrorPosition,
-                    correction,
-                    fileName,
-                    GetDescription())};
-
-            return new DiagnosticRecord(
-                string.Format(CultureInfo.CurrentCulture, Strings.UseConsistentCasingOperatorError, binary.ErrorPosition.Text, correction),
-                            binary.ErrorPosition,
-                            GetName(),
-                            DiagnosticSeverity.Information,
-                            fileName,
-                            correction,
-                            suggestedCorrections: extents);
-        }
-
 
         /// <summary>
         /// GetName: Retrieves the name of this rule.