Merge pull request #16 from tayloraswift/tag-crawling

swift 5.9 support

Author: tayloraswift

Assets/css/Main.css

@@ -1,4 +1,4 @@
-// swift-tools-version:5.8
+// swift-tools-version:5.9
 import PackageDescription
 
 let package:Package = .init(
@@ -75,8 +75,6 @@ let package:Package = .init(
         .package(url: "https://github.com/tayloraswift/swift-mongodb", .upToNextMinor(
             from: "0.8.2")),
 
-        .package(url: "https://github.com/swift-server/swift-backtrace", .upToNextMinor(
-            from: "1.3.4")),
         .package(url: "https://github.com/apple/swift-nio", .upToNextMinor(
             from: "2.57.0")),
         .package(url: "https://github.com/apple/swift-nio-http2", .upToNextMinor(
@@ -88,7 +86,7 @@ let package:Package = .init(
         .package(url: "https://github.com/apple/swift-system", .upToNextMinor(
             from: "1.2.1")),
         .package(url: "https://github.com/apple/swift-syntax",
-            exact: "508.0.1"),
+            exact: "509.0.0"),
     ],
     targets:
     [
@@ -239,7 +237,7 @@ let package:Package = .init(
                 .target(name: "Signatures"),
                 .target(name: "Symbols"),
 
-                .product(name: "IDEUtils", package: "swift-syntax"),
+                .product(name: "SwiftIDEUtils", package: "swift-syntax"),
                 .product(name: "SwiftParser", package: "swift-syntax"),
             ]),
 
@@ -456,8 +454,6 @@ let package:Package = .init(
                 .target(name: "Multiparts"),
                 .target(name: "System"),
                 .target(name: "UnidocPages"),
-
-                .product(name: "Backtrace", package: "swift-backtrace"),
             ]),
 
 

Assets/css/Main.css.map

@@ -5,7 +5,7 @@ import NIOPosix
 import TraceableErrors
 
 public
-protocol ServerAuthority<SecurityContext>
+protocol ServerAuthority<SecurityContext>:Sendable
 {
     associatedtype SecurityContext = Never
 

Package.resolved

@@ -149,22 +149,22 @@ extension JSON.KeyedDecoder:KeyedDecodingContainerProtocol
     }
 
     public
-    func singleValueContainer<Key>(forKey key:Key,
-        typed _:Key.Type = Key.self) throws -> JSON.SingleValueDecoder
-        where Key:CodingKey
+    func singleValueContainer<NestedKey>(forKey key:NestedKey,
+        typed _:NestedKey.Type = NestedKey.self) throws -> JSON.SingleValueDecoder
+        where NestedKey:CodingKey
     {
         let value:JSON.Node = try self.diagnose(key){ $0 }
         let decoder:JSON.SingleValueDecoder = .init(value,
             path: self.codingPath + CollectionOfOne<any CodingKey>.init(key))
         return decoder
     }
     public
-    func nestedUnkeyedContainer(forKey key:Key) throws -> UnkeyedDecodingContainer
+    func nestedUnkeyedContainer(forKey key:Key) throws -> any UnkeyedDecodingContainer
     {
         let path:[any CodingKey] = self.codingPath + CollectionOfOne<any CodingKey>.init(key)
         let container:JSON.UnkeyedDecoder =
             .init(try self.diagnose(key, \.array), path: path)
-        return container as UnkeyedDecodingContainer
+        return container as any UnkeyedDecodingContainer
     }
     public
     func nestedContainer<NestedKey>(keyedBy _:NestedKey.Type,

Package.swift

@@ -12,12 +12,12 @@ extension JSON.Node:Decoder
     }
 
     public
-    func singleValueContainer() -> SingleValueDecodingContainer
+    func singleValueContainer() -> any SingleValueDecodingContainer
     {
-        JSON.SingleValueDecoder.init(self, path: []) as SingleValueDecodingContainer
+        JSON.SingleValueDecoder.init(self, path: []) as any SingleValueDecodingContainer
     }
     public
-    func unkeyedContainer() throws -> UnkeyedDecodingContainer
+    func unkeyedContainer() throws -> any UnkeyedDecodingContainer
     {
         try JSON.SingleValueDecoder.init(self, path: []).unkeyedContainer()
     }

Sources/HTTPServer/Authorities/ServerAuthority.swift

@@ -3,7 +3,7 @@ import Grammar
 extension JSON.NodeRule
 {
     /// A literal `null` expression.
-    enum Null<Location>:LiteralRule
+    enum Null:LiteralRule
     {
         typealias Terminal = UInt8
 

Sources/JSONLegacy/CodableCompatibility/JSON.KeyedDecoder.swift

@@ -1,5 +1,5 @@
-import IDEUtils
 import MarkdownABI
+import SwiftIDEUtils
 
 extension MarkdownBytecode.Context
 {
@@ -8,30 +8,28 @@ extension MarkdownBytecode.Context
         switch classification
         {
         case    .none,
-                .editorPlaceholder:         return nil
+                .editorPlaceholder:     return nil
 
-        case    .attribute:                 self = .attribute
+        case    .attribute:             self = .attribute
 
-        case    .buildConfigId:             self = .directive
-        case    .poundDirectiveKeyword:     self = .magic
+        case    .ifConfigDirective:     self = .directive
 
         case    .lineComment,
-                .blockComment:              self = .comment
+                .blockComment:          self = .comment
         case    .docLineComment,
-                .docBlockComment:           self = .doccomment
+                .docBlockComment:       self = .doccomment
 
-        case    .dollarIdentifier:          self = .pseudo
-        case    .identifier:                self = .identifier
-        case    .operatorIdentifier:        self = .operator
+        case    .dollarIdentifier:      self = .pseudo
+        case    .identifier:            self = .identifier
+        case    .operator:              self = .operator
 
         case    .integerLiteral,
-                .floatingLiteral:           self = .literalNumber
+                .floatLiteral:          self = .literalNumber
         case    .stringLiteral,
-                .objectLiteral:             self = .literalString
+                .regexLiteral:          self = .literalString
 
-        case    .keyword:                   self = .keyword
-        case    .stringInterpolationAnchor: self = .interpolation
-        case    .typeIdentifier:            self = .type
+        case    .keyword:               self = .keyword
+        case    .type:                  self = .type
         }
     }
 }

Sources/JSONLegacy/CodableCompatibility/JSON.Node (ext).swift

@@ -1,5 +1,5 @@
-import IDEUtils
 import MarkdownABI
+import SwiftIDEUtils
 import SwiftParser
 import SwiftSyntax
 

Sources/JSONParsing/Rules/JSON.NodeRule.Null.swift

@@ -72,15 +72,24 @@ extension Signature.Expanded
                     $0 += utf8[range]
 
                 case .text(let range, let color?, .toplevel?):
+                    if  case .attribute = color
+                    {
+                        switch String.init(decoding: utf8[range], as: Unicode.UTF8.self)
+                        {
+                        case "@attached":       keywords.attached = true
+                        case "@freestanding":   keywords.freestanding = true
+                        default:                break
+                        }
+                    }
                     if  case .keyword = color
                     {
                         //  The `actor` and `async` keywords are contextual; there is no
                         //  other way to detect them besides inspecting token text!
                         switch String.init(decoding: utf8[range], as: Unicode.UTF8.self)
                         {
-                        case "actor":   keywords.actor = true
-                        case "class":   keywords.class = true
-                        default:        break
+                        case "actor":           keywords.actor = true
+                        case "class":           keywords.class = true
+                        default:                break
                         }
                     }
 
@@ -90,7 +99,18 @@ extension Signature.Expanded
 
                     $0[color]
                     {
-                        if  let referent:Scalar = symbols.removeValue(forKey: range.lowerBound)
+                        let offset:Int
+                        if  case .attribute = color,
+                            case 0x40 = utf8[range.lowerBound] // '@'
+                        {
+                            offset = range.lowerBound + 1
+                        }
+                        else
+                        {
+                            offset = range.lowerBound
+                        }
+
+                        if  let referent:Scalar = symbols.removeValue(forKey: offset)
                         {
                             $0[.href] =
                             {

Sources/MarkdownPluginSwift/MarkdownBytecode.Context (ext).swift

@@ -8,13 +8,22 @@ extension Signature.Expanded
         public
         var actor:Bool
         public
+        var attached:Bool
+        public
         var `class`:Bool
+        public
+        var freestanding:Bool
 
         @inlinable public
-        init(actor:Bool = false, `class`:Bool = false)
+        init(actor:Bool = false,
+            attached:Bool = false,
+            `class`:Bool = false,
+            freestanding:Bool = false)
         {
             self.actor = actor
+            self.attached = attached
             self.class = `class`
+            self.freestanding = freestanding
         }
     }
 }