added .swift-format.json; interpolation now expands more syntax correctly

RandomHashTags · RandomHashTags · commit 9fe30ab54d7e · 2024-11-29T15:55:27.000-06:00
diff --git a/.swift-format.json b/.swift-format.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "lineLength": 100,
+    "indentation": {
+        "spaces": 2
+    },
+    "indentBlankLines": false,
+    "maximumBlankLines": 1,
+    "respectsExistingLineBreaks": true,
+    "lineBreakBeforeControlFlowKeywords": false,
+    "lineBreakBeforeEachArgument": false,
+    "multiElementCollectionTrailingCommas": true,
+    "spacesAroundRangeFormationOperators": false
+}
diff --git a/Sources/HTMLKitUtilities/interpolation/singleLineDescription/DeclSLD.swift b/Sources/HTMLKitUtilities/interpolation/singleLineDescription/DeclSLD.swift
@@ -14,7 +14,7 @@ public extension DeclSyntaxProtocol {
             string = variable.singleLineDescription
         } else {
             string = "\(self)"
-            //print("DeclSLD;DeclSyntax;singleLineDescription;self=" + self.debugDescription)
+            //print("DeclSLD;singleLineDescription;self=" + self.debugDescription)
             return ""
         }
         string.stripLeadingAndTrailingWhitespace()
diff --git a/Sources/HTMLKitUtilities/interpolation/singleLineDescription/ExprSLD.swift b/Sources/HTMLKitUtilities/interpolation/singleLineDescription/ExprSLD.swift
@@ -36,14 +36,16 @@ public extension ExprSyntaxProtocol {
             string = member.singleLineDescription
         } else if let string_expr:StringLiteralExprSyntax = stringLiteral {
             string = string_expr.singleLineDescription
+        } else if let switch_expr:SwitchExprSyntax = self.as(SwitchExprSyntax.self) {
+            string = switch_expr.singleLineDescription
         } else if let ternary:TernaryExprSyntax = self.as(TernaryExprSyntax.self) {
             string = ternary.singleLineDescription
         } else if let tuple:TupleExprSyntax = self.as(TupleExprSyntax.self) {
             string = tuple.singleLineDescription
         } else {
             string = "\(self)"
             //string = (self as SyntaxProtocol).singleLineDescription
-            //print("ExprSLD;ExprSyntax;singleLineDescription;self=" + self.debugDescription)
+            //print("ExprSLD;singleLineDescription;self=" + self.debugDescription)
             return ""
         }
         string.stripLeadingAndTrailingWhitespace()
@@ -231,6 +233,17 @@ public extension StringLiteralExprSyntax {
     }
 }
 
