commit cd6f4b350aa15e4ef85beb8e4ca749994c80a99e · jonmsterling.com/swift-pterodactyl

+9 -2

Package.swift

···

       26
       26
        
       		)

     

       27
       27
        
       	],

     

       28
       28
        
       	dependencies: [

     

       29
       29
       -
       		.package(url: "https://github.com/apple/swift-llbuild2.git", branch: "main")

     

       29
       29
       +
       		//		.package(url: "https://github.com/ChimeHQ/LanguageServer", branch: "main"),

     

       30
       30
       +
       		.package(url: "https://github.com/ChimeHQ/LanguageServerProtocol", branch: "main"),

     

       31
       31
       +
       		.package(url: "https://github.com/apple/swift-llbuild2.git", branch: "main"),

     

       32
       32
       +
       		.package(url: "https://github.com/apple/swift-algorithms", from: "1.2.0")

     

       30
       33
        
       	],

     

       31
       34
        
       	targets: [

     

       32
       35
        
       		// Targets are the basic building blocks of a package, defining a module or a test suite.

     
···

       35
       38
        
       			name: "PterodactylKernel",

     

       36
       39
        
       		),

     

       37
       40
        
       		.target(

     

       38
       38
       -
       			name: "PterodactylSyntax"

     

       41
       41
       +
       			name: "PterodactylSyntax",

     

       42
       42
       +
       			dependencies: [

     

       43
       43
       +
       				.product(name: "Algorithms", package: "swift-algorithms"),

     

       44
       44
       +
       				"LanguageServerProtocol"

     

       45
       45
       +
       			]

     

       39
       46
        
       		),

     

       40
       47
        
       		.target(

     

       41
       48
        
       			name: "PterodactylBuild",

+15

Sources/PterodactylBuild/FXValue+Conformances.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       import llbuild2fx

     

       7
       7
       +
       import PterodactylSyntax

     

       8
       8
       +
       

     

       9
       9
       +
       extension SyntaxTree: FXValue {}

     

       10
       10
       +
       extension Token: FXValue {}

     

       11
       11
       +
       extension Graph: FXValue where Vertex: Codable {}

     

       12
       12
       +
       

     

       13
       13
       +
       extension String: @retroactive FXValue {}

     

       14
       14
       +
       extension Set: @retroactive FXValue where Element: Codable {}

     

       15
       15
       +
       extension LLBDataID: @retroactive FXValue {}

+11 -8

Sources/PterodactylBuild/Keys/AnalyseImports.swift Sources/PterodactylBuild/Keys/Blob-local operations/BlobImports.swift

···

       17
       17
        
       

     

       18
       18
        
       	public mutating func parseHeader() {

     

       19
       19
        
       		while true {

     

       20
       20
       -
       			let token = nextSignificantToken()

     

       20
       20
       +
       			guard let token = nextSignificantToken() else { return }

     

       21
       21
        
       			switch token.kind {

     

       22
       22
        
       			case .keyword(.import): parseImportStatement()

     

       23
       23
        
       			default: return

     
···

       26
       26
        
       	}

     

       27
       27
        
       

     

       28
       28
        
       	/// Returns the next non-whitespace token.

     

       29
       29
       -
       	private mutating func nextSignificantToken() -> Token {

     

       29
       29
       +
       	private mutating func nextSignificantToken() -> Token? {

     

       30
       30
        
       		var token = lexer.nextToken()

     

       31
       31
       -
       		while case .whitespace = token.kind {

     

       31
       31
       +
       		while token?.kind.isTrivia == true {

     

       32
       32
        
       			token = lexer.nextToken()

     

       33
       33
        
       		}

     

       34
       34
       -
       		return token

     

       34
       34
       +
       		

     

       35
       35
       +
       		guard let token else { return nil}

     

       36
       36
       +
       		return Token(kind: token.kind, text: token.text)

     

       35
       37
        
       	}

     

       36
       38
        
       

     

       37
       39
        
       	/// Parses a single `import xyz` line.

     

       38
       40
        
       	private mutating func parseImportStatement() {

     

       39
       39
       -
       		let next = nextSignificantToken()

     

       41
       41
       +
       		guard let next = nextSignificantToken() else { return }

     

       40
       42
        
       		guard next.kind == .identifier else { return }

     

       41
       43
        
       		imports.append(next.text)

     

       42
       44
        
       	}

     
···

       44
       46
        
       

     

       45
       47
        
       

     

       46
       48
        
       extension Keys {

     

       47
       47
       -
       	struct AnalyseImports: BuildKey {

     

       49
       49
       +
       	struct BlobImports: BuildKey {

     

       48
       50
        
       		typealias ValueType = [UnitName]

     

       49
       51
        
       		let blobId: LLBDataID

     

       52
       52
       +
       		

     

       53
       53
       +
       		static let versionDependencies: [any FXVersioning.Type] = [BlobContents.self]

     

       50
       54
        
       

     

       51
       55
        
       		func computeValue(_ ctx: BuildContext<Self>) async throws -> [UnitName] {

     

       52
       52
       -
       			let contents = try await ctx.load(blobId)

     

       53
       53
       -
       			let code = try await String(decoding: Data(ctx.read(blob: contents.blob!)), as: UTF8.self)

     

       56
       56
       +
       			let code = try await ctx.request(BlobContents(blobId: blobId))

     

       54
       57
        
       			var importParser = ImportParser(input: code)

     

       55
       58
        
       			importParser.parseHeader()

     

       56
       59

+22

Sources/PterodactylBuild/Keys/Blob-local operations/BlobContents.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       import TSCBasic

     

       7
       7
       +
       import llbuild2fx

     

       8
       8
       +
       

     

       9
       9
       +
       extension Keys {

     

       10
       10
       +
       	struct BlobContents: BuildKey {

     

       11
       11
       +
       		typealias ValueType = String

     

       12
       12
       +
       

     

       13
       13
       +
       		let blobId: LLBDataID

     

       14
       14
       +
       

     

       15
       15
       +
       		static let versionDependencies: [any FXVersioning.Type] = []

     

       16
       16
       +
       

     

       17
       17
       +
       		func computeValue(_ ctx: BuildContext<Self>) async throws -> String {

     

       18
       18
       +
       			let contents = try await ctx.load(blobId)

     

       19
       19
       +
       			return try await String(decoding: Data(ctx.read(blob: contents.blob!)), as: UTF8.self)

     

       20
       20
       +
       		}

     

       21
       21
       +
       	}

     

       22
       22
       +
       }

+26

Sources/PterodactylBuild/Keys/Blob-local operations/BlobSyntaxTree.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       import PterodactylSyntax

     

       7
       7
       +
       import TSCBasic

     

       8
       8
       +
       import llbuild2fx

     

       9
       9
       +
       

     

       10
       10
       +
       extension Keys {

     

       11
       11
       +
       	struct BlobSyntaxTree: BuildKey {

     

       12
       12
       +
       		typealias ValueType = SyntaxTree

     

       13
       13
       +
       

     

       14
       14
       +
       		let blobId: LLBDataID

     

       15
       15
       +
       

     

       16
       16
       +
       		static let versionDependencies: [any FXVersioning.Type] = [BlobContents.self, BlobTokens.self]

     

       17
       17
       +
       

     

       18
       18
       +
       		func computeValue(_ ctx: BuildContext<Self>) async throws -> ValueType {

     

       19
       19
       +
       			let code = try await ctx.request(BlobContents(blobId: blobId))

     

       20
       20
       +
       			let tokens = try await ctx.request(BlobTokens(blobId: blobId))

     

       21
       21
       +
       			var parser = Parser(source: code, tokens: tokens)

     

       22
       22
       +
       			PterodactylSyntax.Document.parse(&parser)

     

       23
       23
       +
       			return parser.tree

     

       24
       24
       +
       		}

     

       25
       25
       +
       	}

     

       26
       26
       +
       }

+25

Sources/PterodactylBuild/Keys/Blob-local operations/BlobTokens.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       import TSCBasic

     

       7
       7
       +
       import llbuild2fx

     

       8
       8
       +
       import PterodactylSyntax

     

       9
       9
       +
       

     

       10
       10
       +
       extension Keys {

     

       11
       11
       +
       	struct BlobTokens: BuildKey {

     

       12
       12
       +
       		typealias ValueType = [Token]

     

       13
       13
       +
       

     

       14
       14
       +
       		let blobId: LLBDataID

     

       15
       15
       +
       

     

       16
       16
       +
       		static let versionDependencies: [any FXVersioning.Type] = [BlobContents.self]

     

       17
       17
       +
       

     

       18
       18
       +
       		func computeValue(_ ctx: BuildContext<Self>) async throws -> ValueType {

     

       19
       19
       +
       			let code = try await ctx.request(BlobContents(blobId: blobId))

     

       20
       20
       +
       			var lexer = PterodactylSyntax.Lexer(input: code)

     

       21
       21
       +
       			let flatTokens = lexer.tokenize()

     

       22
       22
       +
       			return BlockLayoutProcessor(tokens: flatTokens).layout()

     

       23
       23
       +
       		}

     

       24
       24
       +
       	}

     

       25
       25
       +
       }

Sources/PterodactylBuild/Keys/Blob-local operations/README.md

···

       1
       1
       +
       Certain operations do not require knowledge of the entire source tree, only a specific blob inside the source tree. These include import analysis, tokenisation, line maps, parsing, etc.

+2 -4

Sources/PterodactylBuild/Keys/DependencyGraphOfSourceTree.swift

···

       6
       6
        
       import TSCBasic

     

       7
       7
        
       import llbuild2fx

     

       8
       8
        
       

     

       9
       9
       -
       extension Graph: FXValue where Vertex: Codable {}

     

       10
       10
       -
       

     

       11
       9
        
       extension Keys {

     

       12
       10
        
       	struct DependencyGraphOfSourceTree: BuildKey {

     

       13
       11
        
       		typealias ValueType = Graph<UnitName>

     

       14
       12
        
       

     

       15
       13
        
       		let sourceTreeId: LLBDataID

     

       16
       16
       -
       		static let versionDependencies: [any FXVersioning.Type] = [Keys.UnitMapOfSourceTree.self, Keys.AnalyseImports.self]

     

       14
       14
       +
       		static let versionDependencies: [any FXVersioning.Type] = [Keys.UnitMapOfSourceTree.self, Keys.BlobImports.self]

     

       17
       15
        
       

     

       18
       16
        
       		func computeValue(_ ctx: BuildContext<Self>) async throws -> Graph<UnitName> {

     

       19
       17
        
       			let unitMap = try await ctx.request(Keys.UnitMapOfSourceTree(sourceTreeId: sourceTreeId))

     
···

       21
       19
        
       

     

       22
       20
        
       			for (unitName, unitInfo) in unitMap.units {

     

       23
       21
        
       				if edges[unitName] == nil { edges[unitName] = [] }

     

       24
       24
       -
       				let imports = try await ctx.request(Keys.AnalyseImports(blobId: unitInfo.blobId))

     

       22
       22
       +
       				let imports = try await ctx.request(Keys.BlobImports(blobId: unitInfo.blobId))

     

       25
       23
        
       				for importedUnitName in imports {

     

       26
       24
        
       					edges[unitName]!.insert(importedUnitName)

     

       27
       25
        
       				}

+4 -6

Sources/PterodactylBuild/Keys/NarrowSourceTree.swift

···

       9
       9
        
       extension Keys {

     

       10
       10
        
       	/// Narrows a source tree to just the transitive dependencies of a given unit

     

       11
       11
        
       	struct NarrowSourceTree: BuildKey {

     

       12
       12
       -
       		struct ValueType: Codable, FXValue {

     

       13
       13
       -
       			let sourceTreeId: LLBDataID

     

       14
       14
       -
       		}

     

       15
       15
       -
       

     

       12
       12
       +
       		typealias ValueType = LLBDataID

     

       13
       13
       +
       		

     

       16
       14
        
       		let sourceTreeId: LLBDataID

     

       17
       15
        
       		let unitName: UnitName

     

       18
       16
        
       

     

       19
       17
        
       		static let versionDependencies: [any FXVersioning.Type] = [TransitiveDependencies.self, UnitMapOfSourceTree.self]

     

       20
       18
        
       

     

       21
       19
        
       		func computeValue(_ ctx: BuildContext<Self>) async throws -> ValueType {

     

       22
       22
       -
       			let dependencies = try await ctx.request(TransitiveDependencies(sourceTreeId: sourceTreeId, unitName: unitName)).dependencies

     

       20
       20
       +
       			let dependencies = try await ctx.request(TransitiveDependencies(sourceTreeId: sourceTreeId, unitName: unitName))

     

       23
       21
        
       			let unitMap = try await ctx.request(UnitMapOfSourceTree(sourceTreeId: sourceTreeId))

     

       24
       22
        
       

     

       25
       23
        
       			var sourceTree = try await LLBCASFileTree.load(id: sourceTreeId, in: ctx)

     
···

       29
       27
        
       				}

     

       30
       28
        
       			}

     

       31
       29
        
       

     

       32
       32
       -
       			return ValueType(sourceTreeId: sourceTree.id)

     

       30
       30
       +
       			return sourceTree.id

     

       33
       31
        
       		}

     

       34
       32
        
       	}

     

       35
       33
        
       }

-32

Sources/PterodactylBuild/Keys/SourceCode.swift

···

       1
       1
       -
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       -
       //

     

       3
       3
       -
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       -
       

     

       5
       5
       -
       import Foundation

     

       6
       6
       -
       import TSCBasic

     

       7
       7
       -
       import llbuild2fx

     

       8
       8
       -
       

     

       9
       9
       -
       extension Keys {

     

       10
       10
       -
       	struct SourceCode: BuildKey {

     

       11
       11
       -
       		struct ValueType: Codable, FXValue {

     

       12
       12
       -
       			let code: String

     

       13
       13
       -
       		}

     

       14
       14
       -
       

     

       15
       15
       -
       		enum SourceCodeError: Error {

     

       16
       16
       -
       			case unitNotFound

     

       17
       17
       -
       		}

     

       18
       18
       -
       

     

       19
       19
       -
       		let sourceTreeId: LLBDataID

     

       20
       20
       -
       		let unitName: UnitName

     

       21
       21
       -
       

     

       22
       22
       -
       		static let versionDependencies: [any FXVersioning.Type] = [UnitMapOfSourceTree.self]

     

       23
       23
       -
       

     

       24
       24
       -
       		func computeValue(_ ctx: BuildContext<Self>) async throws -> ValueType {

     

       25
       25
       -
       			let unitMap = try await ctx.request(UnitMapOfSourceTree(sourceTreeId: sourceTreeId))

     

       26
       26
       -
       			guard let unitInfo = unitMap.units[unitName] else { throw SourceCodeError.unitNotFound }

     

       27
       27
       -
       			let contents = try await ctx.load(unitInfo.blobId)

     

       28
       28
       -
       			let code = try await String(decoding: Data(ctx.read(blob: contents.blob!)), as: UTF8.self)

     

       29
       29
       -
       			return ValueType(code: code)

     

       30
       30
       -
       		}

     

       31
       31
       -
       	}

     

       32
       32
       -
       }

+2 -4

Sources/PterodactylBuild/Keys/TransitiveDependencies.swift

···

       8
       8
        
       

     

       9
       9
        
       extension Keys {

     

       10
       10
        
       	struct TransitiveDependencies: BuildKey {

     

       11
       11
       -
       		struct ValueType: Codable, FXValue {

     

       12
       12
       -
       			var dependencies: Set<UnitName>

     

       13
       13
       -
       		}

     

       11
       11
       +
       		typealias ValueType = Set<UnitName>

     

       14
       12
        
       

     

       15
       13
        
       		let sourceTreeId: LLBDataID

     

       16
       14
        
       		let unitName: UnitName

     
···

       19
       17
        
       

     

       20
       18
        
       		func computeValue(_ ctx: BuildContext<Self>) async throws -> ValueType {

     

       21
       19
        
       			let graph = try await ctx.request(Keys.DependencyGraphOfSourceTree(sourceTreeId: sourceTreeId))

     

       22
       22
       -
       			return ValueType(dependencies: graph.verticesReachableFrom(unitName))

     

       20
       20
       +
       			return graph.verticesReachableFrom(unitName)

     

       23
       21
        
       		}

     

       24
       22
        
       	}

     

       25
       23
        
       }

+44 -16

Sources/PterodactylSyntax/Cursor.swift

···

       3
       3
        
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
        
       

     

       5
       5
        
       import Foundation

     

       6
       6
       +
       import LanguageServerProtocol

     

       6
       7
        
       

     

       7
       7
       -
       public struct Cursor: Sendable {

     

       8
       8
       -
         let node: SyntaxTree.Child

     

       9
       9
       -
       	let utf16Offset: Int

     

       10
       10
       -
       	let children: [Cursor]

     

       11
       11
       -
       	

     

       12
       12
       -
         init(node: SyntaxTree.Child, utf16Offset: Int) {

     

       13
       13
       -
       		self.node = node

     

       14
       14
       -
       		self.utf16Offset = utf16Offset

     

       15
       15
       -
       		

     

       16
       16
       -
       		var children: [Cursor] = []

     

       17
       17
       -
       		var utf16Offset = utf16Offset

     

       18
       18
       -
       		for childNode in node.children {

     

       19
       19
       -
       			children.append(Self(node: childNode, utf16Offset: utf16Offset))

     

       20
       20
       -
       			utf16Offset += childNode.utf16Length

     

       8
       8
       +
       extension SyntaxTree {

     

       9
       9
       +
       	public final class Cursor {

     

       10
       10
       +
       		public let lineMap: LineMap

     

       11
       11
       +
       		public let node: SyntaxTree.Child

     

       12
       12
       +
       		public let utf16Offset: Int

     

       13
       13
       +
       

     

       14
       14
       +
       		public private(set) lazy var children: [Cursor] = {

     

       15
       15
       +
       			var children: [Cursor] = []

     

       16
       16
       +
       			var utf16Offset = utf16Offset

     

       17
       17
       +
       			for childNode in node.children {

     

       18
       18
       +
       				children.append(Self(lineMap: lineMap, node: childNode, utf16Offset: utf16Offset))

     

       19
       19
       +
       				utf16Offset += childNode.utf16Length

     

       20
       20
       +
       			}

     

       21
       21
       +
       

     

       22
       22
       +
       			return children

     

       23
       23
       +
       		}()

     

       24
       24
       +
       

     

       25
       25
       +
       		public var utf16Range: Range<Int> {

     

       26
       26
       +
       			utf16Offset..<utf16Offset + node.utf16Length

     

       21
       27
        
       		}

     

       22
       22
       -
       		

     

       23
       23
       -
       		self.children = children

     

       28
       28
       +
       

     

       29
       29
       +
       		init(lineMap: LineMap, node: SyntaxTree.Child, utf16Offset: Int) {

     

       30
       30
       +
       			self.lineMap = lineMap

     

       31
       31
       +
       			self.node = node

     

       32
       32
       +
       			self.utf16Offset = utf16Offset

     

       33
       33
       +
       		}

     

       24
       34
        
       	}

     

       25
       35
        
       }

     

       36
       36
       +
       

     

       37
       37
       +
       extension SyntaxTree.Cursor {

     

       38
       38
       +
       	public func firstChild<T>(mapping: (SyntaxTree.Cursor) -> T?) -> T? {

     

       39
       39
       +
       		for child in children {

     

       40
       40
       +
       			if let result = mapping(child) {

     

       41
       41
       +
       				return result

     

       42
       42
       +
       			} else {

     

       43
       43
       +
       				continue

     

       44
       44
       +
       			}

     

       45
       45
       +
       		}

     

       46
       46
       +
       		return nil

     

       47
       47
       +
       	}

     

       48
       48
       +
       	

     

       49
       49
       +
       	public func children<T>(mapping: (SyntaxTree.Cursor) -> T?) -> [T] {

     

       50
       50
       +
       		children.compactMap(mapping)

     

       51
       51
       +
       	}

     

       52
       52
       +
       }

     

       53
       53
       +

+63

Sources/PterodactylSyntax/FoldingRanges.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       import LanguageServerProtocol

     

       7
       7
       +
       

     

       8
       8
       +
       private enum ArraySymmetry {

     

       9
       9
       +
       	case identity

     

       10
       10
       +
       	case reverse

     

       11
       11
       +
       }

     

       12
       12
       +
       

     

       13
       13
       +
       extension Array {

     

       14
       14
       +
       	fileprivate func apply(symmetry: ArraySymmetry) -> any Collection<Element> {

     

       15
       15
       +
       		switch symmetry {

     

       16
       16
       +
       		case .identity: self

     

       17
       17
       +
       		case .reverse: reversed()

     

       18
       18
       +
       		}

     

       19
       19
       +
       	}

     

       20
       20
       +
       }

     

       21
       21
       +
       

     

       22
       22
       +
       extension SyntaxTree.Cursor {

     

       23
       23
       +
       	private func firstVisibleNode(under symmetry: ArraySymmetry) -> SyntaxTree.Cursor? {

     

       24
       24
       +
       		switch node {

     

       25
       25
       +
       		case .token(let token, _):

     

       26
       26
       +
       			return token.kind.isVisible ? self : nil

     

       27
       27
       +
       		case .tree:

     

       28
       28
       +
       			for child in children.apply(symmetry: symmetry) {

     

       29
       29
       +
       				if let visibleChild = child.firstVisibleNode(under: symmetry) { return visibleChild }

     

       30
       30
       +
       				continue

     

       31
       31
       +
       			}

     

       32
       32
       +
       

     

       33
       33
       +
       			return nil

     

       34
       34
       +
       		}

     

       35
       35
       +
       	}

     

       36
       36
       +
       

     

       37
       37
       +
       	private var visibleUtf16Range: Range<Int>? {

     

       38
       38
       +
       		guard

     

       39
       39
       +
       			let firstNode = firstVisibleNode(under: .identity),

     

       40
       40
       +
       			let lastNode = firstVisibleNode(under: .reverse)

     

       41
       41
       +
       		else { return nil }

     

       42
       42
       +
       		return firstNode.utf16Range.lowerBound..<lastNode.utf16Range.upperBound

     

       43
       43
       +
       	}

     

       44
       44
       +
       

     

       45
       45
       +
       	private func collectFoldingRanges(_ sink: inout [FoldingRange]) {

     

       46
       46
       +
       		if let foldingRangeKind = node.tree?.metadata?.delimitedFoldingRangeKind, let visibleUtf16Range {

     

       47
       47
       +
       			let startLocation = lineMap.location(at: visibleUtf16Range.lowerBound)

     

       48
       48
       +
       			let endLocation = lineMap.location(at: visibleUtf16Range.upperBound)

     

       49
       49
       +
       			let foldingRange = FoldingRange(startLine: startLocation.line, endLine: endLocation.line, kind: foldingRangeKind)

     

       50
       50
       +
       			sink.append(foldingRange)

     

       51
       51
       +
       		}

     

       52
       52
       +
       

     

       53
       53
       +
       		for child in children {

     

       54
       54
       +
       			child.collectFoldingRanges(&sink)

     

       55
       55
       +
       		}

     

       56
       56
       +
       	}

     

       57
       57
       +
       

     

       58
       58
       +
       	public var foldingRanges: [FoldingRange] {

     

       59
       59
       +
       		var sink: [FoldingRange] = []

     

       60
       60
       +
       		collectFoldingRanges(&sink)

     

       61
       61
       +
       		return sink

     

       62
       62
       +
       	}

     

       63
       63
       +
       }

+16 -5

Sources/PterodactylSyntax/Grammar.swift

···

       4
       4
        
       

     

       5
       5
        
       import Foundation

     

       6
       6
        
       

     

       7
       7
       -
       public protocol Grammar {

     

       8
       8
       -
       //	static var kind: L.TreeKind { get }

     

       7
       7
       +
       public protocol Grammar: Sendable {

     

       8
       8
       +
       	static var kinds: [SyntaxTreeKind] { get }

     

       9
       9
        
       	static func before(_ parser: inout Parser) -> Bool

     

       10
       10
       -
       	static func inside(_ parser: inout Parser) -> SyntaxTreeKind

     

       10
       10
       +
       	static func inside(_ parser: inout Parser) -> ParseResult

     

       11
       11
       +
       }

     

       12
       12
       +
       

     

       13
       13
       +
       public struct ParseResult {

     

       14
       14
       +
       	public var kind: SyntaxTreeKind

     

       15
       15
       +
       	public var metadata: SyntaxTreeMetadata? = nil

     

       16
       16
       +
       	

     

       17
       17
       +
       	public init(kind: SyntaxTreeKind, metadata: SyntaxTreeMetadata? = nil) {

     

       18
       18
       +
       		self.kind = kind

     

       19
       19
       +
       		self.metadata = metadata

     

       20
       20
       +
       	}

     

       11
       21
        
       }

     

       22
       22
       +
       

     

       12
       23
        
       

     

       13
       24
        
       public extension Grammar {

     

       14
       25
        
       	static func tryParse(_ parser: inout Parser) -> Bool {

     
···

       19
       30
        
       	

     

       20
       31
        
       	static func parse(_ parser: inout Parser) {

     

       21
       32
        
       		let mark = parser.open()

     

       22
       22
       -
       		let kind = inside(&parser)

     

       23
       23
       -
       		parser.close(mark: mark, kind: kind)

     

       33
       33
       +
       		let result = inside(&parser)

     

       34
       34
       +
       		parser.close(mark: mark, kind: result.kind, metadata: result.metadata)

     

       24
       35
        
       	}

     

       25
       36
        
       }

+51

Sources/PterodactylSyntax/Grammar/Document.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       

     

       7
       7
       +
       public enum Document: Grammar {

     

       8
       8
       +
       	public static let kind = SyntaxTreeKind(name: "document")

     

       9
       9
       +
       	public static let kinds = [kind]

     

       10
       10
       +
       

     

       11
       11
       +
       	public static func before(_ parser: inout Parser) -> Bool {

     

       12
       12
       +
       		true

     

       13
       13
       +
       	}

     

       14
       14
       +
       

     

       15
       15
       +
       	public static func inside(_ parser: inout Parser) -> ParseResult {

     

       16
       16
       +
       		parser.eatTrivia()

     

       17
       17
       +
       

     

       18
       18
       +
       		// Parse imports

     

       19
       19
       +
       		while !parser.isAt(kind: .eof) {

     

       20
       20
       +
       			parser.eatTrivia()

     

       21
       21
       +
       			if Theory.before(&parser) { break }

     

       22
       22
       +
       

     

       23
       23
       +
       			if !Import.tryParse(&parser) {

     

       24
       24
       +
       				parser.advance(error: "Expected to see either an import or a theory declaration, but instead got \(parser.currentToken.kind): \(parser.currentToken.text)")

     

       25
       25
       +
       			}

     

       26
       26
       +
       		}

     

       27
       27
       +
       

     

       28
       28
       +
       		// Theories section

     

       29
       29
       +
       		while !parser.isAt(kind: .eof) {

     

       30
       30
       +
       			if !Theory.tryParse(&parser) {

     

       31
       31
       +
       				if parser.isAt(kindSatisfying: \.isVisible) {

     

       32
       32
       +
       					let token = parser.currentToken

     

       33
       33
       +
       					parser.advance(error: "Unexpected token: \(token.kind)")

     

       34
       34
       +
       				} else {

     

       35
       35
       +
       					parser.advance(metadata: nil)

     

       36
       36
       +
       				}

     

       37
       37
       +
       			}

     

       38
       38
       +
       			parser.eatTrivia()

     

       39
       39
       +
       		}

     

       40
       40
       +
       

     

       41
       41
       +
       		parser.eatTrivia()

     

       42
       42
       +
       		_ = parser.eat(kind: .eof, metadata: nil)

     

       43
       43
       +
       

     

       44
       44
       +
       		return ParseResult(kind: Self.kind)

     

       45
       45
       +
       	}

     

       46
       46
       +
       }

     

       47
       47
       +
       

     

       48
       48
       +
       extension SyntaxView<Document> {

     

       49
       49
       +
       	var imports: [SyntaxView<Import>] { matchingSubviews() }

     

       50
       50
       +
       	var theories: [SyntaxView<Theory>] { matchingSubviews() }

     

       51
       51
       +
       }

+46

Sources/PterodactylSyntax/Grammar/Document/Import.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       

     

       7
       7
       +
       enum ImportName: Grammar {

     

       8
       8
       +
       	static let kind = SyntaxTreeKind(name: "import.name")

     

       9
       9
       +
       	static let kinds = [kind]

     

       10
       10
       +
       	

     

       11
       11
       +
       	static func before(_ parser: inout Parser) -> Bool {

     

       12
       12
       +
       		parser.isAt(kind: .identifier)

     

       13
       13
       +
       	}

     

       14
       14
       +
       

     

       15
       15
       +
       	static func inside(_ parser: inout Parser) -> ParseResult {

     

       16
       16
       +
       		parser.expect(kind: .identifier, metadata: TokenMetadata(semanticTokenType: .namespace))

     

       17
       17
       +
       		return ParseResult(kind: Self.kind)

     

       18
       18
       +
       	}

     

       19
       19
       +
       }

     

       20
       20
       +
       

     

       21
       21
       +
       enum Import: Grammar {

     

       22
       22
       +
       	static let kind = SyntaxTreeKind(name: "import")

     

       23
       23
       +
       	static let kinds = [kind]

     

       24
       24
       +
       	

     

       25
       25
       +
       	static func before(_ parser: inout Parser) -> Bool {

     

       26
       26
       +
       		parser.isAt(kind: .keyword(.import))

     

       27
       27
       +
       	}

     

       28
       28
       +
       

     

       29
       29
       +
       	static func inside(_ parser: inout Parser) -> ParseResult {

     

       30
       30
       +
       		parser.expect(kind: .keyword(.import), metadata: TokenMetadata(semanticTokenType: .keyword))

     

       31
       31
       +
       		parser.eatTrivia()

     

       32
       32
       +
       		ImportName.parse(&parser)

     

       33
       33
       +
       		return ParseResult(kind: Self.kind)

     

       34
       34
       +
       	}

     

       35
       35
       +
       }

     

       36
       36
       +
       

     

       37
       37
       +
       

     

       38
       38
       +
       extension SyntaxView<ImportName> {

     

       39
       39
       +
       	var text: String { cursor.node.text }

     

       40
       40
       +
       }

     

       41
       41
       +
       

     

       42
       42
       +
       extension SyntaxView<Import> {

     

       43
       43
       +
       	var name: SyntaxView<ImportName>? {

     

       44
       44
       +
       		matchingSubview()

     

       45
       45
       +
       	}

     

       46
       46
       +
       }

+33

Sources/PterodactylSyntax/Grammar/Document/Theory.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       

     

       7
       7
       +
       enum Theory: Grammar {

     

       8
       8
       +
       	static let kind = SyntaxTreeKind(name: "theory")

     

       9
       9
       +
       	static let kinds = [kind]

     

       10
       10
       +
       	

     

       11
       11
       +
       	static func before(_ parser: inout Parser) -> Bool {

     

       12
       12
       +
       		parser.isAt(kind: .keyword(.theory))

     

       13
       13
       +
       	}

     

       14
       14
       +
       

     

       15
       15
       +
       	static func inside(_ parser: inout Parser) -> ParseResult {

     

       16
       16
       +
       		parser.expect(kind: .keyword(.theory), metadata: TokenMetadata(semanticTokenType: .keyword))

     

       17
       17
       +
       		parser.eatTrivia()

     

       18
       18
       +
       		if !TheoryName.tryParse(&parser) {

     

       19
       19
       +
       			parser.advance(error: "Expected theory name")

     

       20
       20
       +
       		}

     

       21
       21
       +
       

     

       22
       22
       +
       		parser.eatTrivia()

     

       23
       23
       +
       

     

       24
       24
       +
       		TheoryBlock.parse(&parser)

     

       25
       25
       +
       

     

       26
       26
       +
       		return ParseResult(kind: Self.kind)

     

       27
       27
       +
       	}

     

       28
       28
       +
       }

     

       29
       29
       +
       

     

       30
       30
       +
       extension SyntaxView<Theory> {

     

       31
       31
       +
       	var name: SyntaxView<TheoryName>? { matchingSubview() }

     

       32
       32
       +
       	var block: SyntaxView<TheoryBlock>? { matchingSubview() }

     

       33
       33
       +
       }

+52

Sources/PterodactylSyntax/Grammar/Document/Theory/Declaration.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       

     

       7
       7
       +
       enum Declaration: Grammar {

     

       8
       8
       +
       	enum Kinds {

     

       9
       9
       +
       		static let claim = SyntaxTreeKind(name: "decl.claim")

     

       10
       10
       +
       		static let refine = SyntaxTreeKind(name: "decl.refine")

     

       11
       11
       +
       		static let define = SyntaxTreeKind(name: "decl.define")

     

       12
       12
       +
       	}

     

       13
       13
       +
       

     

       14
       14
       +
       	static let kinds = [Kinds.claim, Kinds.refine, Kinds.define]

     

       15
       15
       +
       	

     

       16
       16
       +
       	static func before(_ parser: inout Parser) -> Bool {

     

       17
       17
       +
       		Lhs.before(&parser)

     

       18
       18
       +
       	}

     

       19
       19
       +
       

     

       20
       20
       +
       	static let punctuationMap: [Punctuation: SyntaxTreeKind] = [

     

       21
       21
       +
       		.colon: Kinds.claim,

     

       22
       22
       +
       		.doubleLeftArrow: Kinds.refine,

     

       23
       23
       +
       		.doubleRightArrow: Kinds.define

     

       24
       24
       +
       	]

     

       25
       25
       +
       

     

       26
       26
       +
       	static func inside(_ parser: inout Parser) -> ParseResult {

     

       27
       27
       +
       		Lhs.parse(&parser)

     

       28
       28
       +
       		parser.eatTrivia()

     

       29
       29
       +
       

     

       30
       30
       +
       		var kind: SyntaxTreeKind = .error

     

       31
       31
       +
       		for cell in punctuationMap {

     

       32
       32
       +
       			if parser.eat(kind: .punctuation(cell.key), metadata: TokenMetadata(semanticTokenType: .operator)) {

     

       33
       33
       +
       				kind = cell.value

     

       34
       34
       +
       				break

     

       35
       35
       +
       			}

     

       36
       36
       +
       		}

     

       37
       37
       +
       

     

       38
       38
       +
       		if kind == .error {

     

       39
       39
       +
       			parser.advance(error: "Expected one of \(punctuationMap.keys.map(\.rawValue)) in declaration")

     

       40
       40
       +
       		}

     

       41
       41
       +
       

     

       42
       42
       +
       		parser.eatTrivia()

     

       43
       43
       +
       		Rhs.parse(&parser)

     

       44
       44
       +
       

     

       45
       45
       +
       		return ParseResult(kind: kind)

     

       46
       46
       +
       	}

     

       47
       47
       +
       }

     

       48
       48
       +
       

     

       49
       49
       +
       extension SyntaxView<Declaration> {

     

       50
       50
       +
       	var lhs: SyntaxView<Lhs>? { matchingSubview() }

     

       51
       51
       +
       	var rhs: SyntaxView<Rhs>? { matchingSubview() }

     

       52
       52
       +
       }

+19

Sources/PterodactylSyntax/Grammar/Document/Theory/Declaration/Lhs.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       

     

       7
       7
       +
       enum Lhs: Grammar {

     

       8
       8
       +
       	static let kind = SyntaxTreeKind(name: "declaration.lhs")

     

       9
       9
       +
       	static let kinds = [kind]

     

       10
       10
       +
       	

     

       11
       11
       +
       	static func before(_ parser: inout Parser) -> Bool {

     

       12
       12
       +
       		parser.isAt(kind: .identifier)

     

       13
       13
       +
       	}

     

       14
       14
       +
       

     

       15
       15
       +
       	static func inside(_ parser: inout Parser) -> ParseResult {

     

       16
       16
       +
       		parser.expect(kind: .identifier, metadata: TokenMetadata(semanticTokenType: .method))

     

       17
       17
       +
       		return ParseResult(kind: Self.kind)

     

       18
       18
       +
       	}

     

       19
       19
       +
       }

+19

Sources/PterodactylSyntax/Grammar/Document/Theory/Declaration/Rhs.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       

     

       7
       7
       +
       enum Rhs: Grammar {

     

       8
       8
       +
       	static let kind = SyntaxTreeKind(name: "declaration.lhs")

     

       9
       9
       +
       	static let kinds = [kind]

     

       10
       10
       +
       	

     

       11
       11
       +
       	static func before(_ parser: inout Parser) -> Bool {

     

       12
       12
       +
       		parser.isAt(kind: .identifier)

     

       13
       13
       +
       	}

     

       14
       14
       +
       

     

       15
       15
       +
       	static func inside(_ parser: inout Parser) -> ParseResult {

     

       16
       16
       +
       		parser.expect(kind: .identifier, metadata: TokenMetadata(semanticTokenType: .method))

     

       17
       17
       +
       		return ParseResult(kind: Self.kind)

     

       18
       18
       +
       	}

     

       19
       19
       +
       }

+46

Sources/PterodactylSyntax/Grammar/Document/Theory/TheoryBlock.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       

     

       7
       7
       +
       enum TheoryBlock: Grammar {

     

       8
       8
       +
       	static let kind = SyntaxTreeKind(name: "theory.block")

     

       9
       9
       +
       	static let kinds = [kind]

     

       10
       10
       +
       	

     

       11
       11
       +
       	static func before(_ parser: inout Parser) -> Bool {

     

       12
       12
       +
       		parser.isAt(kind: .keyword(.where))

     

       13
       13
       +
       	}

     

       14
       14
       +
       

     

       15
       15
       +
       	static func inside(_ parser: inout Parser) -> ParseResult {

     

       16
       16
       +
       		parser.expect(kind: .keyword(.where), metadata: TokenMetadata(semanticTokenType: .keyword))

     

       17
       17
       +
       

     

       18
       18
       +
       		parser.eatTrivia()

     

       19
       19
       +
       		if parser.eat(kind: .blockBegin, metadata: nil) {

     

       20
       20
       +
       			parser.eatTrivia()

     

       21
       21
       +
       

     

       22
       22
       +
       			while Declaration.tryParse(&parser) {

     

       23
       23
       +
       				parser.eatTrivia()

     

       24
       24
       +
       				if parser.eat(kind: .blockSep, metadata: nil) {

     

       25
       25
       +
       					parser.eatTrivia()

     

       26
       26
       +
       					continue

     

       27
       27
       +
       				} else {

     

       28
       28
       +
       					break

     

       29
       29
       +
       				}

     

       30
       30
       +
       			}

     

       31
       31
       +
       

     

       32
       32
       +
       			_ = parser.eat(kind: .blockEnd, metadata: nil)

     

       33
       33
       +
       		}

     

       34
       34
       +
       

     

       35
       35
       +
       		var metadata = SyntaxTreeMetadata()

     

       36
       36
       +
       		metadata.delimitedFoldingRangeKind = .region

     

       37
       37
       +
       

     

       38
       38
       +
       		return ParseResult(kind: kind, metadata: metadata)

     

       39
       39
       +
       	}

     

       40
       40
       +
       }

     

       41
       41
       +
       

     

       42
       42
       +
       extension SyntaxView<TheoryBlock> {

     

       43
       43
       +
       	var declarations: [SyntaxView<Declaration>] {

     

       44
       44
       +
       		matchingSubviews()

     

       45
       45
       +
       	}

     

       46
       46
       +
       }

+23

Sources/PterodactylSyntax/Grammar/Document/Theory/TheoryName.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       

     

       7
       7
       +
       enum TheoryName: Grammar {

     

       8
       8
       +
       	static let kind = SyntaxTreeKind(name: "theory.name")

     

       9
       9
       +
       	static let kinds = [kind]

     

       10
       10
       +
       	

     

       11
       11
       +
       	static func before(_ parser: inout Parser) -> Bool {

     

       12
       12
       +
       		parser.isAt(kind: .identifier)

     

       13
       13
       +
       	}

     

       14
       14
       +
       

     

       15
       15
       +
       	static func inside(_ parser: inout Parser) -> ParseResult {

     

       16
       16
       +
       		parser.advance(metadata: TokenMetadata(semanticTokenType: .interface))

     

       17
       17
       +
       		return ParseResult(kind: Self.kind)

     

       18
       18
       +
       	}

     

       19
       19
       +
       }

     

       20
       20
       +
       

     

       21
       21
       +
       extension SyntaxView<TheoryName> {

     

       22
       22
       +
       	var text: String { cursor.node.text }

     

       23
       23
       +
       }

+130 -69

Sources/PterodactylSyntax/Lexer.swift

···

       2
       2
        
       //

     

       3
       3
        
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
        
       

     

       5
       5
       -
       //

     

       6
       6
       -
        // SPDX-License-Identifier: MPL-2.0

     

       7
       7
       -
        

     

       8
       8
       -
        import Foundation

     

       9
       9
       -
        

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       

     

       10
       7
        
       public struct Lexer {

     

       11
       11
       -
        	private let input: String

     

       12
       12
       -
        	private var index: String.Index

     

       8
       8
       +
       	private let input: String

     

       9
       9
       +
       	private var index: String.Index

     

       13
       10
        
       	private var tokens: [PterodactylSyntax.Token]

     

       14
       14
       -
        

     

       11
       11
       +
       

     

       15
       12
        
       	public init(input: String) {

     

       16
       16
       -
        		self.input = input

     

       17
       17
       -
        		self.index = input.startIndex

     

       18
       18
       -
        		self.tokens = []

     

       19
       19
       -
        	}

     

       20
       20
       -
        

     

       21
       21
       -
        	static let keywords: [String: Keyword] = [

     

       22
       22
       -
        		"import": .import

     

       23
       23
       -
        	]

     

       24
       24
       -
        

     

       25
       25
       -
        	public mutating func nextToken() -> Token {

     

       26
       26
       -
        		guard !isAtEnd else {

     

       27
       27
       -
        			return Token(kind: .eof, text: "")

     

       28
       28
       -
        		}

     

       29
       29
       -
        

     

       30
       30
       -
        		let char = currentChar

     

       31
       31
       -
        

     

       32
       32
       -
        		if char.isNewline {

     

       33
       33
       -
        			advance()

     

       34
       34
       -
        			return Token(kind: .whitespace(.newline), text: String(char))

     

       35
       35
       -
        		}

     

       36
       36
       -
        

     

       37
       37
       -
        		if char.isWhitespace {

     

       38
       38
       -
        			let text = readWhile { $0.isWhitespace && !$0.isNewline }

     

       39
       39
       -
        			return Token(kind: .whitespace(.other), text: text)

     

       40
       40
       -
        		}

     

       41
       41
       -
        

     

       42
       42
       -
        		if char.isLetter {

     

       43
       43
       -
        			let word = readWhile { $0.isLetter || $0.isNumber || $0 == "_" }

     

       44
       44
       -
        			let kind: TokenKind =

     

       45
       45
       -
        				if let keyword = Self.keywords[word] {

     

       46
       46
       -
        					.keyword(keyword)

     

       47
       47
       -
        				} else {

     

       48
       48
       -
        					.identifier

     

       49
       49
       -
        				}

     

       50
       50
       -
        			return Token(kind: kind, text: word)

     

       51
       51
       -
        		}

     

       52
       52
       -
        

     

       53
       53
       -
        		advance()

     

       54
       54
       -
        		return Token(kind: .error, text: String(char))

     

       55
       55
       -
        	}

     

       56
       56
       -
        

     

       57
       57
       -
        	private mutating func readWhile(_ condition: (Character) -> Bool) -> String {

     

       58
       58
       -
        		var result = ""

     

       59
       59
       -
        		while !isAtEnd && condition(currentChar) {

     

       60
       60
       -
        			result.append(currentChar)

     

       61
       61
       -
        			advance()

     

       62
       62
       -
        		}

     

       63
       63
       -
        		return result

     

       64
       64
       -
        	}

     

       65
       65
       -
        

     

       66
       66
       -
        	private var currentChar: Character { input[index] }

     

       67
       67
       -
        	

     

       68
       68
       -
        	private var isAtEnd: Bool {

     

       69
       69
       -
        		index == input.endIndex

     

       70
       70
       -
        	}

     

       71
       71
       -
        

     

       72
       72
       -
        	private mutating func advance() {

     

       73
       73
       -
        		guard index < input.endIndex else { return }

     

       74
       74
       -
        		index = input.index(after: index)

     

       75
       75
       -
        	}

     

       76
       76
       -
        }

     

       13
       13
       +
       		self.input = input

     

       14
       14
       +
       		self.index = input.startIndex

     

       15
       15
       +
       		self.tokens = []

     

       16
       16
       +
       	}

     

       17
       17
       +
       	

     

       18
       18
       +
       	private var isAtEnd: Bool { index >= input.endIndex }

     

       19
       19
       +
       

     

       20
       20
       +
       	private var peek: Character? {

     

       21
       21
       +
       		guard index < input.endIndex else { return nil }

     

       22
       22
       +
       		return input[index]

     

       23
       23
       +
       	}

     

       24
       24
       +
       

     

       25
       25
       +
       	private func lookahead() -> Character? {

     

       26
       26
       +
       		guard index < input.endIndex else { return nil }

     

       27
       27
       +
       		let next = input.index(after: index)

     

       28
       28
       +
       		guard next < input.endIndex else { return nil }

     

       29
       29
       +
       		return input[next]

     

       30
       30
       +
       	}

     

       31
       31
       +
       

     

       32
       32
       +
       	private mutating func advance() -> Character {

     

       33
       33
       +
       		let c = input[index]

     

       34
       34
       +
       		index = input.index(after: index)

     

       35
       35
       +
       

     

       36
       36
       +
       		return c

     

       37
       37
       +
       	}

     

       38
       38
       +
       

     

       39
       39
       +
       	private mutating func consume(while predicate: (Character) -> Bool) {

     

       40
       40
       +
       		while let c = peek, predicate(c) {

     

       41
       41
       +
       			_ = advance()

     

       42
       42
       +
       		}

     

       43
       43
       +
       	}

     

       44
       44
       +
       

     

       45
       45
       +
       	func text(from start: String.Index) -> String {

     

       46
       46
       +
       		let range = start..<index

     

       47
       47
       +
       		return String(input[range])

     

       48
       48
       +
       	}

     

       49
       49
       +
       

     

       50
       50
       +
       	public mutating func nextToken() -> (kind: TokenKind, text: String)? {

     

       51
       51
       +
       		guard let c = peek else {

     

       52
       52
       +
       			return nil

     

       53
       53
       +
       		}

     

       54
       54
       +
       

     

       55
       55
       +
       		let start = index

     

       56
       56
       +
       

     

       57
       57
       +
       		if c.isNewline {

     

       58
       58
       +
       			_ = advance()

     

       59
       59
       +
       			return (kind: .newline, text: text(from: start))

     

       60
       60
       +
       		}

     

       61
       61
       +
       

     

       62
       62
       +
       		if c.isWhitespace && !c.isNewline {

     

       63
       63
       +
       			consume { $0.isWhitespace && !$0.isNewline }

     

       64
       64
       +
       			return (kind: .whitespace, text: text(from: start))

     

       65
       65
       +
       		}

     

       66
       66
       +
       

     

       67
       67
       +
       		if c == "/" && lookahead() == "/" {

     

       68
       68
       +
       			_ = advance()

     

       69
       69
       +
       			_ = advance()

     

       70
       70
       +
       			consume { $0 != "\n" }

     

       71
       71
       +
       			return (kind: .lineComment, text: text(from: start))

     

       72
       72
       +
       		}

     

       73
       73
       +
       

     

       74
       74
       +
       		if c == "/" && lookahead() == "*" {

     

       75
       75
       +
       			_ = advance()  // consume '/'

     

       76
       76
       +
       			_ = advance()  // consume '*'

     

       77
       77
       +
       			var terminated = false

     

       78
       78
       +
       

     

       79
       79
       +
       			while let ch = peek {

     

       80
       80
       +
       				if ch == "*" && lookahead() == "/" {

     

       81
       81
       +
       					_ = advance()  // consume '*'

     

       82
       82
       +
       					_ = advance()  // consume '/'

     

       83
       83
       +
       					terminated = true

     

       84
       84
       +
       					break

     

       85
       85
       +
       				}

     

       86
       86
       +
       				_ = advance()

     

       87
       87
       +
       			}

     

       88
       88
       +
       

     

       89
       89
       +
       			return (kind: .blockComment(terminated: terminated), text: text(from: start))

     

       90
       90
       +
       		}

     

       91
       91
       +
       

     

       92
       92
       +
       		if c == "<" && lookahead() == "=" {

     

       93
       93
       +
       			_ = advance()

     

       94
       94
       +
       			_ = advance()

     

       95
       95
       +
       			return (kind: .punctuation(.doubleLeftArrow), text: text(from: start))

     

       96
       96
       +
       		}

     

       97
       97
       +
       

     

       98
       98
       +
       		if c == "=" && lookahead() == ">" {

     

       99
       99
       +
       			_ = advance()

     

       100
       100
       +
       			_ = advance()

     

       101
       101
       +
       			return (kind: .punctuation(.doubleRightArrow), text: text(from: start))

     

       102
       102
       +
       		}

     

       103
       103
       +
       

     

       104
       104
       +
       		if let punct = Punctuation(rawValue: String(c)) {

     

       105
       105
       +
       			_ = advance()

     

       106
       106
       +
       			return (.punctuation(punct), String(c))

     

       107
       107
       +
       		} else if c.isLetter || c == "_" {

     

       108
       108
       +
       			_ = advance()

     

       109
       109
       +
       			consume { $0.isLetter || $0.isNumber || $0 == "_" }

     

       110
       110
       +
       			let text = text(from: start)

     

       111
       111
       +
       			if let keyword = Keyword(rawValue: text) {

     

       112
       112
       +
       				return (kind: .keyword(keyword), text: text)

     

       113
       113
       +
       			}

     

       114
       114
       +
       			return (kind: .identifier, text: text)

     

       115
       115
       +
       		}

     

       116
       116
       +
       

     

       117
       117
       +
       		// Invalid single char (don’t drop input)

     

       118
       118
       +
       		let ch = advance()

     

       119
       119
       +
       		return (kind: .error, text: String(ch))

     

       120
       120
       +
       	}

     

       121
       121
       +
       

     

       122
       122
       +
       	public mutating func tokenize() -> [Token] {

     

       123
       123
       +
       		var tokens: [Token] = []

     

       124
       124
       +
       

     

       125
       125
       +
       		while !isAtEnd {

     

       126
       126
       +
       			guard let token = nextToken() else { break }

     

       127
       127
       +
       			tokens.append(

     

       128
       128
       +
       				Token(kind: token.kind, text: token.text)

     

       129
       129
       +
       			)

     

       130
       130
       +
       		}

     

       131
       131
       +
       

     

       132
       132
       +
       		let eofToken = Token(kind: .eof, text: "")

     

       133
       133
       +
       		tokens.append(eofToken)

     

       134
       134
       +
       

     

       135
       135
       +
       		return tokens

     

       136
       136
       +
       	}

     

       137
       137
       +
       }

+30

Sources/PterodactylSyntax/LineMap.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Algorithms

     

       6
       6
       +
       import Foundation

     

       7
       7
       +
       

     

       8
       8
       +
       public struct LineMap: Codable {

     

       9
       9
       +
       	private var utf16LineOffsets: [Int] = [0]

     

       10
       10
       +
       

     

       11
       11
       +
       	public init(source: String) {

     

       12
       12
       +
       		for idx in source.indices {

     

       13
       13
       +
       			let c = source[idx]

     

       14
       14
       +
       			if c == "\n" || c == "\r\n" || c == "\r" {

     

       15
       15
       +
       				let next = source.index(after: idx)

     

       16
       16
       +
       				let utf16Offset = next.utf16Offset(in: source)

     

       17
       17
       +
       				utf16LineOffsets.append(utf16Offset)

     

       18
       18
       +
       			}

     

       19
       19
       +
       		}

     

       20
       20
       +
       	}

     

       21
       21
       +
       

     

       22
       22
       +
       	public func location(at utf16Offset: Int) -> (line: Int, column: Int) {

     

       23
       23
       +
       		let partitioningIndex = utf16LineOffsets.partitioningIndex { $0 > utf16Offset }

     

       24
       24
       +
       		let lineIndex = partitioningIndex == 0 ? 0 : partitioningIndex - 1

     

       25
       25
       +
       		let lineStart = utf16LineOffsets[lineIndex]

     

       26
       26
       +
       		let lineNumber = lineIndex + 1

     

       27
       27
       +
       		let columnNumber = utf16Offset - lineStart + 1

     

       28
       28
       +
       		return (lineNumber, columnNumber)

     

       29
       29
       +
       	}

     

       30
       30
       +
       }

+52 -23

Sources/PterodactylSyntax/Parser.swift

···

       4
       4
        
       

     

       5
       5
        
       public struct Parser {

     

       6
       6
        
       	enum Event: Equatable {

     

       7
       7
       -
       		case open(kind: SyntaxTreeKind)

     

       7
       7
       +
       		case open(kind: SyntaxTreeKind, metadata: SyntaxTreeMetadata?)

     

       8
       8
        
       		case close

     

       9
       9
       -
       		case advance

     

       9
       9
       +
       		case advance(metadata: TokenMetadata?)

     

       10
       10
        
       	}

     

       11
       11
        
       

     

       12
       12
        
       	public struct MarkOpened {

     
···

       61
       61
        
       

     

       62
       62
        
       	public mutating func open() -> MarkOpened {

     

       63
       63
        
       		let mark = MarkOpened(index: events.count)

     

       64
       64
       -
       		events.append(.open(kind: .error))

     

       64
       64
       +
       		events.append(.open(kind: .error, metadata: nil))

     

       65
       65
        
       		return mark

     

       66
       66
        
       	}

     

       67
       67
        
       

     

       68
       68
       -
       	public mutating func close(mark: MarkOpened, kind: SyntaxTreeKind) {

     

       69
       69
       -
       		events[mark.index] = .open(kind: kind)

     

       68
       68
       +
       	public mutating func close(mark: MarkOpened, kind: SyntaxTreeKind, metadata: SyntaxTreeMetadata?) {

     

       69
       69
       +
       		events[mark.index] = .open(kind: kind, metadata: metadata)

     

       70
       70
        
       		events.append(.close)

     

       71
       71
        
       	}

     

       72
       72
        
       

     

       73
       73
       -
       	public mutating func advance() {

     

       73
       73
       +
       	public mutating func advance(metadata: TokenMetadata?) {

     

       74
       74
        
       		precondition(!isEndOfFile)

     

       75
       75
       -
       		events.append(.advance)

     

       75
       75
       +
       		events.append(.advance(metadata: metadata))

     

       76
       76
        
       		absoluteUtf16Offset += currentToken.utf16Length

     

       77
       77
        
       		position += 1

     

       78
       78
        
       		fuel = 256

     

       79
       79
        
       	}

     

       80
       80
        
       

     

       81
       81
       -
       	public mutating func advance(error: String?) {

     

       81
       81
       +
       	public mutating func advance(error: String?, metadata: TokenMetadata? = nil) {

     

       82
       82
        
       		let mark = open()

     

       83
       83
        
       		if let error {

     

       84
       84
        
       			let diagnostic = Diagnostic(

     
···

       88
       88
        
       

     

       89
       89
        
       			diagnostics.append(diagnostic)

     

       90
       90
        
       		}

     

       91
       91
       -
       		advance()

     

       92
       92
       -
       		close(mark: mark, kind: .error)

     

       91
       91
       +
       		advance(metadata: metadata)

     

       92
       92
       +
       		close(mark: mark, kind: .error, metadata: nil)

     

       93
       93
        
       	}

     

       94
       94
        
       

     

       95
       95
        
       	public mutating func lookahead(_ k: Int) -> TokenKind? {

     
···

       100
       100
        
       		return tokens[index].kind

     

       101
       101
        
       	}

     

       102
       102
        
       

     

       103
       103
       -
       	public mutating func eat(kindSatisfying predicate: (TokenKind) -> Bool) -> Bool {

     

       103
       103
       +
       	public mutating func eat(kindSatisfying predicate: (TokenKind) -> Bool, metadata: TokenMetadata?) -> Bool {

     

       104
       104
        
       		guard !isEndOfFile && isAt(kindSatisfying: predicate) else { return false }

     

       105
       105
       -
       		advance()

     

       105
       105
       +
       		advance(metadata: metadata)

     

       106
       106
        
       		return true

     

       107
       107
        
       	}

     

       108
       108
        
       

     

       109
       109
       -
       	public mutating func eat(kind: TokenKind) -> Bool {

     

       110
       110
       -
       		eat { $0 == kind }

     

       109
       109
       +
       	public mutating func eat(kind: TokenKind, metadata: TokenMetadata?) -> Bool {

     

       110
       110
       +
       		eat(kindSatisfying: { $0 == kind }, metadata: metadata)

     

       111
       111
        
       	}

     

       112
       112
        
       

     

       113
       113
       -
       	public mutating func expect(kind: TokenKind, error: String? = nil) {

     

       114
       114
       -
       		if eat(kind: kind) { return }

     

       113
       113
       +
       	public mutating func expect(kind: TokenKind, metadata: TokenMetadata?, error: String? = nil) {

     

       114
       114
       +
       		if eat(kind: kind, metadata: metadata) { return }

     

       115
       115
        
       		let diagnostic = Diagnostic(

     

       116
       116
        
       			message: error ?? "Expected \(kind) but got \(currentToken.kind): `\(currentToken.text)`",

     

       117
       117
        
       			absoluteRange: absoluteRangeAtCursor

     
···

       121
       121
        
       

     

       122
       122
        
       	public var tree: SyntaxTree {

     

       123
       123
        
       		var events = events

     

       124
       124
       -
       		var stack: [SyntaxTree] = []

     

       124
       124
       +
       		var stack: [SyntaxTree.Builder] = []

     

       125
       125
        
       		var cursor: Int = 0

     

       126
       126
        
       

     

       127
       127
        
       		precondition(events.popLast() == .close)

     

       128
       128
        
       

     

       129
       129
        
       		for event in events {

     

       130
       130
        
       			switch event {

     

       131
       131
       -
       			case .open(let kind):

     

       132
       132
       -
       				stack.append(SyntaxTree(kind: kind, children: []))

     

       131
       131
       +
       			case .open(let kind, let metadata):

     

       132
       132
       +
       				stack.append(SyntaxTree.Builder(kind: kind, metadata: metadata, children: []))

     

       133
       133
        
       			case .close:

     

       134
       134
        
       				let tree = stack.popLast()!

     

       135
       135
        
       				stack.modifyLast { last in

     

       136
       136
       -
       					last.children.append(.tree(tree))

     

       136
       136
       +
       					last.children.append(.tree(tree.tree))

     

       137
       137
        
       				}

     

       138
       138
       -
       			case .advance:

     

       138
       138
       +
       			case .advance(let metadata):

     

       139
       139
        
       				let token = tokens[cursor]

     

       140
       140
        
       				cursor += 1

     

       141
       141
        
       				stack.modifyLast { last in

     

       142
       142
       -
       					last.children.append(.token(token))

     

       142
       142
       +
       					last.children.append(.token(token, metadata: metadata))

     

       143
       143
        
       				}

     

       144
       144
        
       			}

     

       145
       145
        
       		}

     

       146
       146
        
       

     

       147
       147
        
       		assert(stack.count == 1)

     

       148
       148
       -
       		return stack.popLast()!

     

       148
       148
       +
       		return stack.popLast()!.tree

     

       149
       149
       +
       	}

     

       150
       150
       +
       

     

       151
       151
       +
       	mutating func eatTrivium() -> Bool {

     

       152
       152
       +
       		switch currentToken.kind {

     

       153
       153
       +
       		case .whitespace:

     

       154
       154
       +
       			advance(metadata: nil)

     

       155
       155
       +
       			return true

     

       156
       156
       +
       		case .blockComment(let terminated):

     

       157
       157
       +
       			let metadata = TokenMetadata(

     

       158
       158
       +
       				semanticTokenType: .comment,

     

       159
       159
       +
       				delimitedFoldingRangeKind: .comment

     

       160
       160
       +
       			)

     

       161
       161
       +
       			if terminated {

     

       162
       162
       +
       				advance(metadata: metadata)

     

       163
       163
       +
       			} else {

     

       164
       164
       +
       				advance(error: "Block comment was not terminated")

     

       165
       165
       +
       			}

     

       166
       166
       +
       			return true

     

       167
       167
       +
       		case .lineComment:

     

       168
       168
       +
       			advance(metadata: TokenMetadata(semanticTokenType: .comment))

     

       169
       169
       +
       			return true

     

       170
       170
       +
       		default:

     

       171
       171
       +
       			return false

     

       172
       172
       +
       		}

     

       149
       173
        
       	}

     

       174
       174
       +
       

     

       175
       175
       +
       	mutating func eatTrivia() {

     

       176
       176
       +
       		while !isEndOfFile && eatTrivium() {}

     

       177
       177
       +
       	}

     

       178
       178
       +
       

     

       150
       179
        
       }

     

       151
       180
        
       

     

       152
       181
        
       extension Array {

+69

Sources/PterodactylSyntax/SemanticToken.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       import LanguageServerProtocol

     

       7
       7
       +
       

     

       8
       8
       +
       extension SemanticTokenTypes {

     

       9
       9
       +
       	public var index: Int {

     

       10
       10
       +
       		Self.allCases.firstIndex(of: self)!

     

       11
       11
       +
       	}

     

       12
       12
       +
       }

     

       13
       13
       +
       

     

       14
       14
       +
       extension SemanticTokenModifiers {

     

       15
       15
       +
       	private static let modifierBitPositions: [SemanticTokenModifiers: Int] = {

     

       16
       16
       +
       		var dict: [SemanticTokenModifiers: Int] = [:]

     

       17
       17
       +
       		for (i, modifier) in SemanticTokenModifiers.allCases.enumerated() {

     

       18
       18
       +
       			dict[modifier] = i

     

       19
       19
       +
       		}

     

       20
       20
       +
       		return dict

     

       21
       21
       +
       	}()

     

       22
       22
       +
       

     

       23
       23
       +
       	static func encodeBitset(_ modifiers: Set<SemanticTokenModifiers>) -> UInt32 {

     

       24
       24
       +
       		var bitset: UInt32 = 0

     

       25
       25
       +
       		for modifier in modifiers {

     

       26
       26
       +
       			if let bit = modifierBitPositions[modifier] {

     

       27
       27
       +
       				bitset |= (1 << bit)

     

       28
       28
       +
       			}

     

       29
       29
       +
       		}

     

       30
       30
       +
       		return bitset

     

       31
       31
       +
       	}

     

       32
       32
       +
       }

     

       33
       33
       +
       

     

       34
       34
       +
       

     

       35
       35
       +
       struct SingleLineRange {

     

       36
       36
       +
       	let line: Int

     

       37
       37
       +
       	let char: Int

     

       38
       38
       +
       	let length: Int

     

       39
       39
       +
       }

     

       40
       40
       +
       

     

       41
       41
       +
       

     

       42
       42
       +
       extension TokenMetadata {

     

       43
       43
       +
       	func semanticToken(range: SingleLineRange) -> SemanticToken? {

     

       44
       44
       +
       		guard range.length > 0 else { return nil }

     

       45
       45
       +
       		return SemanticToken(

     

       46
       46
       +
       			line: UInt32(range.line),

     

       47
       47
       +
       			char: UInt32(range.char),

     

       48
       48
       +
       			length: UInt32(range.length),

     

       49
       49
       +
       			type: UInt32(semanticTokenType.index),

     

       50
       50
       +
       			modifiers: SemanticTokenModifiers.encodeBitset(semanticTokenModifiers)

     

       51
       51
       +
       		)

     

       52
       52
       +
       	}

     

       53
       53
       +
       }

     

       54
       54
       +
       

     

       55
       55
       +
       extension SyntaxTree.Cursor {

     

       56
       56
       +
       	var singleLineRanges: [SingleLineRange] {

     

       57
       57
       +
       		var result: [SingleLineRange] = []

     

       58
       58
       +
       		var location = lineMap.location(at: utf16Offset)

     

       59
       59
       +
       

     

       60
       60
       +
       		for line in node.text.split(omittingEmptySubsequences: false, whereSeparator: \.isNewline) {

     

       61
       61
       +
       			let length = line.utf16.count

     

       62
       62
       +
       			result.append(SingleLineRange(line: location.line, char: location.column, length: length))

     

       63
       63
       +
       			location.line += 1

     

       64
       64
       +
       			location.column = 0

     

       65
       65
       +
       		}

     

       66
       66
       +
       

     

       67
       67
       +
       		return result

     

       68
       68
       +
       	}

     

       69
       69
       +
       }

+40 -15

Sources/PterodactylSyntax/SyntaxTree.swift

···

       5
       5
        
       import Foundation

     

       6
       6
        
       

     

       7
       7
        
       public struct SyntaxTree: Codable, Sendable {

     

       8
       8
       -
       	public var kind: SyntaxTreeKind

     

       9
       9
       -
       	public var metadata: SyntaxTreeMetadata?

     

       10
       10
       -
       	public var children: [Child]

     

       8
       8
       +
       	public let kind: SyntaxTreeKind

     

       9
       9
       +
       	public let metadata: SyntaxTreeMetadata?

     

       10
       10
       +
       	public let children: [Child]

     

       11
       11
       +
       	public let utf16Length: Int

     

       11
       12
        
       

     

       12
       12
       -
       	public var utf16Length: Int {

     

       13
       13
       -
       		children.reduce(0) { length, child in

     

       14
       14
       -
       			length + child.utf16Length

     

       15
       15
       -
       		}

     

       13
       13
       +
       	public enum Child: Codable, Sendable {

     

       14
       14
       +
       		case token(Token, metadata: TokenMetadata?)

     

       15
       15
       +
       		case tree(SyntaxTree)

     

       16
       16
        
       	}

     

       17
       17
        
       

     

       18
       18
       -
         public enum Child: Codable, Sendable {

     

       19
       19
       -
           case token(Token, metadata: TokenMetadata? = nil)

     

       20
       20
       -
           case tree(SyntaxTree)

     

       21
       21
       -
         }

     

       22
       22
       -
       

     

       23
       23
       -
         public init(kind: SyntaxTreeKind, metadata: SyntaxTreeMetadata? = nil, children: [SyntaxTree.Child]) {

     

       18
       18
       +
       	public init(kind: SyntaxTreeKind, metadata: SyntaxTreeMetadata? = nil, children: [SyntaxTree.Child]) {

     

       24
       19
        
       		self.kind = kind

     

       25
       20
        
       		self.metadata = metadata

     

       26
       21
        
       		self.children = children

     

       22
       22
       +
       		self.utf16Length = children.reduce(0) { length, child in

     

       23
       23
       +
       			length + child.utf16Length

     

       24
       24
       +
       		}

     

       25
       25
       +
       	}

     

       26
       26
       +
       }

     

       27
       27
       +
       

     

       28
       28
       +
       extension SyntaxTree {

     

       29
       29
       +
       	/// A mutable version of ``SyntaxTree`` that does not keep track of textual length, for use when constructing trees.

     

       30
       30
       +
       	public struct Builder {

     

       31
       31
       +
       		public var kind: SyntaxTreeKind

     

       32
       32
       +
       		public var metadata: SyntaxTreeMetadata?

     

       33
       33
       +
       		public var children: [Child]

     

       34
       34
       +
       		

     

       35
       35
       +
       		var tree: SyntaxTree {

     

       36
       36
       +
       			SyntaxTree(kind: kind, metadata: metadata, children: children)

     

       37
       37
       +
       		}

     

       27
       38
        
       	}

     

       28
       39
        
       }

     

       29
       40
        
       

     
···

       34
       45
        
       }

     

       35
       46
        
       

     

       36
       47
        
       extension SyntaxTree.Child {

     

       37
       37
       -
       	var text: String {

     

       48
       48
       +
       	public var text: String {

     

       38
       49
        
       		switch self {

     

       39
       50
        
       		case let .token(tok, _): tok.text

     

       40
       51
        
       		case let .tree(tree): tree.text

     

       41
       52
        
       		}

     

       42
       53
        
       	}

     

       54
       54
       +
       	

     

       55
       55
       +
       	public var tree: SyntaxTree? {

     

       56
       56
       +
       		switch self {

     

       57
       57
       +
       		case let .tree(tree): tree

     

       58
       58
       +
       		default: nil

     

       59
       59
       +
       		}

     

       60
       60
       +
       	}

     

       43
       61
        
       

     

       62
       62
       +
       	var token: (Token, TokenMetadata?)? {

     

       63
       63
       +
       		switch self {

     

       64
       64
       +
       		case let .token(token, metadata): (token, metadata)

     

       65
       65
       +
       		default: nil

     

       66
       66
       +
       		}

     

       67
       67
       +
       	}

     

       68
       68
       +
       	

     

       44
       69
        
       	var utf16Length: Int {

     

       45
       70
        
       		switch self {

     

       46
       71
        
       		case let .token(token, _): token.utf16Length

     

       47
       72
        
       		case let .tree(tree): tree.utf16Length

     

       48
       73
        
       		}

     

       49
       74
        
       	}

     

       50
       50
       -
       

     

       75
       75
       +
       	

     

       51
       76
        
       	var children: [Self] {

     

       52
       77
        
       		switch self {

     

       53
       78
        
       		case .token: []

+21

Sources/PterodactylSyntax/SyntaxView.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       

     

       7
       7
       +
       struct SyntaxView<G: Grammar> {

     

       8
       8
       +
       	let cursor: SyntaxTree.Cursor

     

       9
       9
       +
       	init?(_ cursor: SyntaxTree.Cursor) {

     

       10
       10
       +
       		guard let kind = cursor.node.tree?.kind, G.kinds.contains(kind) else { return nil }

     

       11
       11
       +
       		self.cursor = cursor

     

       12
       12
       +
       	}

     

       13
       13
       +
       	

     

       14
       14
       +
       	func matchingSubview<X: Grammar>() -> SyntaxView<X>? {

     

       15
       15
       +
       		return cursor.firstChild(mapping: SyntaxView<X>.init)

     

       16
       16
       +
       	}

     

       17
       17
       +
       	

     

       18
       18
       +
       	func matchingSubviews<X: Grammar>() -> [SyntaxView<X>] {

     

       19
       19
       +
       		return cursor.children(mapping: SyntaxView<X>.init)

     

       20
       20
       +
       	}

     

       21
       21
       +
       }

+1 -1

Sources/PterodactylSyntax/Token.swift

···

       9
       9
        
       	public let text: String

     

       10
       10
        
       	public let utf16Length: Int

     

       11
       11
        
       	

     

       12
       12
       -
       	init(kind: TokenKind, text: String) {

     

       12
       12
       +
       	public init(kind: TokenKind, text: String) {

     

       13
       13
        
       		self.kind = kind

     

       14
       14
        
       		self.text = text

     

       15
       15
        
       		self.utf16Length = text.utf16.count

+60 -30

Sources/PterodactylSyntax/Types.swift

···

       3
       3
        
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
        
       

     

       5
       5
        
       import Foundation

     

       6
       6
       +
       import LanguageServerProtocol

     

       6
       7
        
       

     

       7
       7
       -
       public enum Keyword: Codable, Equatable, Sendable {

     

       8
       8
       -
       	case `import`

     

       9
       9
       -
       	case theory

     

       10
       10
       -
       	case `where`

     

       8
       8
       +
       public enum Keyword: String, Codable, Sendable, CaseIterable {

     

       9
       9
       +
       	case theory = "theory"

     

       10
       10
       +
       	case `where` = "where"

     

       11
       11
       +
       	case `import` = "import"

     

       11
       12
        
       }

     

       12
       13
        
       

     

       13
       13
       -
       public enum Whitespace: Codable, Equatable, Sendable {

     

       14
       14
       -
       	case newline

     

       15
       15
       -
       	case other

     

       14
       14
       +
       public enum Punctuation: String, CaseIterable, Codable, Equatable, Sendable {

     

       15
       15
       +
       	case lparen = "("

     

       16
       16
       +
       	case rparen = ")"

     

       17
       17
       +
       	case lbrace = "{"

     

       18
       18
       +
       	case rbrace = "}"

     

       19
       19
       +
       	case comma = ","

     

       20
       20
       +
       	case dot = "."

     

       21
       21
       +
       	case colon = ":"

     

       22
       22
       +
       	case doubleLeftArrow = "<="

     

       23
       23
       +
       	case doubleRightArrow = "=>"

     

       24
       24
       +
       	case equal = "="

     

       16
       25
        
       }

     

       17
       26
        
       

     

       18
       27
        
       public enum TokenKind: Codable, Equatable, Sendable {

     

       19
       19
       -
         case eof

     

       28
       28
       +
       	case eof

     

       20
       29
        
       	case keyword(Keyword)

     

       30
       30
       +
       	case punctuation(Punctuation)

     

       21
       31
        
       	case error

     

       22
       32
        
       	case identifier

     

       23
       23
       -
       	case whitespace(Whitespace)

     

       33
       33
       +
       	case newline

     

       34
       34
       +
       	case whitespace

     

       24
       35
        
       	case blockBegin

     

       25
       36
        
       	case blockEnd

     

       26
       37
        
       	case blockSep

     

       38
       38
       +
       	case lineComment

     

       39
       39
       +
       	case blockComment(terminated: Bool)

     

       40
       40
       +
       }

     

       41
       41
       +
       

     

       42
       42
       +
       extension TokenKind {

     

       43
       43
       +
       	public var isTrivia: Bool {

     

       44
       44
       +
       		switch self {

     

       45
       45
       +
       		case .whitespace, .newline, .lineComment, .blockComment: true

     

       46
       46
       +
       		default: false

     

       47
       47
       +
       		}

     

       48
       48
       +
       	}

     

       49
       49
       +
       

     

       50
       50
       +
       	public var isVisible: Bool {

     

       51
       51
       +
       		switch self {

     

       52
       52
       +
       		case .whitespace, .blockBegin, .blockSep, .blockEnd, .newline: false

     

       53
       53
       +
       		default: true

     

       54
       54
       +
       		}

     

       55
       55
       +
       	}

     

       56
       56
       +
       	public var canDetermineLayoutColumn: Bool {

     

       57
       57
       +
       		switch self {

     

       58
       58
       +
       		case .whitespace, .eof: false

     

       59
       59
       +
       		default: true

     

       60
       60
       +
       		}

     

       61
       61
       +
       	}

     

       62
       62
       +
       

     

       63
       63
       +
       	public var isBlockHerald: Bool {

     

       64
       64
       +
       		switch self {

     

       65
       65
       +
       		case .keyword(.where): true

     

       66
       66
       +
       		default: false

     

       67
       67
       +
       		}

     

       68
       68
       +
       	}

     

       69
       69
       +
       

     

       27
       70
        
       }

     

       28
       71
        
       

     

       29
       72
        
       public final class SyntaxTreeKind: Codable, Equatable, Sendable {

     

       30
       73
        
       	static let error: SyntaxTreeKind = .init(name: "error")

     

       31
       31
       -
       	

     

       74
       74
       +
       

     

       32
       75
        
       	public static func == (lhs: SyntaxTreeKind, rhs: SyntaxTreeKind) -> Bool {

     

       33
       76
        
       		lhs === rhs

     

       34
       77
        
       	}

     

       35
       35
       -
       	

     

       78
       78
       +
       

     

       36
       79
        
       	let name: String

     

       37
       80
        
       	var description: String { name }

     

       38
       38
       -
       	

     

       81
       81
       +
       

     

       39
       82
        
       	required init(name: String) {

     

       40
       83
        
       		self.name = name

     

       41
       84
        
       	}

     

       42
       85
        
       }

     

       43
       86
        
       

     

       44
       44
       -
       public struct TokenMetadata: Codable, Equatable, Sendable {

     

       87
       87
       +
       public struct TokenMetadata: Equatable, Codable, Sendable {

     

       88
       88
       +
       	public var semanticTokenType: SemanticTokenTypes

     

       89
       89
       +
       	public var semanticTokenModifiers: Set<SemanticTokenModifiers> = []

     

       90
       90
       +
       	public var delimitedFoldingRangeKind: FoldingRangeKind? = nil

     

       45
       91
        
       }

     

       46
       92
        
       

     

       47
       93
        
       public struct SyntaxTreeMetadata: Codable, Equatable, Sendable {

     

       48
       48
       -
         

     

       49
       49
       -
       }

     

       50
       50
       -
       

     

       51
       51
       -
       extension TokenKind {

     

       52
       52
       -
       	var canDetermineLayoutColumn: Bool {

     

       53
       53
       -
       		switch self {

     

       54
       54
       -
       		case .whitespace, .eof: false

     

       55
       55
       -
       		default: true

     

       56
       56
       -
       		}

     

       57
       57
       -
       	}

     

       58
       58
       -
       	

     

       59
       59
       -
       	var isBlockHerald: Bool {

     

       60
       60
       -
       		switch self {

     

       61
       61
       -
       		case .keyword(.where): true

     

       62
       62
       -
       		default: false 

     

       63
       63
       -
       		}

     

       64
       64
       -
       	}

     

       94
       94
       +
       	public var delimitedFoldingRangeKind: FoldingRangeKind? = nil

     

       65
       95
        
       }

+1 -1

Tests/PterodactylBuildTests/Test.swift

···

       42
       42
        
       			]

     

       43
       43
        
       		)

     

       44
       44
        
       

     

       45
       45
       -
       		let dependenciesOfBaz = try await engine.build(key: Keys.TransitiveDependencies(sourceTreeId: treeID, unitName: baz), ctx).get().dependencies

     

       45
       45
       +
       		let dependenciesOfBaz = try await engine.build(key: Keys.TransitiveDependencies(sourceTreeId: treeID, unitName: baz), ctx).get()

     

       46
       46
        
       		#expect(dependenciesOfBaz == [foo, bar])

     

       47
       47
        
       		return

     

       48
       48
        
       	}