comparing fd7f556af22a568d6eef23de9d76f30882e15ec4 and main on jonmsterling.com/swift-pterodactyl

+2 -2

Package.swift

···

       24
       24
        
       			name: "PterodactylBuild",

     

       25
       25
        
       			targets: ["PterodactylBuild"]

     

       26
       26
        
       		),

     

       27
       27
       -
       		.library(

     

       27
       27
       +
       		.executable(

     

       28
       28
        
       			name: "PterodactylLanguageServer",

     

       29
       29
        
       			targets: ["PterodactylLanguageServer"]

     

       30
       30
        
       		)

     
···

       56
       56
        
       				.product(name: "llbuild2fx", package: "swift-llbuild2")

     

       57
       57
        
       			]

     

       58
       58
        
       		),

     

       59
       59
       -
       		.target(

     

       59
       59
       +
       		.executableTarget(

     

       60
       60
        
       			name: "PterodactylLanguageServer",

     

       61
       61
        
       			dependencies: [

     

       62
       62
        
       				"LanguageServer",

+8 -5

Sources/PterodactylBuild/Keys/Blob/GetLineMap.swift

···

       7
       7
        
       import llbuild2fx

     

       8
       8
        
       

     

       9
       9
        
       extension Keys.Blob {

     

       10
       10
       -
       	struct GetLineMap: BuildKey {

     

       11
       11
       -
       		let blobId: LLBDataID

     

       10
       10
       +
       	public struct GetLineMap: BuildKey {

     

       11
       11
       +
       		public let blobId: LLBDataID

     

       12
       12
       +
       		public init(blobId: LLBDataID) {

     

       13
       13
       +
       			self.blobId = blobId

     

       14
       14
       +
       		}

     

       12
       15
        
       		

     

       13
       13
       -
       		typealias ValueType = PterodactylSyntax.LineMap

     

       16
       16
       +
       		public typealias ValueType = PterodactylSyntax.LineMap

     

       14
       17
        
       

     

       15
       15
       -
       		static let versionDependencies: [any FXVersioning.Type] = [ReadContents.self]

     

       18
       18
       +
       		public static let versionDependencies: [any FXVersioning.Type] = [ReadContents.self]

     

       16
       19
        
       

     

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

     

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

     

       18
       21
        
       			let code = try await ctx.request(ReadContents(blobId: blobId))

     

       19
       22
        
       			return PterodactylSyntax.LineMap(source: code)

     

       20
       23
        
       		}

+14 -10

Sources/PterodactylBuild/Keys/Blob/ParseDocument.swift

···

       5
       5
        
       import Foundation

     

       6
       6
        
       import PterodactylSyntax

     

       7
       7
        
       import llbuild2fx

     

       8
       8
       +
       import Logging

     

       8
       9
        
       

     

       9
       10
        
       extension Keys.Blob {

     

       10
       10
       -
       	struct ParseDocument: BuildKey {

     

       11
       11
       -
       		let blobId: LLBDataID

     

       12
       12
       -
       		

     

       13
       13
       -
       		struct ValueType: Codable, FXValue {

     

       14
       14
       -
       			let tree: PterodactylSyntax.SyntaxTree

     

       15
       15
       -
       			let diagnostics: [Diagnostic]

     

       11
       11
       +
       	public struct ParseDocument: BuildKey {

     

       12
       12
       +
       		public let blobId: LLBDataID

     

       13
       13
       +
       		public init(blobId: LLBDataID) {

     

       14
       14
       +
       			self.blobId = blobId

     

       16
       15
        
       		}

     

       17
       16
        
       

     

       18
       18
       -
       		static let versionDependencies: [any FXVersioning.Type] = [ReadContents.self, Tokenise.self]

     

       17
       17
       +
       		public struct ValueType: Codable, FXValue {

     

       18
       18
       +
       			public let tree: PterodactylSyntax.SyntaxTree

     

       19
       19
       +
       			public let diagnostics: [Diagnostic]

     

       20
       20
       +
       		}

     

       19
       21
        
       

     

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

     

       22
       22
       +
       		public static let versionDependencies: [any FXVersioning.Type] = [ReadContents.self, Tokenise.self]

     

       23
       23
       +
       

     

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

     

       21
       25
        
       			let code = try await ctx.request(ReadContents(blobId: blobId))

     

       22
       26
        
       			let tokens = try await ctx.request(Tokenise(blobId: blobId))

     

       23
       27
        
       			var parser = Parser(source: code, tokens: tokens)

     

       24
       24
       -
       			PterodactylSyntax.Document.parse(&parser)

     

       25
       25
       -
       			return ValueType(tree: parser.tree, diagnostics: parser.diagnostics)

     

       28
       28
       +
       			PterodactylSyntax.Document.parse(&parser, recovery: [])

     

       29
       29
       +
       			return ValueType(tree: parser.builder.tree, diagnostics: parser.diagnostics)

     

       26
       30
        
       		}

     

       27
       31
        
       	}

     

       28
       32
        
       }

+17

Sources/PterodactylLanguageServer/Archive/LLBDeclFileTree+Singleton.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 LLBDeclFileTree {

     

       10
       10
       +
       	public static func file(absolutePath: AbsolutePath, contents: String) -> Self {

     

       11
       11
       +
       		let components = absolutePath.components

     

       12
       12
       +
       		let leaf = LLBDeclFileTree.file(contents)

     

       13
       13
       +
       		return components.dropFirst().reversed().reduce(leaf) { tail, name in

     

       14
       14
       +
       			.directory(files: [name: tail])

     

       15
       15
       +
       		}

     

       16
       16
       +
       	}

     

       17
       17
       +
       }

+40

Sources/PterodactylLanguageServer/Archive/SourceTreeManager.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 LanguageServerProtocol

     

       6
       6
       +
       //import PterodactylBuild

     

       7
       7
       +
       //import TSCBasic

     

       8
       8
       +
       //import llbuild2fx

     

       9
       9
       +
       //

     

       10
       10
       +
       //actor SourceTreeManager {

     

       11
       11
       +
       //	private let buildEngine: FXEngine

     

       12
       12
       +
       //	private let casClient: LLBCASFSClient

     

       13
       13
       +
       //	private let casContext: TSCUtility.Context

     

       14
       14
       +
       //	private(set) var sourceTree: LLBCASFileTree

     

       15
       15
       +
       //

     

       16
       16
       +
       //	init(buildEngine: FXEngine, casClient: LLBCASFSClient, casContext: TSCUtility.Context, sourceTree: LLBCASFileTree? = nil) async throws {

     

       17
       17
       +
       //		self.buildEngine = buildEngine

     

       18
       18
       +
       //		self.casClient = casClient

     

       19
       19
       +
       //		self.casContext = casContext

     

       20
       20
       +
       //		if let sourceTree {

     

       21
       21
       +
       //			self.sourceTree = sourceTree

     

       22
       22
       +
       //		} else {

     

       23
       23
       +
       //			self.sourceTree = try await casClient.storeDir(.dir([:]), casContext).get()

     

       24
       24
       +
       //		}

     

       25
       25
       +
       //	}

     

       26
       26
       +
       //

     

       27
       27
       +
       //	func setBufferText(uri: DocumentUri, text: String) async throws -> LLBCASFileTree {

     

       28
       28
       +
       //		let path = try AbsolutePath.fromDocumentUri(uri)

     

       29
       29
       +
       //		let singletonDeclTree = LLBDeclFileTree.file(absolutePath: path, contents: text)

     

       30
       30
       +
       //		let singletonTree: LLBCASFileTree = try await casClient.storeDir(singletonDeclTree, casContext).get()

     

       31
       31
       +
       //		self.sourceTree = try await sourceTree.merge(with: singletonTree, in: casClient.db, casContext).get()

     

       32
       32
       +
       //		return sourceTree

     

       33
       33
       +
       //	}

     

       34
       34
       +
       //

     

       35
       35
       +
       //	func getBufferText(uri: DocumentUri) async throws -> String? {

     

       36
       36
       +
       //		let path = try AbsolutePath.fromDocumentUri(uri)

     

       37
       37
       +
       //		guard let (id, _) = try await sourceTree.lookup(path: path, in: casClient.db, casContext).get() else { return nil }

     

       38
       38
       +
       //		return try await buildEngine.build(key: Keys.Blob.ReadContents(blobId: id), casContext).get()

     

       39
       39
       +
       //	}

     

       40
       40
       +
       //}

+44 -27

Sources/PterodactylLanguageServer/EventHandler.swift

···

       8
       8
        
       import LanguageServerProtocol

     

       9
       9
        
       import Logging

     

       10
       10
        
       import PterodactylBuild

     

       11
       11
       +
       import PterodactylSyntax

     

       11
       12
        
       import TSCBasic

     

       12
       13
        
       import llbuild2fx

     

       13
       14
        
       

     
···

       16
       17
        
       	private let buildEngine: FXEngine

     

       17
       18
        
       	private let casContext: TSCUtility.Context

     

       18
       19
        
       	private let casClient: LLBCASFSClient

     

       19
       19
       -
       	private let sourceTreeManager: SourceTreeManager

     

       20
       20
        
       

     

       21
       21
       -
       	init(connection: JSONRPCClientConnection) async throws {

     

       21
       21
       +
       	var storedBlobs: [DocumentUri: (blobId: LLBDataID, version: Int?)] = [:]

     

       22
       22
       +
       

     

       23
       23
       +
       	init(connection: JSONRPCClientConnection) {

     

       22
       24
        
       		self.connection = connection

     

       23
       25
        
       

     

       24
       26
        
       		let group = LLBMakeDefaultDispatchGroup()

     
···

       28
       30
        
       		self.buildEngine = FXEngine(group: group, db: db, functionCache: functionCache, executor: executor)

     

       29
       31
        
       		self.casClient = LLBCASFSClient(db)

     

       30
       32
        
       		self.casContext = Context()

     

       31
       31
       -
       

     

       32
       32
       -
       		self.sourceTreeManager = try await SourceTreeManager(buildEngine: buildEngine, casClient: casClient, casContext: casContext)

     

       33
       33
        
       	}

     

       34
       34
        
       

     

       35
       35
       -
       	func publishDiagnostics(uri: String, version: Int?) async throws {

     

       35
       35
       +
       	func storeBlob(text: String, uri: DocumentUri, version: Int?) async throws -> LLBDataID {

     

       36
       36
       +
       		if let stored = storedBlobs[uri], let version, let storedVersion = stored.version, storedVersion >= version {

     

       37
       37
       +
       			return stored.blobId

     

       38
       38
       +
       		}

     

       36
       39
        
       

     

       40
       40
       +
       		let blobId: LLBDataID = try await casClient.store(LLBByteBuffer(string: text), casContext).get()

     

       41
       41
       +
       		storedBlobs[uri] = (blobId: blobId, version: version)

     

       42
       42
       +
       		return blobId

     

       43
       43
       +
       	}

     

       44
       44
       +
       

     

       45
       45
       +
       	func publishLiveDiagnostics(blobId: LLBDataID, uri: DocumentUri, version: Int?) async throws {

     

       46
       46
       +
       		let lineMap = try await buildEngine.build(key: Keys.Blob.GetLineMap(blobId: blobId), casContext).get()

     

       47
       47
       +
       		let parseResult = try await buildEngine.build(key: Keys.Blob.ParseDocument(blobId: blobId), casContext).get()

     

       48
       48
       +
       		let diagnostics = parseResult.diagnostics.map { $0.lspDiagnostic(lineMap: lineMap) }

     

       49
       49
       +
       		let publishParams = PublishDiagnosticsParams(uri: uri, version: version, diagnostics: diagnostics)

     

       50
       50
       +
       		try await connection.sendNotification(.textDocumentPublishDiagnostics(publishParams))

     

       37
       51
        
       	}

     

       38
       52
        
       }

     

       39
       53
        
       

     
···

       43
       57
        
       		TextDocumentSyncOptions(

     

       44
       58
        
       			openClose: true,

     

       45
       59
        
       			change: .full,

     

       60
       60
       +
       

     

       46
       61
        
       			save: .optionA(false)

     

       47
       62
        
       		)

     

       48
       63
        
       	}

     
···

       83
       98
        
       	func textDocumentDidChange(_ params: DidChangeTextDocumentParams) async {

     

       84
       99
        
       		guard let text = params.contentChanges.first?.text else { return }

     

       85
       100
        
       		do {

     

       86
       86
       -
       			try await sourceTreeManager.setBufferText(uri: params.textDocument.uri, text: text)

     

       87
       87
       -
       			// FIXME: this needs to be a transaction.

     

       88
       88
       -
       			//			try await  publishDiagnostics(uri: params.textDocument.uri, version: params.textDocument.version)

     

       101
       101
       +
       			let blobId: LLBDataID = try await storeBlob(text: text, uri: params.textDocument.uri, version: params.textDocument.version)

     

       102
       102
       +
       			try await publishLiveDiagnostics(blobId: blobId, uri: params.textDocument.uri, version: params.textDocument.version)

     

       89
       103
        
       		} catch {}

     

       90
       104
        
       	}

     

       91
       105
        
       

     

       92
       106
        
       	func textDocumentDidOpen(_ params: DidOpenTextDocumentParams) async {

     

       93
       93
       -
       		// TODO: restore

     

       94
       94
       -
       		//		await bufferManager.setBufferText(key: params.textDocument.uri, text: params.textDocument.text)

     

       107
       107
       +
       		let text = params.textDocument.text

     

       95
       108
        
       		do {

     

       96
       96
       -
       			try await publishDiagnostics(uri: params.textDocument.uri, version: params.textDocument.version)

     

       109
       109
       +
       			let blobId: LLBDataID = try await storeBlob(text: text, uri: params.textDocument.uri, version: params.textDocument.version)

     

       110
       110
       +
       			try await publishLiveDiagnostics(blobId: blobId, uri: params.textDocument.uri, version: params.textDocument.version)

     

       97
       111
        
       		} catch {}

     

       98
       112
        
       	}

     

       99
       113
        
       

     

       100
       114
        
       	func semanticTokensFull(id: JSONId, params: SemanticTokensParams) async -> Response<SemanticTokensResponse> {

     

       101
       101
       -
       		// TODO: restore

     

       102
       102
       -
       		//		guard let document = await bufferManager.documentForBuffer(key: params.textDocument.uri) else { return .success(nil) }

     

       115
       115
       +
       		guard let storedBlob = storedBlobs[params.textDocument.uri] else { return .success(nil) }

     

       103
       116
        
       

     

       104
       104
       -
       		let tokenSink: [SemanticToken] = []

     

       105
       105
       -
       		// TODO: restore

     

       106
       106
       -
       		//		document.tree.collectSemanticTokens(&tokenSink)

     

       107
       107
       -
       

     

       108
       108
       -
       		let response = SemanticTokensResponse(SemanticTokens(resultId: nil, tokens: tokenSink))

     

       109
       109
       -
       		return .success(response)

     

       117
       117
       +
       		do {

     

       118
       118
       +
       			let lineMap = try await buildEngine.build(key: Keys.Blob.GetLineMap(blobId: storedBlob.blobId), casContext).get()

     

       119
       119
       +
       			let parseResult = try await buildEngine.build(key: Keys.Blob.ParseDocument(blobId: storedBlob.blobId), casContext).get()

     

       120
       120
       +
       			let cursor = SyntaxCursor(lineMap: lineMap, node: .tree(parseResult.tree), utf16Offset: 0)

     

       121
       121
       +
       			return .success(SemanticTokensResponse(SemanticTokens(resultId: nil, tokens: cursor.semanticTokens)))

     

       122
       122
       +
       		} catch {

     

       123
       123
       +
       			return .success(nil)

     

       124
       124
       +
       		}

     

       110
       125
        
       	}

     

       111
       126
        
       

     

       112
       127
        
       	func foldingRange(id: JSONId, params: FoldingRangeParams) async -> Response<FoldingRangeResponse> {

     

       113
       113
       -
       		// TODO: restore

     

       114
       114
       -
       		//		guard let document = await bufferManager.documentForBuffer(key: params.textDocument.uri) else { return .success(nil) }

     

       115
       115
       -
       		let rangeSink: [FoldingRange] = []

     

       116
       116
       -
       		// TODO: restore

     

       117
       117
       -
       		//		document.tree.collectFoldingRanges(&rangeSink)

     

       118
       118
       -
       		let response = FoldingRangeResponse(rangeSink)

     

       119
       119
       -
       		Logger.shared.info("Ranges: \(rangeSink)")

     

       120
       120
       -
       		return .success(response)

     

       128
       128
       +
       		guard let storedBlob = storedBlobs[params.textDocument.uri] else { return .success(nil) }

     

       129
       129
       +
       

     

       130
       130
       +
       		do {

     

       131
       131
       +
       			let lineMap = try await buildEngine.build(key: Keys.Blob.GetLineMap(blobId: storedBlob.blobId), casContext).get()

     

       132
       132
       +
       			let parseResult = try await buildEngine.build(key: Keys.Blob.ParseDocument(blobId: storedBlob.blobId), casContext).get()

     

       133
       133
       +
       			let cursor = SyntaxCursor(lineMap: lineMap, node: .tree(parseResult.tree), utf16Offset: 0)

     

       134
       134
       +
       			return .success(FoldingRangeResponse(cursor.foldingRanges))

     

       135
       135
       +
       		} catch {

     

       136
       136
       +
       			return .success(nil)

     

       137
       137
       +
       		}

     

       121
       138
        
       	}

     

       122
       139
        
       

     

       123
       140

-17

Sources/PterodactylLanguageServer/LLBDeclFileTree+Singleton.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 LLBDeclFileTree {

     

       10
       10
       -
       	public static func file(absolutePath: AbsolutePath, contents: String) -> Self {

     

       11
       11
       -
       		let components = absolutePath.components

     

       12
       12
       -
       		let leaf = LLBDeclFileTree.file(contents)

     

       13
       13
       -
       		return components.dropFirst().reversed().reduce(leaf) { tail, name in

     

       14
       14
       -
       			.directory(files: [name: tail])

     

       15
       15
       -
       		}

     

       16
       16
       -
       	}

     

       17
       17
       -
       }

+54

Sources/PterodactylLanguageServer/PterodactylLanguageServer.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 JSONRPC

     

       7
       7
       +
       import LanguageServer

     

       8
       8
       +
       import LanguageServerProtocol

     

       9
       9
       +
       import Logging

     

       10
       10
       +
       

     

       11
       11
       +
       final class Server {

     

       12
       12
       +
       	private let connection: JSONRPCClientConnection

     

       13
       13
       +
       	private let eventHandler: EventHandler

     

       14
       14
       +
       

     

       15
       15
       +
       	init() {

     

       16
       16
       +
       		let channel = DataChannel.stdio()

     

       17
       17
       +
       		connection = JSONRPCClientConnection(channel)

     

       18
       18
       +
       		eventHandler = EventHandler(connection: connection)

     

       19
       19
       +
       	}

     

       20
       20
       +
       

     

       21
       21
       +
       	func start() async throws {

     

       22
       22
       +
       		do {

     

       23
       23
       +
       			Logger.shared.debug("Starting")

     

       24
       24
       +
       			try await startEventLoop()

     

       25
       25
       +
       		} catch {

     

       26
       26
       +
       			Logger.shared.error("Server error: \(error)")

     

       27
       27
       +
       			throw error

     

       28
       28
       +
       		}

     

       29
       29
       +
       	}

     

       30
       30
       +
       

     

       31
       31
       +
       	func startEventLoop() async throws {

     

       32
       32
       +
       		for await event in await connection.eventSequence {

     

       33
       33
       +
       			try await handle(event: event)

     

       34
       34
       +
       		}

     

       35
       35
       +
       	}

     

       36
       36
       +
       

     

       37
       37
       +
       	func handle(event: ClientEvent) async throws {

     

       38
       38
       +
       		switch event {

     

       39
       39
       +
       		case .request(let id, let request):

     

       40
       40
       +
       			await eventHandler.handleRequest(id: id, request: request)

     

       41
       41
       +
       		case .notification(let notification):

     

       42
       42
       +
       			await eventHandler.handleNotification(notification)

     

       43
       43
       +
       		case .error(_): ()

     

       44
       44
       +
       		}

     

       45
       45
       +
       	}

     

       46
       46
       +
       }

     

       47
       47
       +
       

     

       48
       48
       +
       @main

     

       49
       49
       +
       struct PterodactylLanguageServer {

     

       50
       50
       +
       	static func main() async throws {

     

       51
       51
       +
       		let server = Server()

     

       52
       52
       +
       		try await server.start()

     

       53
       53
       +
       	}

     

       54
       54
       +
       }

-39

Sources/PterodactylLanguageServer/SourceTreeManager.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 LanguageServerProtocol

     

       6
       6
       -
       import PterodactylBuild

     

       7
       7
       -
       import TSCBasic

     

       8
       8
       -
       import llbuild2fx

     

       9
       9
       -
       

     

       10
       10
       -
       actor SourceTreeManager {

     

       11
       11
       -
       	private let buildEngine: FXEngine

     

       12
       12
       -
       	private let casClient: LLBCASFSClient

     

       13
       13
       -
       	private let casContext: TSCUtility.Context

     

       14
       14
       -
       	private(set) var sourceTree: LLBCASFileTree

     

       15
       15
       -
       

     

       16
       16
       -
       	init(buildEngine: FXEngine, casClient: LLBCASFSClient, casContext: TSCUtility.Context, sourceTree: LLBCASFileTree? = nil) async throws {

     

       17
       17
       -
       		self.buildEngine = buildEngine

     

       18
       18
       -
       		self.casClient = casClient

     

       19
       19
       -
       		self.casContext = casContext

     

       20
       20
       -
       		if let sourceTree {

     

       21
       21
       -
       			self.sourceTree = sourceTree

     

       22
       22
       -
       		} else {

     

       23
       23
       -
       			self.sourceTree = try await casClient.storeDir(.dir([:]), casContext).get()

     

       24
       24
       -
       		}

     

       25
       25
       -
       	}

     

       26
       26
       -
       

     

       27
       27
       -
       	func setBufferText(uri: DocumentUri, text: String) async throws {

     

       28
       28
       -
       		let path = try AbsolutePath.fromDocumentUri(uri)

     

       29
       29
       -
       		let singletonDeclTree = LLBDeclFileTree.file(absolutePath: path, contents: text)

     

       30
       30
       -
       		let singletonTree: LLBCASFileTree = try await casClient.storeDir(singletonDeclTree, casContext).get()

     

       31
       31
       -
       		self.sourceTree = try await sourceTree.merge(with: singletonTree, in: casClient.db, casContext).get()

     

       32
       32
       -
       	}

     

       33
       33
       -
       

     

       34
       34
       -
       	func getBufferText(uri: DocumentUri) async throws -> String? {

     

       35
       35
       -
       		let path = try AbsolutePath.fromDocumentUri(uri)

     

       36
       36
       -
       		guard let (id, _) = try await sourceTree.lookup(path: path, in: casClient.db, casContext).get() else { return nil }

     

       37
       37
       -
       		return try await buildEngine.build(key: Keys.Blob.ReadContents(blobId: id), casContext).get()

     

       38
       38
       -
       	}

     

       39
       39
       -
       }

+1 -1

Sources/PterodactylSyntax/BlockLayoutProcessor.swift

···

       62
       62
        
       					result.append(Token(kind: .blockEnd, text: ""))

     

       63
       63
        
       				}

     

       64
       64
        
       

     

       65
       65
       -
       				if !firstTokenInBlock && indentStack.count > 1 && locatedToken.location.startColumn == indentStack.last! {

     

       65
       65
       +
       				if !firstTokenInBlock && indentStack.count > 1 && locatedToken.token.kind.isVisible && locatedToken.location.startColumn == indentStack.last! {

     

       66
       66
        
       					result.append(Token(kind: .blockSep, text: ""))

     

       67
       67
        
       				}

     

       68
       68
        
       			}

+22 -5

Sources/PterodactylSyntax/Diagnostic.swift

···

       5
       5
        
       import LanguageServerProtocol

     

       6
       6
        
       

     

       7
       7
        
       public struct Diagnostic: Equatable, Codable, Sendable {

     

       8
       8
       -
       	typealias Severity = LanguageServerProtocol.DiagnosticSeverity

     

       9
       9
       -
       	

     

       10
       10
       -
       	let message: String

     

       11
       11
       -
       	let severity: Severity

     

       12
       12
       -
       	let absoluteUtf16Range: Range<Int>

     

       8
       8
       +
       	public typealias Severity = LanguageServerProtocol.DiagnosticSeverity

     

       9
       9
       +
       

     

       10
       10
       +
       	public let message: String

     

       11
       11
       +
       	public let severity: Severity

     

       12
       12
       +
       	public let absoluteUtf16Range: Range<Int>

     

       13
       13
        
       

     

       14
       14
        
       	init(message: String, severity: Severity, absoluteRange: Range<Int>) {

     

       15
       15
        
       		self.message = message

     
···

       19
       19
        
       

     

       20
       20
        
       	init(message: String, absoluteRange: Range<Int>) {

     

       21
       21
        
       		self.init(message: message, severity: Severity.error, absoluteRange: absoluteRange)

     

       22
       22
       +
       	}

     

       23
       23
       +
       

     

       24
       24
       +
       	func lspRange(lineMap: LineMap) -> LanguageServerProtocol.LSPRange {

     

       25
       25
       +
       		let start = lineMap.location(at: absoluteUtf16Range.lowerBound)

     

       26
       26
       +
       		let end = lineMap.location(at: absoluteUtf16Range.upperBound)

     

       27
       27
       +
       		return LSPRange(

     

       28
       28
       +
       			start: Position(line: start.line, character: start.column),

     

       29
       29
       +
       			end: Position(line: end.line, character: end.column)

     

       30
       30
       +
       		)

     

       31
       31
       +
       	}

     

       32
       32
       +
       

     

       33
       33
       +
       	public func lspDiagnostic(lineMap: LineMap) -> LanguageServerProtocol.Diagnostic {

     

       34
       34
       +
       		LanguageServerProtocol.Diagnostic(

     

       35
       35
       +
       			range: lspRange(lineMap: lineMap),

     

       36
       36
       +
       			severity: severity,

     

       37
       37
       +
       			message: message

     

       38
       38
       +
       		)

     

       22
       39
        
       	}

     

       23
       40
        
       }

+7 -7

Sources/PterodactylSyntax/Grammar/Document/Import.swift

···

       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 {

     

       11
       11
       +
       	static func precondition(_ 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))

     

       15
       15
       +
       	static func inside(_ parser: inout Parser, recovery: Set<TokenKind>) -> ParseResult {

     

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

     

       17
       17
        
       		return ParseResult(kind: Self.kind)

     

       18
       18
        
       	}

     

       19
       19
        
       }

     
···

       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 {

     

       25
       25
       +
       	static func precondition(_ 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))

     

       29
       29
       +
       	static func inside(_ parser: inout Parser, recovery: Set<TokenKind>) -> ParseResult {

     

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

     

       31
       31
        
       		parser.eatTrivia()

     

       32
       32
       -
       		ImportName.parse(&parser)

     

       32
       32
       +
       		ImportName.parse(&parser, recovery: recovery)

     

       33
       33
        
       		return ParseResult(kind: Self.kind)

     

       34
       34
        
       	}

     

       35
       35
        
       }

+3 -3

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

···

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

     

       10
       10
        
       		static let kinds = [kind]

     

       11
       11
        
       		

     

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

     

       12
       12
       +
       		static func precondition(_ parser: inout Parser) -> Bool {

     

       13
       13
        
       			parser.isAt(kind: .identifier)

     

       14
       14
        
       		}

     

       15
       15
        
       		

     

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

     

       17
       17
       -
       			parser.expect(kind: .identifier, metadata: TokenMetadata(semanticTokenType: .method))

     

       16
       16
       +
       		static func inside(_ parser: inout Parser, recovery: Set<TokenKind>) -> ParseResult {

     

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

     

       18
       18
        
       			return ParseResult(kind: Self.kind)

     

       19
       19
        
       		}

     

       20
       20
        
       	}

+3 -3

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

···

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

     

       10
       10
        
       		static let kinds = [kind]

     

       11
       11
        
       		

     

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

     

       12
       12
       +
       		static func precondition(_ parser: inout Parser) -> Bool {

     

       13
       13
        
       			parser.isAt(kind: .identifier)

     

       14
       14
        
       		}

     

       15
       15
        
       		

     

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

     

       17
       17
       -
       			parser.expect(kind: .identifier, metadata: TokenMetadata(semanticTokenType: .method))

     

       16
       16
       +
       		static func inside(_ parser: inout Parser, recovery: Set<TokenKind>) -> ParseResult {

     

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

     

       18
       18
        
       			return ParseResult(kind: Self.kind)

     

       19
       19
        
       		}

     

       20
       20
        
       	}

+6 -5

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

···

       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)

     

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

     

       17
       17
       +
       		Lhs.precondition(&parser)

     

       18
       18
        
       	}

     

       19
       19
        
       

     

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

     
···

       23
       23
        
       		.doubleRightArrow: Kinds.define

     

       24
       24
        
       	]

     

       25
       25
        
       

     

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

     

       27
       27
       -
       		Lhs.parse(&parser)

     

       26
       26
       +
       	static func inside(_ parser: inout Parser, recovery: Set<TokenKind>) -> ParseResult {

     

       27
       27
       +
       		let punctuations = punctuationMap.keys.map { TokenKind.punctuation($0) }

     

       28
       28
       +
       		Lhs.parse(&parser, recovery: recovery.union(punctuations))

     

       28
       29
        
       		parser.eatTrivia()

     

       29
       30
        
       

     

       30
       31
        
       		var kind: SyntaxTreeKind = .error

     
···

       40
       41
        
       		}

     

       41
       42
        
       

     

       42
       43
        
       		parser.eatTrivia()

     

       43
       43
       -
       		Rhs.parse(&parser)

     

       44
       44
       +
       		Rhs.parse(&parser, recovery: recovery)

     

       44
       45
        
       

     

       45
       46
        
       		return ParseResult(kind: kind)

     

       46
       47
        
       	}

