Add error suppression to make listing work better.

zh2angijun · Apr 25, 2018 · d6e77ed · d6e77ed
1 parent 550e197
commit d6e77ed
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/tools/ColorTool/ColorTool/ISchemeParser.cs b/tools/ColorTool/ColorTool/ISchemeParser.cs
@@ -9,6 +9,6 @@ interface ISchemeParser
     {
         string Name { get; }
 
-        uint[] ParseScheme(string schemeName);
+        uint[] ParseScheme(string schemeName, bool reportErrors = true);
     }
 }
diff --git a/tools/ColorTool/ColorTool/IniSchemeParser.cs b/tools/ColorTool/ColorTool/IniSchemeParser.cs
@@ -107,7 +107,7 @@ static string FindIniScheme(string schemeName)
             return null;
         }
 
-        public uint[] ParseScheme(string schemeName)
+        public uint[] ParseScheme(string schemeName, bool reportErrors = true)
         {
             bool success = true;
 
@@ -127,7 +127,10 @@ public uint[] ParseScheme(string schemeName)
                 if (tableStrings[i].Length <= 0)
                 {
                     success = false;
-                    Console.WriteLine(string.Format(Resources.IniParseError, filename, name, tableStrings[i]));
+                    if (reportErrors)
+                    {
+                        Console.WriteLine(string.Format(Resources.IniParseError, filename, name, tableStrings[i]));
+                    }
                     break;
                 }
             }
@@ -144,7 +147,10 @@ public uint[] ParseScheme(string schemeName)
                 }
                 catch (Exception /*e*/)
                 {
-                    Console.WriteLine(string.Format(Resources.IniLoadError, filename));
+                    if (reportErrors)
+                    {
+                        Console.WriteLine(string.Format(Resources.IniLoadError, filename));
+                    }
 
                     colorTable = null;
                 }

diff --git a/tools/ColorTool/ColorTool/Program.cs b/tools/ColorTool/ColorTool/Program.cs
@@ -199,7 +199,7 @@ static void PrintSchemes()
                 string fgText = " gYw ";
                 foreach (string schemeName in Directory.GetFiles("./schemes/").Select(Path.GetFileName))
                 {
-                    uint[] colorTable = GetSchemeUints(schemeName);
+                    uint[] colorTable = GetSchemeUints(schemeName, false);
                     if (colorTable != null)
                     {
                         string colors = string.Empty;
@@ -389,11 +389,11 @@ private static IEnumerable<ISchemeParser> GetParsers()
                 .Select(t => (ISchemeParser)Activator.CreateInstance(t));
         }
 
-        private static uint[] GetSchemeUints(string schemeName)
+        private static uint[] GetSchemeUints(string schemeName, bool reportErrors = true)
         {
             foreach (var parser in GetParsers())
             {
-                uint[] table = parser.ParseScheme(schemeName);
+                uint[] table = parser.ParseScheme(schemeName, reportErrors);
                 if (table != null)
                 {
                     return table;

diff --git a/tools/ColorTool/ColorTool/Properties/launchSettings.json b/tools/ColorTool/ColorTool/Properties/launchSettings.json
@@ -0,0 +1,7 @@
+{
+  "profiles": {
+    "ColorTool": {
+      "commandName": "Project"
+    }
+  }
+}
diff --git a/tools/ColorTool/ColorTool/XmlSchemeParser.cs b/tools/ColorTool/ColorTool/XmlSchemeParser.cs
@@ -123,7 +123,7 @@ static XmlDocument loadXmlScheme(string schemeName)
         }
 
 
-        public uint[] ParseScheme(string schemeName)
+        public uint[] ParseScheme(string schemeName, bool reportErrors = true)
         {
             XmlDocument xmlDoc = loadXmlScheme(schemeName); // Create an XML document object
             if (xmlDoc == null) return null;
@@ -167,7 +167,10 @@ public uint[] ParseScheme(string schemeName)
             }
             if (colorsFound < COLOR_TABLE_SIZE)
             {
-                Console.WriteLine(Resources.InvalidNumberOfColors);
+                if (reportErrors)
+                {
+                    Console.WriteLine(Resources.InvalidNumberOfColors);
+                }
                 success = false;
             }
             if (!success)