Move switch statement bodies to their own lines (#5493)

* Move switch statement bodies to their own lines

* format

---------

Co-authored-by: Yong He <yonghe@outlook.com>

3 files changed, 147 insertions, 59 deletions

diff --git a/tools/slang-test/parse-diagnostic-util.cpp b/tools/slang-test/parse-diagnostic-util.cpp
index 74012d4d2..5668868bf 100644
--- a/tools/slang-test/parse-diagnostic-util.cpp
+++ b/tools/slang-test/parse-diagnostic-util.cpp
@@ -84,10 +84,17 @@ static SlangResult _getSlangDiagnosticSeverity(
 
     switch (index)
     {
-    case -1: return SLANG_FAIL;
-    case 0:  outSeverity = ArtifactDiagnostic::Severity::Info; break;
-    case 1:  outSeverity = ArtifactDiagnostic::Severity::Warning; break;
-    default: outSeverity = ArtifactDiagnostic::Severity::Error; break;
+    case -1:
+        return SLANG_FAIL;
+    case 0:
+        outSeverity = ArtifactDiagnostic::Severity::Info;
+        break;
+    case 1:
+        outSeverity = ArtifactDiagnostic::Severity::Warning;
+        break;
+    default:
+        outSeverity = ArtifactDiagnostic::Severity::Error;
+        break;
     }
 
     outCode = 0;
@@ -260,9 +267,12 @@ static SlangResult _findDownstreamCompiler(
 {
     switch (compilerIdentity.m_type)
     {
-    case CompilerIdentity::Slang:              return &parseSlangLine;
-    case CompilerIdentity::DownstreamCompiler: return &parseGenericLine;
-    default:                                   return nullptr;
+    case CompilerIdentity::Slang:
+        return &parseSlangLine;
+    case CompilerIdentity::DownstreamCompiler:
+        return &parseGenericLine;
+    default:
+        return nullptr;
     }
 }
 
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index 904f6683a..fccba8fd8 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -190,9 +190,12 @@ void skipHorizontalSpace(char const** ioCursor)
         switch (*cursor)
         {
         case ' ':
-        case '\t': cursor++; continue;
+        case '\t':
+            cursor++;
+            continue;
 
-        default: break;
+        default:
+            break;
         }
 
         break;
@@ -208,7 +211,9 @@ void skipToEndOfLine(char const** ioCursor)
         int c = *cursor;
         switch (c)
         {
-        default: cursor++; continue;
+        default:
+            cursor++;
+            continue;
 
         case '\r':
         case '\n':
@@ -221,7 +226,9 @@ void skipToEndOfLine(char const** ioCursor)
                 }
             }
             [[fallthrough]];
-        case 0: *ioCursor = cursor; return;
+        case 0:
+            *ioCursor = cursor;
+            return;
         }
     }
 }
@@ -256,7 +263,8 @@ static bool _isEndOfLineOrParens(char c)
         {
             return true;
         }
-    default: return false;
+    default:
+        return false;
     }
 }
 