+5 -13

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

···

       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 {

     

       11
       11
       +
       	static func precondition(_ 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))

     

       15
       15
       +
       	static func inside(_ parser: inout Parser, recovery: Set<TokenKind>) -> ParseResult {

     

       16
       16
       +
       		parser.expect(kind: .keyword(.where), metadata: TokenMetadata(semanticTokenType: .keyword), recovery: recovery.union([.keyword(.theory), .blockComment(terminated: true), .lineComment]))

     

       17
       17
        
       

     

       18
       18
       -
       		parser.eatTrivia()

     

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

     

       20
       19
        
       			parser.eatTrivia()

     

       21
       21
       -
       

     

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

     

       20
       20
       +
       			while parser.eat(kind: .blockSep, metadata: nil) {

     

       21
       21
       +
       				Declaration.parse(&parser, recovery: recovery.union([.blockSep, .blockEnd]))

     

       23
       22
        
       				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
       23
        
       			}

     

       31
       31
       -
       

     

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

     

       33
       25
        
       		}

     

       34
       26

+2 -2

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

···

       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 {

     

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

     

       12
       12
        
       		parser.isAt(kind: .identifier)

     

       13
       13
        
       	}

     

       14
       14
        
       

     

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

     

       15
       15
       +
       	static func inside(_ parser: inout Parser, recovery: Set<TokenKind>) -> ParseResult {

     

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

     

       17
       17
        
       		return ParseResult(kind: Self.kind)

     

       18
       18
        
       	}

