zune/ZuneUIXTools
0
0
Fork 0
mirror of https://github.com/ZuneDev/ZuneUIXTools.git synced 2026-07-27 13:11:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use params for string formats

Browse Source
This commit is contained in:
Joshua Askharoun
2021-04-02 13:10:52 -05:00
parent d150461484
commit 176f469d7b
3 changed files with 13 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UIX/Microsoft/Iris/Markup/Parser.cs
+2 -3
View File
@@ -34,8 +34,7 @@ namespace Microsoft.Iris.Markup
try
{
string str1 = string.Empty;
XmlNodeType nodeType;
while (xmlReader.Read(out nodeType))
while (xmlReader.Read(out XmlNodeType nodeType))
{
if (parseResult.Root == null || parseStack.Count == 0 && nodeType == XmlNodeType.EndElement)
{
@@ -351,7 +350,7 @@ namespace Microsoft.Iris.Markup
private static void ReportError(NativeXmlReader xmlReader, string message) => ErrorManager.ReportError(xmlReader.LineNumber, xmlReader.LinePosition, message);
private static void ReportError(NativeXmlReader xmlReader, string message, object param) => ErrorManager.ReportError(xmlReader.LineNumber, xmlReader.LinePosition, message, param);
private static void ReportError(NativeXmlReader xmlReader, string message, params object[] parameters) => ErrorManager.ReportError(xmlReader.LineNumber, xmlReader.LinePosition, message, parameters);
private enum CodeType
{
UIX/Microsoft/Iris/Session/ErrorManager.cs
+6 -110
View File
@@ -71,56 +71,19 @@ namespace Microsoft.Iris.Session
public static void ReportError(string message) => TrackReportWorker(-1, -1, false, message);
public static void ReportError(string format, object param) => TrackReport(-1, -1, false, format, param);
public static void ReportError(string format, object param1, object param2) => TrackReport(-1, -1, false, format, param1, param2);
public static void ReportError(string format, object param1, object param2, object param3) => TrackReport(-1, -1, false, format, param1, param2, param3);
public static void ReportError(
string format,
object param1,
object param2,
object param3,
object param4)
{
TrackReport(-1, -1, false, format, param1, param2, param3, param4);
}
public static void ReportError(
string format,
object param1,
object param2,
object param3,
object param4,
object param5)
{
TrackReport(-1, -1, false, format, param1, param2, param3, param4, param5);
}
public static void ReportError(string format, params object[] parameters) => TrackReport(-1, -1, false, format, parameters);
public static void ReportError(int line, int column, string message) => TrackReportWorker(line, column, false, message);
public static void ReportError(int line, int column, string format, object param) => TrackReport(line, column, false, format, param);
public static void ReportError(
int line,
int column,
string format,
object param1,
object param2)
{
TrackReport(line, column, false, format, param1, param2);
}
public static void ReportError(int line, int column, string format, params object[] parameters) => TrackReport(line, column, false, format, parameters);
public static void ReportWarning(string message) => TrackReportWorker(-1, -1, true, message);
public static void ReportWarning(string format, object param) => TrackReport(-1, -1, true, format, param);
public static void ReportWarning(string format, object param1, object param2) => TrackReport(-1, -1, true, format, param1, param2);
public static void ReportWarning(string format, params object[] parameters) => TrackReport(-1, -1, true, format, parameters);
public static void ReportWarning(int line, int column, string message) => TrackReportWorker(line, column, true, message);
public static void ReportWarning(int line, int column, string format, object param) => TrackReport(line, column, true, format, param);
public static void ReportWarning(int line, int column, string format, params object[] parameters) => TrackReport(line, column, true, format, parameters);
private static void TrackReportWorker(int line, int column, bool warning, string message)
{
@@ -150,78 +113,11 @@ namespace Microsoft.Iris.Session
++s_totalErrorsReported;
}
public static void TrackReport(
int line,
int column,
bool warning,
string format,
object param)
public static void TrackReport(int line, int column, bool warning, string format, params object[] parameters)
{
string message = null;
if (!IgnoringErrors)
message = string.Format(format, param);
TrackReportWorker(line, column, warning, message);
}
public static void TrackReport(
int line,
int column,
bool warning,
string format,
object param1,
object param2)
{
string message = null;
if (!IgnoringErrors)
message = string.Format(format, param1, param2);
TrackReportWorker(line, column, warning, message);
}
public static void TrackReport(
int line,
int column,
bool warning,
string format,
object param1,
object param2,
object param3)
{
string message = null;
if (!IgnoringErrors)
message = string.Format(format, param1, param2, param3);
TrackReportWorker(line, column, warning, message);
}
public static void TrackReport(
int line,
int column,
bool warning,
string format,
object param1,
object param2,
object param3,
object param4)
{
string message = null;
if (!IgnoringErrors)
message = string.Format(format, param1, param2, param3, param4);
TrackReportWorker(line, column, warning, message);
}
public static void TrackReport(
int line,
int column,
bool warning,
string format,
object param1,
object param2,
object param3,
object param4,
object param5)
{
string message = null;
if (!IgnoringErrors)
message = string.Format(format, param1, param2, param3, param4, param5);
message = string.Format(format, parameters);
TrackReportWorker(line, column, warning, message);
}
test/testA.uix
+5
View File
@@ -0,0 +1,5 @@
<UIX xmlns="http://schemas.microsoft.com/2007/uix">
<UI>
</UI>
</UIX>