Removed usage of obsolete properties

axuno · Jul 19, 2017 · 39603d8 · 39603d8
1 parent 650dfaa
commit 39603d8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/SmartFormat.Demo/SmartFormatDemo.cs b/src/SmartFormat.Demo/SmartFormatDemo.cs
@@ -45,8 +45,8 @@ private void SmartFormatDemo_Load(object sender, EventArgs e)
             propertyGrid1.SelectedObject = args;
 
 
-            Smart.Default.ErrorAction = ErrorAction.OutputErrorInResult;
-            Smart.Default.Parser.ErrorAction = ErrorAction.ThrowError;
+            Smart.Default.Settings.FormatErrorAction = ErrorAction.OutputErrorInResult;
+            Smart.Default.Settings.ParseErrorAction = ErrorAction.ThrowError;
 
             LoadExamples();
         }

diff --git a/src/SmartFormat/Core/Parsing/Parser.cs b/src/SmartFormat/Core/Parsing/Parser.cs
@@ -242,7 +242,7 @@ public Format ParseFormat(string format, string[] formatterExtensionNames)
                         if (current.parent == null)
                         {
                             parsingErrors.AddIssue(current, parsingErrorText[ParsingError.TooManyClosingBraces], i, i + 1);
-                            OnParsingFailure?.Invoke(this, new ParsingErrorEventArgs(current.RawText, i, i+1, ParsingError.TooManyClosingBraces, ErrorAction != ErrorAction.ThrowError));
+                            OnParsingFailure?.Invoke(this, new ParsingErrorEventArgs(current.RawText, i, i+1, ParsingError.TooManyClosingBraces, Settings.ParseErrorAction != ErrorAction.ThrowError));
                             continue;
                         }
                         // End of the placeholder's Format:
@@ -403,7 +403,7 @@ public Format ParseFormat(string format, string[] formatterExtensionNames)
                         {
                             // There are trailing operators. For now, this is an error.
                             parsingErrors.AddIssue(current, parsingErrorText[ParsingError.TrailingOperatorsInSelector], operatorIndex, i);
-                            OnParsingFailure?.Invoke(this, new ParsingErrorEventArgs(current.RawText, operatorIndex, i + 1, ParsingError.TrailingOperatorsInSelector, ErrorAction != ErrorAction.ThrowError));
+                            OnParsingFailure?.Invoke(this, new ParsingErrorEventArgs(current.RawText, operatorIndex, i + 1, ParsingError.TrailingOperatorsInSelector, Settings.ParseErrorAction != ErrorAction.ThrowError));
                         }
                         lastI = i + 1;
 
@@ -424,7 +424,7 @@ public Format ParseFormat(string format, string[] formatterExtensionNames)
                         {
                             // There are trailing operators.  For now, this is an error.
                             parsingErrors.AddIssue(current, parsingErrorText[ParsingError.TrailingOperatorsInSelector], operatorIndex, i);
-                            OnParsingFailure?.Invoke(this, new ParsingErrorEventArgs(current.RawText, operatorIndex, i, ParsingError.TrailingOperatorsInSelector, ErrorAction != ErrorAction.ThrowError));
+                            OnParsingFailure?.Invoke(this, new ParsingErrorEventArgs(current.RawText, operatorIndex, i, ParsingError.TrailingOperatorsInSelector, Settings.ParseErrorAction != ErrorAction.ThrowError));
                         }
                         lastI = i + 1;
 
@@ -446,7 +446,7 @@ public Format ParseFormat(string format, string[] formatterExtensionNames)
                         {
                             // Invalid character in the selector.
                             parsingErrors.AddIssue(current, parsingErrorText[ParsingError.InvalidCharactersInSelector], i, i + 1);
-                            OnParsingFailure?.Invoke(this, new ParsingErrorEventArgs(current.RawText, i, i + 1, ParsingError.InvalidCharactersInSelector, ErrorAction != ErrorAction.ThrowError));
+                            OnParsingFailure?.Invoke(this, new ParsingErrorEventArgs(current.RawText, i, i + 1, ParsingError.InvalidCharactersInSelector, Settings.ParseErrorAction != ErrorAction.ThrowError));
                         }
                     }
                 }
@@ -460,7 +460,7 @@ public Format ParseFormat(string format, string[] formatterExtensionNames)
             if (current.parent != null || currentPlaceholder != null)
             {
                 parsingErrors.AddIssue(current, parsingErrorText[ParsingError.MissingClosingBrace], format.Length, format.Length);
-                OnParsingFailure?.Invoke(this, new ParsingErrorEventArgs(current.RawText, format.Length, format.Length, ParsingError.MissingClosingBrace, ErrorAction != ErrorAction.ThrowError));
+                OnParsingFailure?.Invoke(this, new ParsingErrorEventArgs(current.RawText, format.Length, format.Length, ParsingError.MissingClosingBrace, Settings.ParseErrorAction != ErrorAction.ThrowError));
                 current.endIndex = format.Length;
                 while (current.parent != null)
                 {
@@ -470,7 +470,7 @@ public Format ParseFormat(string format, string[] formatterExtensionNames)
             }
 
             // Check if there were any parsing errors:
-            if (parsingErrors.HasIssues && ErrorAction == ErrorAction.ThrowError) throw parsingErrors;
+            if (parsingErrors.HasIssues && Settings.ParseErrorAction == ErrorAction.ThrowError) throw parsingErrors;
 
             return result;
         }

diff --git a/src/SmartFormat/SmartFormatter.cs b/src/SmartFormat/SmartFormatter.cs
@@ -255,8 +255,8 @@ public void Format(FormattingInfo formattingInfo)
 
         private void FormatError(FormatItem errorItem, Exception innerException, int startIndex, FormattingInfo formattingInfo)
         {
-            OnFormattingFailure?.Invoke(this, new FormattingErrorEventArgs(errorItem.RawText, startIndex, ErrorAction != ErrorAction.ThrowError));
-            switch (ErrorAction)
+            OnFormattingFailure?.Invoke(this, new FormattingErrorEventArgs(errorItem.RawText, startIndex, Settings.FormatErrorAction != ErrorAction.ThrowError));
+            switch (Settings.FormatErrorAction)
             {
                 case ErrorAction.Ignore:
                     return;