+6 -6

Sources/PterodactylSyntax/Grammar/Document/Theory.swift

···

       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 {

     

       10
       10
       +
       

     

       11
       11
       +
       	static func precondition(_ 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))

     

       15
       15
       +
       	static func inside(_ parser: inout Parser, recovery: Set<TokenKind>) -> ParseResult {

     

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

     

       17
       17
        
       		parser.eatTrivia()

     

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

     

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

     

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

     

       20
       20
        
       		}

     

       21
       21
        
       

     

       22
       22
        
       		parser.eatTrivia()

     

       23
       23
        
       

     

       24
       24
       -
       		TheoryBlock.parse(&parser)

     

       24
       24
       +
       		TheoryBlock.parse(&parser, recovery: recovery)

     

       25
       25
        
       

     

       26
       26
        
       		return ParseResult(kind: Self.kind)

     

       27
       27
        
       	}

+5 -5

Sources/PterodactylSyntax/Grammar/Document.swift

···

       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 {

     

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

     

       12
       12
        
       		true

     

       13
       13
        
       	}

     

       14
       14
        
       

     

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

     

       15
       15
       +
       	public static func inside(_ parser: inout Parser, recovery: Set<TokenKind>) -> 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 }

     

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

     

       22
       22
        
       

     

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

     

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

     

       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) {

     

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

     

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

     

       32
       32
        
       					let token = parser.currentToken

     

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

+17 -17

Sources/PterodactylSyntax/Grammar.swift

···

       10
       10
        
       	static var kinds: [SyntaxTreeKind] { get }

     

       11
       11
        
       

     

       12
       12
        
       	/// Indicates whether the current parser state is consistent with the grammatical production starting here. When a given grammatical element is optional, this can be used to avoid backtracking. This is a *precondition* for parsing.

     

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

     

       13
       13
       +
       	static func precondition(_ parser: inout Parser) -> Bool

     

       14
       14
        
       

     

       15
       15
       -
       	/// Parse the grammatical production, assuming the precondition indicated by ``before(_:)``. This function should not be called outside this module (instead, use ``parse(_:)`` and ``tryParse(_:)``.

     

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

     

       15
       15
       +
       	/// Parse the grammatical production, assuming the precondition indicated by ``precondition(_:)``. This function should not be called outside this module (instead, use ``parse(_:recovery:)`` and ``tryParse(_:recovery:)``.

     

       16
       16
       +
       	static func inside(_ parser: inout Parser, recovery: Set<TokenKind>) -> ParseResult

     

       17
       17
       +
       }

     

       18
       18
       +
       

     

       19
       19
       +
       extension Grammar {

     

       20
       20
       +
       	public static func tryParse(_ parser: inout Parser, recovery: Set<TokenKind>) -> Bool {

     

       21
       21
       +
       		guard !parser.isEndOfFile && precondition(&parser) else { return false }

     

       22
       22
       +
       		parse(&parser, recovery: recovery)

     

       23
       23
       +
       		return true

     

       24
       24
       +
       	}

     

       25
       25
       +
       

     

       26
       26
       +
       	public static func parse(_ parser: inout Parser, recovery: Set<TokenKind>) {

     

       27
       27
       +
       		let mark = parser.builder.open()

     

       28
       28
       +
       		let result = inside(&parser, recovery: recovery)

     

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

     

       30
       30
       +
       	}

     

       17
       31
        
       }

     

       18
       32
        
       

     

       19
       33
        
       public struct ParseResult {

     
···

       26
       40
        
       	}

     

       27
       41
        
       }

     

       28
       42
        
       

     

       29
       29
       -
       

     

       30
       30
       -
       extension Grammar {

     

       31
       31
       -
       	public static func tryParse(_ parser: inout Parser) -> Bool {

     

       32
       32
       -
       		guard !parser.isEndOfFile && before(&parser) else { return false }

     

       33
       33
       -
       		parse(&parser)

     

       34
       34
       -
       		return true

     

       35
       35
       -
       	}

     

       36
       36
       -
       

     

       37
       37
       -
       	public static func parse(_ parser: inout Parser) {

     

       38
       38
       -
       		let mark = parser.open()

     

       39
       39
       -
       		let result = inside(&parser)

     

       40
       40
       -
       		parser.close(mark: mark, kind: result.kind, metadata: result.metadata)

     

       41
       41
       -
       	}

     

       42
       42
       -
       }

