Merge pull request #258 from SwiftFiddle/dropdown

Add SwiftSyntax version selector

Author: kishikawakatsumi

Package.resolved

@@ -8,6 +8,7 @@ let package = Package(
   ],
   dependencies: [
     .package(url: "https://github.com/apple/swift-syntax", from: "508.0.1"),
+    .package(url: "https://github.com/apple/swift-tools-support-core", from: "0.5.2"),
     .package(url: "https://github.com/vapor/vapor.git", from: "4.77.0"),
     .package(url: "https://github.com/vapor/leaf.git", from: "4.2.4"),
   ],
@@ -18,6 +19,7 @@ let package = Package(
         .product(name: "SwiftSyntax", package: "swift-syntax"),
         .product(name: "SwiftOperators", package: "swift-syntax"),
         .product(name: "SwiftParser", package: "swift-syntax"),
+        .product(name: "TSCBasic", package: "swift-tools-support-core"),
         .product(name: "Vapor", package: "vapor"),
         .product(name: "Leaf", package: "leaf"),
       ],

Package.swift

@@ -83,18 +83,41 @@
             <span id="run-button-spinner" class="fa-duotone fa-spinner-third fa-spin fa-fw d-none"></span>
             <span class="px-1">Update</span>
           </button>
-          <button id="config-button" type="button"
-            class="btn btn-outline-primary btn-sm rounded-circle button-circle m-1 disabled" data-bs-toggle="dropdown"
-            data-bs-auto-close="outside" data-bs-offset="0,10" aria-label="Options" aria-expanded="false">
-            <span class="fa-solid fa-cog fa-fw"></span>
-          </button>
-          <ul class="dropdown-menu">
-            <li class="options-item" data-value="fold">
-              <a class="dropdown-item" data-target="#">
-                Fold All Sequence Expressions
-              </a>
-            </li>
-          </ul>
+          <div class="dropdown d-inline-block">
+            <button id="config-button" type="button"
+              class="btn btn-outline-primary btn-sm rounded-circle button-circle m-1 disabled" data-bs-toggle="dropdown"
+              data-bs-auto-close="outside" data-bs-offset="0,10" aria-label="Options" aria-expanded="false">
+              <span class="fa-solid fa-cog fa-fw"></span>
+            </button>
+            <ul class="dropdown-menu">
+              <li>
+                <h6 class="dropdown-header">Swift Syntax</h6>
+              </li>
+              <li class="options-item radio active-tick" data-value="branch_stable">
+                <a class="dropdown-item" data-target="#">
+                  508.0.1 (Swift 5.8)
+                </a>
+              </li>
+              <li class="options-item radio" data-value="branch_release-5.9">
+                <a class="dropdown-item" data-target="#">
+                  release/5.9 branch
+                </a>
+              </li>
+              <li class="options-item radio" data-value="branch_main">
+                <a class="dropdown-item" data-target="#">
+                  main branch
+                </a>
+              </li>
+              <li>
+                <hr class="dropdown-divider">
+              </li>
+              <li class="options-item checkbox" data-value="fold">
+                <a class="dropdown-item" data-target="#">
+                  Fold All Sequence Expressions
+                </a>
+              </li>
+            </ul>
+          </div>
           <button id="format-button" type="button"
             class="btn btn-outline-primary btn-sm rounded-circle button-circle m-1 disabled" data-bs-toggle="tooltip"
             data-bs-placement="bottom" data-bs-container="#format-button" title="Format" aria-label="Format">

Public/index.html

@@ -54,7 +54,17 @@ export class App {
     });
 
     document.getElementById("config-button").classList.remove("disabled");
