Skip to content

Commit fc1e253

Browse files
Fix frontend
1 parent 3bf4b08 commit fc1e253

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed

Public/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,17 @@
129129
<li>
130130
<h6 class="dropdown-header">Swift Syntax Version</h6>
131131
</li>
132-
<li class="options-item radio parser-version active-tick" data-value="branch_stable" data-text="508.0.1">
132+
<li class="options-item radio parser-version active-tick" data-value="50800" data-text="508.0.1">
133133
<a class="dropdown-item" data-target="#">
134134
508.0.1 (Swift 5.8)
135135
</a>
136136
</li>
137-
<li class="options-item radio parser-version" data-value="branch_release-5.9" data-text="release/5.9">
137+
<li class="options-item radio parser-version" data-value="50900" data-text="release/5.9">
138138
<a class="dropdown-item" data-target="#">
139139
release/5.9 branch
140140
</a>
141141
</li>
142-
<li class="options-item radio parser-version" data-value="branch_main" data-text="main">
142+
<li class="options-item radio parser-version" data-value="trunk" data-text="main">
143143
<a class="dropdown-item" data-target="#">
144144
main branch
145145
</a>
@@ -175,7 +175,7 @@ <h6 class="dropdown-header">Swift Syntax Version</h6>
175175
</header>
176176
<main class="flex-grow-1 row row-cols-2 g-0 h-100">
177177
<div class="col">
178-
<textarea id="editor-container" class="h-100 d-none">#(defaultSampleCode)</textarea>
178+
<textarea id="editor-container" class="h-100 d-none">#(code)</textarea>
179179
</div>
180180
<div class="col">
181181
<div class="tab-content">

Public/js/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ export class App {
266266
}
267267

268268
function branchOptions() {
269-
let branch = "branch_stable";
269+
let branch = "50800";
270270
document
271271
.querySelectorAll(".options-item.radio.parser-version")
272272
.forEach((listItem) => {

Sources/App/routes.swift

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ func routes(_ app: Application) throws {
1010
try await req.view.render(
1111
"index", [
1212
"title": "Swift AST Explorer",
13-
"defaultSampleCode": defaultSampleCode,
13+
"code": sampleCode,
1414
"swiftVersion": swiftVersion,
1515
]
1616
)
@@ -41,33 +41,35 @@ func routes(_ app: Application) throws {
4141
return try await req.view.render(
4242
"index", [
4343
"title": "Swift AST Explorer",
44-
"defaultSampleCode": content,
44+
"code": content,
4545
"swiftVersion": swiftVersion,
4646
]
4747
)
4848
}
4949

5050
app.on(.POST, "update", body: .collect(maxSize: "10mb")) { (req) -> SyntaxResponse in
5151
let parameter = try req.content.decode(RequestParameter.self)
52-
let options = parameter.options ?? []
53-
if let branch = parameter.branch, branch != "branch_stable" {
54-
let response = try await experimentalParser(branch: branch, arguments: [parameter.code] + options)
55-
return try JSONDecoder().decode(SyntaxResponse.self, from: Data(response.stdout.utf8))
56-
} else {
57-
return try SyntaxParser.parse(code: parameter.code, options: options)
58-
}
52+
let response = try await parserCommand(
53+
branch: parameter.branch ?? "50800",
54+
code: parameter.code,
55+
arguments: parameter.options ?? []
56+
)
57+
return try JSONDecoder().decode(SyntaxResponse.self, from: Data(response.stdout.utf8))
5958
}
6059

61-
func experimentalParser(branch: String, arguments: [String]) async throws -> (stdout: String, stderr: String) {
60+
func parserCommand(branch: String, code: String, arguments: [String]) async throws -> (stdout: String, stderr: String) {
6261
let process = TSCBasic.Process(
6362
arguments: ["parser"] + arguments,
6463
environment: [
6564
"NSUnbufferedIO": "YES",
6665
],
67-
workingDirectory: try! AbsolutePath.init(validating: "\(app.directory.resourcesDirectory)\(branch)/.build/debug/")
66+
workingDirectory: try! AbsolutePath.init(validating: "\(app.directory.resourcesDirectory)parsers/\(branch)/.build/release/")
6867
)
6968

70-
try process.launch()
69+
let stdin = try process.launch()
70+
stdin.write(code)
71+
stdin.flush()
72+
7173
let processResult = try await process.waitUntilExit()
7274

7375
let stdout = try processResult.utf8Output()
@@ -85,7 +87,7 @@ private struct RequestParameter: Decodable {
8587
let branch: String?
8688
}
8789

88-
private let defaultSampleCode = #"""
90+
private let sampleCode = #"""
8991
import Foundation
9092
9193
struct BlackjackCard {

0 commit comments

Comments
 (0)