+1 -1

Sources/PterodactylSyntax/LineMap.swift

···

       9
       9
        
       	private let utf16LineOffsets: [Int]

     

       10
       10
        
       

     

       11
       11
        
       	public init(source: String) {

     

       12
       12
       -
       		var offsets: [Int] = []

     

       12
       12
       +
       		var offsets: [Int] = [0]

     

       13
       13
        
       		for idx in source.indices {

     

       14
       14
        
       			let c = source[idx]

     

       15
       15
        
       			if c == "\n" || c == "\r\n" || c == "\r" {

+61 -83

Sources/PterodactylSyntax/Parser.swift

···

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

     

       4
       4
        
       

     

       5
       5
        
       public struct Parser {

     

       6
       6
       -
       	enum Event: Equatable {

     

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

     

       8
       8
       -
       		case close

     

       9
       9
       -
       		case advance(metadata: TokenMetadata?)

     

       10
       10
       -
       	}

     

       11
       11
       -
       

     

       12
       6
        
       	public struct MarkOpened {

     

       13
       7
        
       		internal let index: Int

     

       14
       8
        
       	}

     
···

       22
       16
        
       	}

     

       23
       17
        
       

     

       24
       18
        
       	public private(set) var diagnostics: [Diagnostic] = []

     

       19
       19
       +
       	public var builder: SyntaxTreeBuilder = SyntaxTreeBuilder()

     

       25
       20
        
       

     

       26
       26
       -
       	private var fuel: Int = 0

     

       21
       21
       +
       	private var inError: Bool = false

     

       27
       22
        
       	private var position: Int = 0

     

       28
       28
       -
       	private var events: [Event] = []

     

       29
       23
        
       	private var absoluteUtf16Offset: Int = 0

     

       30
       24
        
       	public var absoluteRangeAtCursor: Range<Int> {

     

       31
       25
        
       		return absoluteUtf16Offset..<absoluteUtf16Offset

     
···

       59
       53
        
       	}

     

       60
       54
        
       

     

       61
       55
        
       

     

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

     

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

     

       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, metadata: SyntaxTreeMetadata?) {

     

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

     

       70
       70
       -
       		events.append(.close)

     

       71
       71
       -
       	}

     

       72
       72
       -
       

     

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

     

       74
       57
        
       		precondition(!isEndOfFile)

     

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

     

       58
       58
       +
       		builder.advance(token: currentToken, metadata: metadata)

     

       76
       59
        
       		absoluteUtf16Offset += currentToken.utf16Length

     

       77
       60
        
       		position += 1

     

       78
       78
       -
       		fuel = 256

     

       79
       61
        
       	}

     

       80
       62
        
       

     

       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(

     

       85
       85
       -
       				message: error,

     

       86
       86
       -
       				absoluteRange: absoluteRangeOfCurrentToken

     

       87
       87
       -
       			)

     

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

     

       64
       64
       +
       		let mark = builder.open()

     

       65
       65
       +
       		let diagnostic = Diagnostic(

     

       66
       66
       +
       			message: error,

     

       67
       67
       +
       			absoluteRange: absoluteRangeOfCurrentToken

     

       68
       68
       +
       		)

     

       88
       69
        
       

     

       89
       89
       -
       			diagnostics.append(diagnostic)

     

       90
       90
       -
       		}

     

       70
       70
       +
       		diagnostics.append(diagnostic)

     

       91
       71
        
       		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? {

     

       96
       96
       -
       		precondition(fuel > 0, "Parser is stuck!")

     

       97
       97
       -
       		fuel -= 1

     

       98
       98
       -
       		let index = position + k

     

       99
       99
       -
       		guard tokens.indices.contains(index) else { return nil }

     

       100
       100
       -
       		return tokens[index].kind

     

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

     

       101
       73
        
       	}

     

       102
       74
        
       

     

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

     

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

     

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

     

       76
       76
       +
       		guard !isEndOfFile && isAt(kindSatisfying: { $0 == kind }) else { return false }

     

       105
       77
        
       		advance(metadata: metadata)

     

       106
       78
        
       		return true

     

       107
       79
        
       	}

     

       108
       80
        
       

     

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

     

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

     

       81
       81
       +
       	enum ControlFlow {

     

       82
       82
       +
       		case `continue`

     

       83
       83
       +
       		case `break`

     

       111
       84
        
       	}

     

       112
       85
        
       

     

       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

     

       118
       118
       -
       		)

     

       119
       119
       -
       		diagnostics.append(diagnostic)

     

       86
       86
       +
       	mutating func ate(kind: TokenKind, metadata: TokenMetadata?) -> ControlFlow {

     

       87
       87
       +
       		guard eat(kind: kind, metadata: metadata) else { return .continue }

     

       88
       88
       +
       		inError = false

     

       89
       89
       +
       		eatTrivia()

     

       90
       90
       +
       		return .break

     

       120
       91
        
       	}

     

       121
       92
        
       

     

       122
       122
       -
       	public var tree: SyntaxTree {

     

       123
       123
       -
       		var events = events

     

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

     

       125
       125
       -
       		var cursor: Int = 0

     

       93
       93
       +
       	mutating func recoverUntil(_ anchors: Set<TokenKind>, expected: TokenKind, error: String? = nil) {

     

       94
       94
       +
       		var discardTokens: [Token] = []

     

       95
       95
       +
       		let startOffset = absoluteUtf16Offset

     

       126
       96
        
       

     

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

     

       97
       97
       +
       		while !self.isAt(kindSatisfying: { anchors.contains($0) }) {

     

       98
       98
       +
       			if isEndOfFile { break }

     

       99
       99
       +
       			let token = currentToken

     

       100
       100
       +
       			advance(metadata: nil)

     

       101
       101
       +
       			discardTokens.append(token)

     

       102
       102
       +
       		}

     

       128
       103
        
       

     

       129
       129
       -
       		for event in events {

     

       130
       130
       -
       			switch event {

     

       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.tree))

     

       137
       137
       -
       				}

     

       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, metadata: metadata))

     

       143
       143
       -
       				}

     

       104
       104
       +
       		var endOffset = startOffset

     

       105
       105
       +
       		

     

       106
       106
       +
       		let error = error ?? "Expected \(expected) but got \(discardTokens)"

     

       107
       107
       +
       

     

       108
       108
       +
       		if discardTokens.isEmpty {

     

       109
       109
       +
       			if !inError {

     

       110
       110
       +
       				inError = true

     

       111
       111
       +
       				diagnostics.append(Diagnostic(message: error, absoluteRange: absoluteRangeAtCursor))

     

       112
       112
       +
       			}

     

       113
       113
       +
       			return

     

       114
       114
       +
       		} else {

     

       115
       115
       +
       			let mark = builder.open()

     

       116
       116
       +
       			for discardToken in discardTokens {

     

       117
       117
       +
       				endOffset += discardToken.utf16Length

     

       118
       118
       +
       			}

     

       119
       119
       +
       

     

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

     

       121
       121
       +
       

     

       122
       122
       +
       			if !inError {

     

       123
       123
       +
       				inError = true

     

       124
       124
       +
       				diagnostics.append(Diagnostic(message: error, absoluteRange: startOffset..<endOffset))

     

       144
       125
        
       			}

     

       145
       126
        
       		}

     

       127
       127
       +
       	}

     

       146
       128
        
       

     

       147
       147
       -
       		assert(stack.count == 1)

     

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

     

       129
       129
       +
       	public mutating func expect(kind: TokenKind, metadata: TokenMetadata?, recovery: Set<TokenKind>, error: String? = nil) {

     

       130
       130
       +
       		var anchors = recovery

     

       131
       131
       +
       		if ate(kind: kind, metadata: metadata) == .break { return }

     

       132
       132
       +
       		anchors.insert(kind)

     

       133
       133
       +
       		recoverUntil(anchors, expected: kind, error: error)

     

       134
       134
       +
       		let _ = ate(kind: kind, metadata: metadata)

     

       149
       135
        
       	}

     

       136
       136
       +
       }

     

       150
       137
        
       

     

       138
       138
       +
       extension Parser {

     

       151
       139
        
       	mutating func eatTrivium() -> Bool {

     

       152
       140
        
       		switch currentToken.kind {

     

       153
       153
       -
       		case .whitespace:

     

       141
       141
       +
       		case .whitespace, .newline:

     

       154
       142
        
       			advance(metadata: nil)

     

       155
       143
        
       			return true

     

       156
       144
        
       		case .blockComment(let terminated):

     
···

       174
       162
        
       

     

       175
       163
        
       	mutating func eatTrivia() {

     

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

     

       177
       177
       -
       	}

     

       178
       178
       -
       

     

       179
       179
       -
       }

     

       180
       180
       -
       

     

       181
       181
       -
       extension Array {

     

       182
       182
       -
       	fileprivate mutating func modifyLast(_ modifier: (inout Element) -> Void) {

     

       183
       183
       -
       		if var last = popLast() {

     

       184
       184
       -
       			modifier(&last)

     

       185
       185
       -
       			append(last)

     

       186
       186
       -
       		}

     

       187
       165
        
       	}

     

       188
       166
        
       }

+22

Sources/PterodactylSyntax/SemanticToken.swift

···

       67
       67
        
       		return result

     

       68
       68
        
       	}

     

       69
       69
        
       }

     

       70
       70
       +
       

     

       71
       71
       +
       extension SyntaxCursor {

     

       72
       72
       +
       	public func collectSemanticTokens(_ sink: inout [SemanticToken]) {

     

       73
       73
       +
       		if let (_, metadata) = node.token, let metadata {

     

       74
       74
       +
       			for lineRange in singleLineRanges {

     

       75
       75
       +
       				if let semanticToken = metadata.semanticToken(range: lineRange) {

     

       76
       76
       +
       					sink.append(semanticToken)

     

       77
       77
       +
       				}

     

       78
       78
       +
       			}

     

       79
       79
       +
       		}

     

       80
       80
       +
       		

     

       81
       81
       +
       		for child in children {

     

       82
       82
       +
       			child.collectSemanticTokens(&sink)

     

       83
       83
       +
       		}

     

       84
       84
       +
       	}

     

       85
       85
       +
       	

     

       86
       86
       +
       	public var semanticTokens: [SemanticToken] {

     

       87
       87
       +
       		var tokens: [SemanticToken] = []

     

       88
       88
       +
       		collectSemanticTokens(&tokens)

     

       89
       89
       +
       		return tokens

     

       90
       90
       +
       	}

     

       91
       91
       +
       }