+// MARK: SwitchExpr
+public extension SwitchExprSyntax {
+    var singleLineDescription : String {
+        var string:String = ""
+        for c in cases {
+            string += c.singleLineDescription
+        }
+        return "switch " + subject.singleLineDescription + " { " + string + " }"
+    }
+}
+
 // MARK: TernaryExpr
 public extension TernaryExprSyntax {
     var singleLineDescription : String {
diff --git a/Sources/HTMLKitUtilities/interpolation/singleLineDescription/PatternSLD.swift b/Sources/HTMLKitUtilities/interpolation/singleLineDescription/PatternSLD.swift
@@ -10,11 +10,13 @@ import SwiftSyntax
 public extension PatternSyntaxProtocol {
     var singleLineDescription : String {
         var string:String
-        if let identifier:IdentifierPatternSyntax = self.as(IdentifierPatternSyntax.self) {
+        if let expression:ExpressionPatternSyntax = self.as(ExpressionPatternSyntax.self) {
+            string = expression.singleLineDescription
+        } else if let identifier:IdentifierPatternSyntax = self.as(IdentifierPatternSyntax.self) {
             string = identifier.singleLineDescription
         } else {
             string = "\(self)"
-            //print("PatternSLD;PatternSyntaxProtocol;singleLineDescription;self=" + self.debugDescription)
+            //print("PatternSLD;singleLineDescription;self=" + self.debugDescription)
             return ""
         }
         string.stripLeadingAndTrailingWhitespace()
@@ -29,16 +31,9 @@ public extension IdentifierPatternSyntax {
     }
 }
 
-// MARK: PatternBinding
-public extension PatternBindingSyntax {
+// MARK: ExpressionPattern
+public extension ExpressionPatternSyntax {
     var singleLineDescription : String {
-        var string:String = pattern.singleLineDescription
-        if let annotation:TypeAnnotationSyntax = typeAnnotation {
-            string += annotation.singleLineDescription
-        }
-        if let initializer:InitializerClauseSyntax = initializer {
-            string += " " + initializer.singleLineDescription
-        }
-        return string
+        return expression.singleLineDescription
     }
 }
diff --git a/Sources/HTMLKitUtilities/interpolation/singleLineDescription/StmtSLD.swift b/Sources/HTMLKitUtilities/interpolation/singleLineDescription/StmtSLD.swift
@@ -10,27 +10,45 @@ import SwiftSyntax
 public extension StmtSyntaxProtocol {
     var singleLineDescription : String {
         var string:String
-        if let expression:ExpressionStmtSyntax = self.as(ExpressionStmtSyntax.self) {
+        if let brk:BreakStmtSyntax = self.as(BreakStmtSyntax.self) {
+            string = brk.singleLineDescription
+        } else if let expression:ExpressionStmtSyntax = self.as(ExpressionStmtSyntax.self) {
             string = expression.singleLineDescription
+        } else if let ft:FallThroughStmtSyntax = self.as(FallThroughStmtSyntax.self) {
+            string = ft.singleLineDescription
         } else if let return_stmt:ReturnStmtSyntax = self.as(ReturnStmtSyntax.self) {
             string = return_stmt.singleLineDescription
         } else {
             string = "\(self)"
-            //print("StmtSLD;StmtSyntax;singleLineDescription;self=" + self.debugDescription)
+            //print("StmtSLD;singleLineDescription;self=" + self.debugDescription)
             return ""
         }
         string.stripLeadingAndTrailingWhitespace()
         return string
     }
 }
 
+// MARK: BreakStmt
+public extension BreakStmtSyntax {
+    var singleLineDescription : String {
+        return "break"
+    }
+}
+
 // MARK: ExpressionStmt
 public extension ExpressionStmtSyntax {
     var singleLineDescription : String {
         return expression.singleLineDescription
     }
 }
 
+// MARK: FallthroughStmt
+public extension FallThroughStmtSyntax {
+    var singleLineDescription : String {
+        return "fallthrough"
+    }
+}
+
 // MARK: ReturnStmt
 public extension ReturnStmtSyntax {
     var singleLineDescription : String {
diff --git a/Sources/HTMLKitUtilities/interpolation/singleLineDescription/SyntaxSLD.swift b/Sources/HTMLKitUtilities/interpolation/singleLineDescription/SyntaxSLD.swift
@@ -39,20 +39,39 @@ public extension SyntaxProtocol {
             string = binding.singleLineDescription
         } else if let stmt:StmtSyntax = self.as(StmtSyntax.self) {
             string = stmt.singleLineDescription
+        } else if let s_case:SwitchCaseSyntax = self.as(SwitchCaseSyntax.self) {
+            string = s_case.singleLineDescription
+        } else if let s_case_label:SwitchCaseLabelSyntax = self.as(SwitchCaseLabelSyntax.self) {
+            string = s_case_label.singleLineDescription
+        } else if let s_default:SwitchDefaultLabelSyntax = self.as(SwitchDefaultLabelSyntax.self) {
+            string = s_default.singleLineDescription
+        } else if let s_case_item:SwitchCaseItemSyntax = self.as(SwitchCaseItemSyntax.self) {
+            string = s_case_item.singleLineDescription
         } else if let type:TypeSyntaxProtocol = self.as(TypeSyntax.self) {
             string = type.singleLineDescription
         } else if let annotation:TypeAnnotationSyntax = self.as(TypeAnnotationSyntax.self) {
             string = annotation.singleLineDescription
         } else {
             string = "\(self)"
-            //print("SyntaxSLD;SyntaxProtocol;singleLineDescription;self=" + self.debugDescription)
+            //print("SyntaxSLD;singleLineDescription;self=" + self.debugDescription)
             return ""
         }
         string.stripLeadingAndTrailingWhitespace()
         return string
     }
 }
 
+// MARK: CodeBlockItemList
+public extension CodeBlockItemListSyntax {
+    var singleLineDescription : String {
+        var string:String = ""
+        for item in self {
+            string += (string.isEmpty ? "" : "; ") + item.singleLineDescription
+        }
+        return string
+    }
+}
+
 // MARK: CodeBlockItem
 public extension CodeBlockItemSyntax {
     var singleLineDescription : String {
@@ -76,4 +95,50 @@ public extension InitializerClauseSyntax {
     var singleLineDescription : String {
         return "= " + value.singleLineDescription
     }
+}
+
+// MARK: PatternBinding
+public extension PatternBindingSyntax {
+    var singleLineDescription : String {
+        var string:String = pattern.singleLineDescription
+        if let annotation:TypeAnnotationSyntax = typeAnnotation {
+            string += annotation.singleLineDescription
+        }
+        if let initializer:InitializerClauseSyntax = initializer {
+            string += " " + initializer.singleLineDescription
+        }
+        return string
+    }
+}
+
+// MARK: SwitchCase
+public extension SwitchCaseSyntax {
+    var singleLineDescription : String {
+        return label.singleLineDescription + ": " + statements.singleLineDescription + "; "
+    }
+}
+
+// MARK: SwitchCaseItemSyntax
+public extension SwitchCaseItemSyntax {
+    var singleLineDescription : String {
+        return pattern.singleLineDescription
+    }
+}
+
+// MARK: SwitchCaseLabelSyntax
+public extension SwitchCaseLabelSyntax {
+    var singleLineDescription : String {
+        var string:String = ""
+        for item in caseItems {
+            string += (string.isEmpty ? "" : ", ") + item.singleLineDescription
+        }
+        return "case " + string
+    }
+}
+
+// MARK: SwitchDefaultLabelSyntax
+public extension SwitchDefaultLabelSyntax {
+    var singleLineDescription : String {
+        return "default"
+    }
 }
diff --git a/Sources/HTMLKitUtilities/interpolation/singleLineDescription/TypeSLD.swift b/Sources/HTMLKitUtilities/interpolation/singleLineDescription/TypeSLD.swift
@@ -14,7 +14,7 @@ public extension TypeSyntaxProtocol {
             string = identifier.singleLineDescription
         } else {
             string = "\(self)"
-            //print("TypeSLD;TypeSyntaxProtocol;singleLineDescription;self=" + self.debugDescription)
+            //print("TypeSLD;singleLineDescription;self=" + self.debugDescription)
             return ""
         }
         string.stripLeadingAndTrailingWhitespace()
diff --git a/Tests/HTMLKitTests/InterpolationTests.swift b/Tests/HTMLKitTests/InterpolationTests.swift
@@ -138,6 +138,12 @@ struct InterpolationTests {
                 bro = "bruh"
             } else {
             }
+            switch bro {
+                case "um":
+                    break
+                default:
+                    break
+            }
             return false ? bro : ""
         } ))
         #expect(string == expected_result)

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public extension DeclSyntaxProtocol {`
`14`	`14`	`string = variable.singleLineDescription`
`15`	`15`	`} else {`
`16`	`16`	`string = "\(self)"`
`17`		`- //print("DeclSLD;DeclSyntax;singleLineDescription;self=" + self.debugDescription)`
	`17`	`+ //print("DeclSLD;singleLineDescription;self=" + self.debugDescription)`
`18`	`18`	`return ""`
`19`	`19`	`}`
`20`	`20`	`string.stripLeadingAndTrailingWhitespace()`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public extension TypeSyntaxProtocol {`
`14`	`14`	`string = identifier.singleLineDescription`
`15`	`15`	`} else {`
`16`	`16`	`string = "\(self)"`
`17`		`- //print("TypeSLD;TypeSyntaxProtocol;singleLineDescription;self=" + self.debugDescription)`
	`17`	`+ //print("TypeSLD;singleLineDescription;self=" + self.debugDescription)`
`18`	`18`	`return ""`
`19`	`19`	`}`
`20`	`20`	`string.stripLeadingAndTrailingWhitespace()`