@@ -409,14 +417,18 @@ static SlangResult _gatherTestOptions(
     {
         switch (*cursor)
         {
-        default: cursor++; continue;
+        default:
+            cursor++;
+            continue;
 
         case '(':
-        case ':': break;
+        case ':':
+            break;
 
         case 0:
         case '\r':
-        case '\n': return SLANG_FAIL;
+        case '\n':
+            return SLANG_FAIL;
         }
 
         break;
@@ -456,7 +468,8 @@ static SlangResult _gatherTestOptions(
             *ioCursor = cursor;
             return SLANG_OK;
 
-        default: break;
+        default:
+            break;
         }
 
         // Let's try to read one option
@@ -1408,7 +1421,8 @@ ToolReturnCode spawnAndWait(
                 spawnAndWaitTestServer(context, finalSpawnType, testPath, cmdLine, outExeRes);
             break;
         }
-    default: break;
+    default:
+        break;
     }
 
     if (SLANG_FAILED(spawnResult))
@@ -1540,9 +1554,12 @@ TestResult asTestResult(ToolReturnCode code)
 {
     switch (code)
     {
-    case ToolReturnCode::Success: return TestResult::Pass;
-    case ToolReturnCode::Ignored: return TestResult::Ignored;
-    default:                      return TestResult::Fail;
+    case ToolReturnCode::Success:
+        return TestResult::Pass;
+    case ToolReturnCode::Ignored:
+        return TestResult::Ignored;
+    default:
+        return TestResult::Fail;
     }
 }
 
@@ -1630,7 +1647,8 @@ static bool _areResultsEqual(TestOptions::Type type, const String& a, const Stri
     {
     case TestOptions::Type::Diagnostic:
         return _areDiagnosticsEqual(a.getUnownedSlice(), b.getUnownedSlice());
-    case TestOptions::Type::Normal: return a == b;
+    case TestOptions::Type::Normal:
+        return a == b;
     default:
         {
             SLANG_ASSERT(!"Unknown test type");
@@ -4000,7 +4018,8 @@ static void _calcSynthesizedTests(
                     {
                         isCrossCompile = false;
                     }
-                default: break;
+                default:
+                    break;
                 }
 
                 if (!isCrossCompile)
@@ -4419,7 +4438,9 @@ void runTestsInDirectory(TestContext* context, String directoryPath)
     switch (context->options.defaultSpawnType)
     {
     case SpawnType::UseFullyIsolatedTestServer:
-    case SpawnType::UseTestServer:              useMultiThread = true; break;
+    case SpawnType::UseTestServer:
+        useMultiThread = true;
+        break;
     }
     if (context->options.serverCount == 1)
     {
@@ -4467,9 +4488,12 @@ static TestResult _asTestResult(ToolReturnCode retCode)
 {
     switch (retCode)
     {
-    default:                      return TestResult::Fail;
-    case ToolReturnCode::Success: return TestResult::Pass;
-    case ToolReturnCode::Ignored: return TestResult::Ignored;
+    default:
+        return TestResult::Fail;
+    case ToolReturnCode::Success:
+        return TestResult::Pass;
+    case ToolReturnCode::Ignored:
+        return TestResult::Ignored;
     }
 }
 
diff --git a/tools/slang-test/test-reporter.cpp b/tools/slang-test/test-reporter.cpp
index dad93e868..88d24d212 100644
--- a/tools/slang-test/test-reporter.cpp
+++ b/tools/slang-test/test-reporter.cpp
@@ -16,12 +16,23 @@ static void appendXmlEncode(char c, StringBuilder& out)
 {
     switch (c)
     {
-    case '&':  out << "&amp;"; break;
-    case '<':  out << "&lt;"; break;
-    case '>':  out << "&gt;"; break;
-    case '\'': out << "&apos;"; break;
-    case '"':  out << "&quot;"; break;
-    default:   out.append(c);
+    case '&':
+        out << "&amp;";
+        break;
+    case '<':
+        out << "&lt;";
+        break;
+    case '>':
+        out << "&gt;";
+        break;
+    case '\'':
+        out << "&apos;";
+        break;
+    case '"':
+        out << "&quot;";
+        break;
+    default:
+        out.append(c);
     }
 }
 
@@ -105,7 +116,8 @@ bool TestReporter::canWriteStdError() const
         {
             return false;
         }
-    default: return true;
+    default:
+        return true;
     }
 }
 
@@ -247,13 +259,20 @@ static char _getTeamCityEscapeChar(char c)
 {
     switch (c)
     {
-    case '|':  return '|';
-    case '\'': return '\'';
-    case '\n': return 'n';
-    case '\r': return 'r';
-    case '[':  return '[';
-    case ']':  return ']';
-    default:   return 0;
+    case '|':
+        return '|';
+    case '\'':
+        return '\'';
+    case '\n':
+        return 'n';
+    case '\r':
+        return 'r';
+    case '[':
+        return '[';
+    case ']':
+        return ']';
+    default:
+        return 0;
     }
 }
 
@@ -325,14 +344,24 @@ void TestReporter::_addResult(TestInfo info)
 
     switch (info.testResult)
     {
-    case TestResult::Fail: m_failedTestCount++; break;
+    case TestResult::Fail:
+        m_failedTestCount++;
+        break;
 
-    case TestResult::Pass:         m_passedTestCount++; break;
-    case TestResult::ExpectedFail: m_expectedFailedTestCount++; break;
+    case TestResult::Pass:
+        m_passedTestCount++;
+        break;
+    case TestResult::ExpectedFail:
+        m_expectedFailedTestCount++;
+        break;
 
-    case TestResult::Ignored: m_ignoredTestCount++; break;
+    case TestResult::Ignored:
+        m_ignoredTestCount++;
+        break;
 
-    default: assert(!"unexpected"); break;
+    default:
+        assert(!"unexpected");
+        break;
     }
 
     m_testInfos.add(info);
@@ -342,11 +371,21 @@ void TestReporter::_addResult(TestInfo info)
         char const* resultString = "UNEXPECTED";
         switch (info.testResult)
         {
-        case TestResult::Fail:         resultString = "FAILED"; break;
-        case TestResult::ExpectedFail: resultString = "failed(expected)"; break;
-        case TestResult::Pass:         resultString = "passed"; break;
-        case TestResult::Ignored:      resultString = "ignored"; break;
-        default:                       assert(!"unexpected"); break;
+        case TestResult::Fail:
+            resultString = "FAILED";
+            break;
+        case TestResult::ExpectedFail:
+            resultString = "failed(expected)";
+            break;
+        case TestResult::Pass:
+            resultString = "passed";
+            break;
+        case TestResult::Ignored:
+            resultString = "ignored";
+            break;
+        default:
+            assert(!"unexpected");
+            break;
         }
 
         StringBuilder buffer;
@@ -443,7 +482,9 @@ void TestReporter::_addResult(TestInfo info)
                     }
                     break;
                 }
-            default: assert(!"unexpected"); break;
+            default:
+                assert(!"unexpected");
+                break;
             }
 
             printf("##teamcity[testFinished name='%s']\n", escapedTestName.begin());