-    document.querySelectorAll(".options-item").forEach((listItem) => {
+    document.querySelectorAll(".options-item.radio").forEach((listItem) => {
+      listItem.addEventListener("click", (event) => {
+        event.preventDefault();
+        document.querySelectorAll(".options-item.radio").forEach((listItem) => {
+          listItem.classList.remove("active-tick");
+        });
+        listItem.classList.toggle("active-tick");
+        this.update();
+      });
+    });
+    document.querySelectorAll(".options-item.checkbox").forEach((listItem) => {
       listItem.addEventListener("click", (event) => {
         event.preventDefault();
         listItem.classList.toggle("active-tick");
@@ -92,12 +102,14 @@ export class App {
   update() {
     showLoading();
 
+    const branch = branchOption();
     const options = configurations();
 
     const code = this.editor.getValue();
     const json = {
       code,
       options,
+      branch,
     };
     fetch("/update", {
       method: "POST",
@@ -255,9 +267,19 @@ export class App {
   }
 }
 
+function branchOption() {
+  let branch = "branch_stable";
+  document.querySelectorAll(".options-item.radio").forEach((listItem) => {
+    if (listItem.classList.contains("active-tick")) {
+      branch = listItem.dataset.value;
+    }
+  });
+  return branch;
+}
+
 function configurations() {
   const options = [];
-  document.querySelectorAll(".options-item").forEach((listItem) => {
+  document.querySelectorAll(".options-item.checkbox").forEach((listItem) => {
     if (listItem.classList.contains("active-tick")) {
       options.push(listItem.dataset.value);
     }

Public/js/app.js

@@ -0,0 +1,32 @@
+// swift-tools-version:5.8
+import PackageDescription
+
+let package = Package(
+  name: "parser",
+  platforms: [
+    .macOS(.v13)
+  ],
+  dependencies: [
+    .package(url: "https://github.com/apple/swift-syntax", branch: "main"),
+  ],
+  targets: [
+    .executableTarget(
+      name: "parser",
+      dependencies: [
+        .product(name: "SwiftSyntax", package: "swift-syntax"),
+        .product(name: "SwiftOperators", package: "swift-syntax"),
+        .product(name: "SwiftParser", package: "swift-syntax"),
+      ],
+      swiftSettings: [
+        .unsafeFlags(["-cross-module-optimization"], .when(configuration: .release))
+      ]
+    ),
+    .testTarget(
+      name: "Tests",
+      dependencies: [
+        .target(name: "parser"),
+      ],
+      resources: [.process("Fixtures")]
+    )
+  ]
+)

Resources/branch_main/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,33 @@
+import Foundation
+
+@main
+struct Main {
+  static func main() throws {
+    do {
+      let arguments = CommandLine.arguments
+      let code = CommandLine.arguments[1]
+      let options: [String]
+      if arguments.count > 2 {
+        options = [CommandLine.arguments[2]]
+      } else {
+        options = []
+      }
+
+      let response = try SyntaxParser.parse(code: code, options: options)
+
+      let data = try JSONEncoder().encode(response)
+      print(String(decoding: data, as: UTF8.self))
+    } catch {
+      print("\(error)", to:&standardError)
+    }
+  }
+}
+
+var standardError = FileHandle.standardError
+
+extension FileHandle : TextOutputStream {
+  public func write(_ string: String) {
+    guard let data = string.data(using: .utf8) else { return }
+    self.write(data)
+  }
+}

Resources/branch_main/Package.resolved

@@ -0,0 +1,28 @@
+import Foundation
+import SwiftSyntax
+import SwiftOperators
+import SwiftParser
+
+struct SyntaxParser {
+  static func parse(code: String, options: [String] = []) throws -> SyntaxResponse {
+    let sourceFile = Parser.parse(source: code)
+
+    let syntax: Syntax
+    if options.contains("fold") {
+      syntax = OperatorTable.standardOperators.foldAll(sourceFile, errorHandler: { _ in })
+    } else {
+      syntax = Syntax(sourceFile)
+    }
+
+    let visitor = TokenVisitor(converter: SourceLocationConverter(file: "", tree: sourceFile))
+    _ = visitor.rewrite(syntax)
+
+    let html = "\(visitor.list.joined())"
+
+    let tree = visitor.tree
+    let encoder = JSONEncoder()
+    let json = String(decoding: try encoder.encode(tree), as: UTF8.self)
+
+    return SyntaxResponse(syntaxHTML: html, syntaxJSON: json, swiftVersion: "main")
+  }
+}

Resources/branch_main/Package.swift

@@ -0,0 +1,7 @@
+import Foundation
+
+struct SyntaxResponse: Codable {
+  let syntaxHTML: String
+  let syntaxJSON: String
+  let swiftVersion: String
+}