+1 -1

Sources/PterodactylSyntax/SyntaxCursor.swift

···

       26
       26
        
       		utf16Offset..<utf16Offset + node.utf16Length

     

       27
       27
        
       	}

     

       28
       28
        
       

     

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

     

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

     

       30
       30
        
       		self.lineMap = lineMap

     

       31
       31
        
       		self.node = node

     

       32
       32
        
       		self.utf16Offset = utf16Offset

+1 -1

Sources/PterodactylSyntax/SyntaxTree.swift

···

       28
       28
        
       

     

       29
       29
        
       extension SyntaxTree {

     

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

     

       31
       31
       -
       	public struct Builder {

     

       31
       31
       +
       	public struct MutableTree {

     

       32
       32
        
       		public var kind: SyntaxTreeKind

     

       33
       33
        
       		public var metadata: SyntaxTreeMetadata?

     

       34
       34
        
       		public var children: [Child]

+70

Sources/PterodactylSyntax/SyntaxTreeBuilder.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 struct SyntaxTreeBuilder {

     

       8
       8
       +
       	private enum Event: Equatable {

     

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

     

       10
       10
       +
       		case close

     

       11
       11
       +
       		case advance(token: Token, metadata: TokenMetadata?)

     

       12
       12
       +
       	}

     

       13
       13
       +
       	

     

       14
       14
       +
       	public struct MarkOpened {

     

       15
       15
       +
       		internal let index: Int

     

       16
       16
       +
       	}

     

       17
       17
       +
       	

     

       18
       18
       +
       	private var events: [Event] = []

     

       19
       19
       +
       	

     

       20
       20
       +
       	public mutating func advance(token: Token, metadata: TokenMetadata?) {

     

       21
       21
       +
       		events.append(.advance(token: token, metadata: metadata))

     

       22
       22
       +
       	}

     

       23
       23
       +
       	

     

       24
       24
       +
       	public mutating func open() -> MarkOpened {

     

       25
       25
       +
       		let mark = MarkOpened(index: events.count)

     

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

     

       27
       27
       +
       		return mark

     

       28
       28
       +
       	}

     

       29
       29
       +
       

     

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

     

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

     

       32
       32
       +
       		events.append(.close)

     

       33
       33
       +
       	}

     

       34
       34
       +
       	

     

       35
       35
       +
       	public var tree: SyntaxTree {

     

       36
       36
       +
       		var events = events

     

       37
       37
       +
       		var stack: [SyntaxTree.MutableTree] = []

     

       38
       38
       +
       

     

       39
       39
       +
       		precondition(events.popLast() == .close)

     

       40
       40
       +
       

     

       41
       41
       +
       		for event in events {

     

       42
       42
       +
       			switch event {

     

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

     

       44
       44
       +
       				stack.append(SyntaxTree.MutableTree(kind: kind, metadata: metadata, children: []))

     

       45
       45
       +
       			case .close:

     

       46
       46
       +
       				let tree = stack.popLast()!

     

       47
       47
       +
       				stack.modifyLast { last in

     

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

     

       49
       49
       +
       				}

     

       50
       50
       +
       			case .advance(let token, let metadata):

     

       51
       51
       +
       				stack.modifyLast { last in

     

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

     

       53
       53
       +
       				}

     

       54
       54
       +
       			}

     

       55
       55
       +
       		}

     

       56
       56
       +
       

     

       57
       57
       +
       		assert(stack.count == 1)

     

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

     

       59
       59
       +
       	}

     

       60
       60
       +
       }

     

       61
       61
       +
       

     

       62
       62
       +
       

     

       63
       63
       +
       extension Array {

     

       64
       64
       +
       	fileprivate mutating func modifyLast(_ modifier: (inout Element) -> Void) {

     

       65
       65
       +
       		if var last = popLast() {

     

       66
       66
       +
       			modifier(&last)

     

       67
       67
       +
       			append(last)

     

       68
       68
       +
       		}

     

       69
       69
       +
       	}

     

       70
       70
       +
       }

+1 -1

Sources/PterodactylSyntax/Token.swift

···

       4
       4
        
       

     

       5
       5
        
       import Foundation

     

       6
       6
        
       

     

       7
       7
       -
       public struct Token: Codable {

     

       7
       7
       +
       public struct Token: Codable, Equatable {

     

       8
       8
        
       	public let kind: TokenKind

     

       9
       9
        
       	public let text: String

     

       10
       10
        
       	public let utf16Length: Int

+2 -1

Sources/PterodactylSyntax/Types.swift

···

       24
       24
        
       	case equal = "="

     

       25
       25
        
       }

     

       26
       26
        
       

     

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

     

       27
       27
       +
       public enum TokenKind: Codable, Equatable, Sendable, Hashable {

     

       28
       28
        
       	case eof

     

       29
       29
        
       	case keyword(Keyword)

     

       30
       30
        
       	case punctuation(Punctuation)

     
···

       53
       53
        
       		default: true

     

       54
       54
        
       		}

     

       55
       55
        
       	}

     

       56
       56
       +
       	

     

       56
       57
        
       	public var canDetermineLayoutColumn: Bool {

     

       57
       58
        
       		switch self {

     

       58
       59
        
       		case .whitespace, .eof: false

+37

Tests/PterodactylBuildTests/Test.swift

···

       5
       5
        
       import Testing

     

       6
       6
        
       

     

       7
       7
        
       @testable import PterodactylBuild

     

       8
       8
       +
       @testable import PterodactylSyntax

     

       8
       9
        
       @testable import llbuild2fx

     

       9
       10
        
       

     

       10
       11
        
       struct BuildTests {

     

       12
       12
       +
       	@Test

     

       13
       13
       +
       	func testBlockLayout() async throws {

     

       14
       14
       +
       		let code = """

     

       15
       15
       +
       			theory Foo where

     

       16
       16
       +
       				 foo : bar

     

       17
       17
       +
       				 baz : sdf

     

       18
       18
       +
       			"""

     

       19
       19
       +
       

     

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

     

       21
       21
       +
       		let flatTokens = lexer.tokenize()

     

       22
       22
       +
       		let blockTokens = BlockLayoutProcessor(tokens: flatTokens).layout()

     

       23
       23
       +
       

     

       24
       24
       +
       		#expect(

     

       25
       25
       +
       			blockTokens.map(\.kind) == [

     

       26
       26
       +
       				.keyword(.theory), .whitespace, .identifier, .whitespace, .keyword(.where), .blockBegin, .newline, .whitespace, .blockSep, .identifier, .whitespace,

     

       27
       27
       +
       				.punctuation(.colon),

     

       28
       28
       +
       				.whitespace, .identifier, .newline, .whitespace, .blockSep, .identifier, .whitespace, .punctuation(.colon), .whitespace, .identifier, .blockEnd, .eof

     

       29
       29
       +
       			])

     

       30
       30
       +
       	}

     

       31
       31
       +
       

     

       32
       32
       +
       	@Test

     

       33
       33
       +
       	func testParse() async throws {

     

       34
       34
       +
       		let code = """

     

       35
       35
       +
       			theory Foo where

     

       36
       36
       +
       				asdf : asdf

     

       37
       37
       +
       			"""

     

       38
       38
       +
       

     

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

     

       40
       40
       +
       		let flatTokens = lexer.tokenize()

     

       41
       41
       +
       		let blockTokens = BlockLayoutProcessor(tokens: flatTokens).layout()

     

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

     

       43
       43
       +
       		Document.parse(&parser, recovery: [])

     

       44
       44
       +
       

     

       45
       45
       +
       		#expect(parser.diagnostics.isEmpty)

     

       46
       46
       +
       	}

     

       47
       47
       +
       

     

       11
       48
        
       	@Test

     

       12
       49
        
       	func testImports() async throws {

     

       13
       50
        
       		let group = LLBMakeDefaultDispatchGroup()

+4 -17

Tests/PterodactylLanguageServerTests/Test.swift

···

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

     

       2
       2
       +
       //

     

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

     

       4
       4
       +
       

     

       1
       5
        
       //

     

       2
       6
        
       //  File.swift

     

       3
       7
        
       //  Pterodactyl

     
···

       28
       32
        
       			])

     

       29
       33
        
       

     

       30
       34
        
       		#expect(foo.debugDescription == expected.debugDescription)

     

       31
       31
       -
       	}

     

       32
       32
       -
       

     

       33
       33
       -
       	@Test

     

       34
       34
       -
       	func testSourceTreeManager() async throws {

     

       35
       35
       -
       		let group = LLBMakeDefaultDispatchGroup()

     

       36
       36
       -
       		let db = LLBInMemoryCASDatabase(group: group)

     

       37
       37
       -
       		let functionCache = FXInMemoryFunctionCache(group: group)

     

       38
       38
       -
       		let executor = FXLocalExecutor()

     

       39
       39
       -
       		let engine = FXEngine(group: group, db: db, functionCache: functionCache, executor: executor)

     

       40
       40
       -
       		let client = LLBCASFSClient(db)

     

       41
       41
       -
       		let context = Context()

     

       42
       42
       -
       

     

       43
       43
       -
       		let manager = try await SourceTreeManager(buildEngine: engine, casClient: client, casContext: context)

     

       44
       44
       -
       		let uri = "file://foo/bar/wooo.txt"

     

       45
       45
       -
       		let contents = "hello world"

     

       46
       46
       -
       		try await manager.setBufferText(uri: uri, text: contents)

     

       47
       47
       -
       		try await #expect(manager.getBufferText(uri: uri) == contents)

     

       48
       35
        
       	}

     

       49
       36
        
       }

+6

test.ptero

···

       1
       1
       +
       theory asdf where

     

       2
       2
       +
           foo : asdfs

     

       3
       3
       +
           foo : sdf

     

       4
       4
       +
       

     

       5
       5
       +
       /* asdfasdf */

     

       6
       6
       +
       // asdf;lkj asdf;klj asdfkjh asdfjlkha sdfljk

Compare changes