fixed bonker errors relating to Swift 6 changes

RandomHashTags · RandomHashTags · commit 826837317dc0 · 2024-09-17T21:41:00.000-05:00
diff --git a/Package.swift b/Package.swift
@@ -25,6 +25,7 @@ let package = Package(
                 .product(name: "SwiftSyntax", package: "swift-syntax"),
                 .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
                 .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
+                .product(name: "SwiftDiagnostics", package: "swift-syntax")
             ]
         ),
         .target(
diff --git a/Sources/HTMLKit/HTMLKit.swift b/Sources/HTMLKit/HTMLKit.swift
@@ -5,8 +5,6 @@
 //  Created by Evan Anderson on 9/14/24.
 //
 
-import HTMLKitMacros
-
 // MARK: Elements
 @freestanding(expression)
 public macro html(xmlns: String? = nil, _ innerHTML: [String]) -> String = #externalMacro(module: "HTMLKitMacros", type: "HTMLElement")
diff --git a/Sources/HTMLKitMacros/HTMLElement.swift b/Sources/HTMLKitMacros/HTMLElement.swift
@@ -5,32 +5,27 @@
 //  Created by Evan Anderson on 9/14/24.
 //
 
-import SwiftCompilerPlugin
 import SwiftSyntax
 import SwiftSyntaxMacros
-import SwiftSyntaxBuilder
-import SwiftDiagnostics
 
 struct HTMLElement : ExpressionMacro {
     static func expansion(of node: some FreestandingMacroExpansionSyntax, in context: some MacroExpansionContext) throws -> ExprSyntax {
-        return "\(raw: parse_element(node: node, context: context))"
+        return "\"\(raw: parse_element(node: node, context: context))\""
     }
 }
 
 extension HTMLElement {
     static func parse_element(node: some FreestandingMacroExpansionSyntax, context: some MacroExpansionContext) -> String {
-        let macroName:String = node.macroName.text
-        let type:HTMLElementType = HTMLElementType(rawValue: macroName) ?? HTMLElementType.a
+        let type:HTMLElementType = HTMLElementType(rawValue: node.macroName.text) ?? HTMLElementType.a
         let data:ElementData = parse_arguments(elementType: type, arguments: node.arguments)
         var string:String = (type == .html ? "<!DOCTYPE html>" : "") + "<" + type.rawValue + data.attributes + ">" + data.innerHTML
         if !type.isVoid {
             string += "</" + type.rawValue + ">"
         }
-        return "\"" + string + "\""
+        return string
     }
     static func parse_arguments(elementType: HTMLElementType, arguments: LabeledExprListSyntax) -> ElementData {
-        var attributes:[String] = []
-        var innerHTML:[String] = []
+        var attributes:[String] = [], innerHTML:[String] = []
         for element in arguments.children(viewMode: .all) {
             if let child:LabeledExprSyntax = element.as(LabeledExprSyntax.self) {
                 if let key:String = child.label?.text {
@@ -72,8 +67,7 @@ extension HTMLElement {
 }
 
 struct ElementData {
-    let attributes:String
-    let innerHTML:String
+    let attributes:String, innerHTML:String
 
     init(attributes: [String], innerHTML: [String]) {
         self.attributes = attributes.isEmpty ? "" : " " + attributes.joined(separator: " ")
@@ -212,7 +206,7 @@ private extension HTMLElement {
 }
 
 // MARK: HTMLElementType
-public enum HTMLElementType : String, CaseIterable {
+enum HTMLElementType : String {
     case html
     
     case a
@@ -346,7 +340,7 @@ public enum HTMLElementType : String, CaseIterable {
 
     case wbr
 
-    public var isVoid : Bool {
+    var isVoid : Bool {
         switch self {
             case .area, .base, .br, .col, .embed, .hr, .img, .input, .link, .meta, .source, .track, .wbr:
                 return true
diff --git a/Sources/HTMLKitMacros/HTMLKitMacros.swift b/Sources/HTMLKitMacros/HTMLKitMacros.swift
@@ -7,19 +7,6 @@
 
 import SwiftCompilerPlugin
 import SwiftSyntaxMacros
-import SwiftDiagnostics
-
-// MARK: ErrorDiagnostic
-struct ErrorDiagnostic : DiagnosticMessage {
-    let message:String
-    let diagnosticID:MessageID
-    let severity:DiagnosticSeverity = DiagnosticSeverity.error
-
-    init(id: String, message: String) {
-        self.message = message
-        self.diagnosticID = MessageID(domain: "HTMLKitMacros", id: id)
-    }
-}
 
 @main
 struct HTMLKitMacros : CompilerPlugin {
diff --git a/Tests/HTMLKitTests/HTMLKitTests.swift b/Tests/HTMLKitTests/HTMLKitTests.swift
@@ -68,13 +68,12 @@ extension HTMLKitTests {
                         #a([#div([#abbr()]), #address()]),
                         #div(),
                         #button(disabled: true),
-                        #video(autoplay: true, controls: false, height: nil, preload: .auto, src: "ezclap", width: 5),
-                        #video(autoplay: true, controls: false, height: nil, preload: .auto, src: "ezclap", width: "1cm"),
+                        #video(autoplay: true, controls: false, height: nil, preload: .auto, src: "ezclap", width: .centimeters(1)),
                     ]
                 )
             ])
         ])
-        XCTAssertEqual(test, "<!DOCTYPE html><html><body><div class=\"bing bong\" title=\"just seeing what blow's\" draggable=\"false\" inputmode=\"email\" hidden=\"hidden\">poggies<div></div><a><div><abbr></abbr></div><address></address></a><div></div><button disabled></button><video autoplay preload=\"auto\" src=\"ezclap\" width=\"5\"></video><video autoplay preload=\"auto\" src=\"ezclap\" width=\"1cm\"></video></div></body></html>")
+        XCTAssertEqual(test, "<!DOCTYPE html><html><body><div class=\"bing bong\" title=\"just seeing what blow's\" draggable=\"false\" inputmode=\"email\" hidden=\"hidden\">poggies<div></div><a><div><abbr></abbr></div><address></address></a><div></div><button disabled></button><video autoplay preload=\"auto\" src=\"ezclap\" width=\"1.0cm\"></video></div></body></html>")
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ let package = Package(`
`25`	`25`	`.product(name: "SwiftSyntax", package: "swift-syntax"),`
`26`	`26`	`.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),`
`27`	`27`	`.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),`
	`28`	`+ .product(name: "SwiftDiagnostics", package: "swift-syntax")`
`28`	`29`	`]`
`29`	`30`	`),`
`30`	`31`	`.target(`
Original file line number	Diff line number	Diff line change
`@@ -68,13 +68,12 @@ extension HTMLKitTests {`
`68`	`68`	`#a([#div([#abbr()]), #address()]),`
`69`	`69`	`#div(),`
`70`	`70`	`#button(disabled: true),`
`71`		`- #video(autoplay: true, controls: false, height: nil, preload: .auto, src: "ezclap", width: 5),`
`72`		`- #video(autoplay: true, controls: false, height: nil, preload: .auto, src: "ezclap", width: "1cm"),`
	`71`	`+ #video(autoplay: true, controls: false, height: nil, preload: .auto, src: "ezclap", width: .centimeters(1)),`
`73`	`72`	`]`
`74`	`73`	`)`
`75`	`74`	`])`
`76`	`75`	`])`
`77`		`- XCTAssertEqual(test, "<!DOCTYPE html><html><body><div class=\"bing bong\" title=\"just seeing what blow's\" draggable=\"false\" inputmode=\"email\" hidden=\"hidden\">poggies<div></div><a><div><abbr></abbr></div><address></address></a><div></div><button disabled></button><video autoplay preload=\"auto\" src=\"ezclap\" width=\"5\"></video><video autoplay preload=\"auto\" src=\"ezclap\" width=\"1cm\"></video></div></body></html>")`
	`76`	`+ XCTAssertEqual(test, "<!DOCTYPE html><html><body><div class=\"bing bong\" title=\"just seeing what blow's\" draggable=\"false\" inputmode=\"email\" hidden=\"hidden\">poggies<div></div><a><div><abbr></abbr></div><address></address></a><div></div><button disabled></button><video autoplay preload=\"auto\" src=\"ezclap\" width=\"1.0cm\"></video></div></body></html>")`
`78`	`77`	`}`
`79`	`78`	`}`
`80`	`79`