@@ -461,12 +502,22 @@ void TestReporter::_addResult(TestInfo info)
             char const* resultString = "None";
             switch (info.testResult)
             {
-            case TestResult::Fail:         resultString = "Failed"; break;
-            case TestResult::Pass:         resultString = "Passed"; break;
-            case TestResult::Ignored:      resultString = "Ignored"; break;
-            case TestResult::ExpectedFail: resultString = "ExpectedFail"; break;
+            case TestResult::Fail:
+                resultString = "Failed";
+                break;
+            case TestResult::Pass:
+                resultString = "Passed";
+                break;
+            case TestResult::Ignored:
+                resultString = "Ignored";
+                break;
+            case TestResult::ExpectedFail:
+                resultString = "ExpectedFail";
+                break;
 
-            default: assert(!"unexpected"); break;
+            default:
+                assert(!"unexpected");
+                break;
             }
 
             // https://www.appveyor.com/docs/build-worker-api/#add-tests
@@ -704,7 +755,8 @@ void TestReporter::outputSummary()
                             printf("      <skip>Ignored</skip>\n");
                             break;
                         }
-                    default: break;
+                    default:
+                        break;
                     }
                     printf("    </testcase>\n");
                 }
@@ -744,7 +796,8 @@ void TestReporter::startSuite(const String& name)
             }
             break;
         }
-    default: break;
+    default:
+        break;
     }
 }
 
@@ -765,7 +818,8 @@ void TestReporter::endSuite()
             }
             break;
         }
-    default: break;
+    default:
+        break;
     }
 
     m_suiteStack.removeLast();