Bump hylo

.github/workflows/build-and-test-template.yml

@@ -180,7 +180,7 @@ jobs:
 
     - name: Build and copy support library
       run: |
-        clang -c ./Library/Hylo/LibC.c -o HyloLibC.lib
+        clang -c ./StandardLibrary/Sources/LibC.c -o HyloLibC.lib
         xcopy HyloLibC.lib c:\program" "files\microsoft" "visual" "studio\2022\enterprise\vc\tools\msvc\${{ env.VCToolsVersion }}\lib\x64\
       working-directory: hylo
 

.github/workflows/build-and-test.yml

@@ -60,5 +60,5 @@ jobs:
   #       name: hylo-lsp-artifacts-common
   #       path: |
   #         LICENSE
-  #         hylo/Library/Hylo
+  #         hylo/StandardLibrary/Sources
 

.github/workflows/publish-release-version.yml

@@ -42,7 +42,7 @@ jobs:
       run: |
         set -eo pipefail
         git -C hylo rev-parse HEAD > ref
-        cp -Rp hylo/Library/Hylo hylo-stdlib
+        cp -Rp hylo/StandardLibrary/Sources hylo-stdlib
         mkdir -p release-artifacts
         # tar -zcvf release-artifacts/hylo-stdlib.tar.gz hylo-stdlib
         zip -r release-artifacts/hylo-stdlib.zip hylo-stdlib ref

.gitmodules

@@ -9,13 +9,16 @@
 	url = https://github.com/koliyo/hylo.git
 [submodule "swift-unisocket"]
 	path = swift-unisocket
-	url = https://github.com/seznam/swift-unisocket.git
+	url = https://github.com/koliyo/swift-unisocket.git
 [submodule "JSONRPC-DataChannel-UniSocket"]
 	path = JSONRPC-DataChannel-UniSocket
 	url = https://github.com/koliyo/JSONRPC-DataChannel-UniSocket.git
 [submodule "JSONRPC"]
 	path = JSONRPC
-	url = https://github.com/ChimeHQ/JSONRPC.git
+	url = https://github.com/koliyo/JSONRPC.git
 [submodule "hylo-vscode-extension"]
 	path = hylo-vscode-extension
 	url = https://github.com/koliyo/hylo-vscode-extension.git
+[submodule "Swifty-LLVM"]
+	path = Swifty-LLVM
+	url = https://github.com/koliyo/Swifty-LLVM.git

Package.resolved

@@ -45,6 +45,24 @@
         "version" : "0.9.0"
       }
     },
+    {
+      "identity" : "languageserver",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ChimeHQ/LanguageServer",
+      "state" : {
+        "branch" : "main",
+        "revision" : "00fdfd9fad8e24d1669af01241436588a035a14a"
+      }
+    },
+    {
+      "identity" : "languageserverprotocol",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ChimeHQ/LanguageServerProtocol",
+      "state" : {
+        "revision" : "d4b9a4e327ba07366d1f56464c1d6365b77418dd",
+        "version" : "0.11.0"
+      }
+    },
     {
       "identity" : "processenv",
       "kind" : "remoteSourceControl",
@@ -86,8 +104,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-argument-parser.git",
       "state" : {
-        "revision" : "8f4d2753f0e4778c76d5f05ad16c74f707390531",
-        "version" : "1.2.3"
+        "revision" : "c8ed701b513cf5177118a175d85fbbbcd707ab41",
+        "version" : "1.3.0"
       }
     },
     {

Package.swift

@@ -6,7 +6,7 @@ import Foundation
 
 let commonCompileSettings: [SwiftSetting] = [
 	// .unsafeFlags(["-warnings-as-errors"])
-	.enableExperimentalFeature("StrictConcurrency")
+	// .enableExperimentalFeature("StrictConcurrency")
 	// .unsafeFlags(["-strict-concurrency=complete", "-warn-concurrency"])
 ]
 
@@ -36,11 +36,11 @@ let package = Package(
     // .package(url: "https://github.com/crspybits/swift-log-file.git", from: "0.1.0"),
     .package(url: "https://github.com/sushichop/Puppy.git", from: "0.7.0"),
     // .package(url: "https://github.com/vapor/console-kit.git", from: "4.7.0"),
-    // .package(url: "https://github.com/ChimeHQ/LanguageServerProtocol", from: "0.10.0"),
+    .package(url: "https://github.com/ChimeHQ/LanguageServer", branch: "main"),
     // .package(url: "https://github.com/ChimeHQ/LanguageClient", from: "0.6.0"),
     // .package(url: "https://github.com/ChimeHQ/ProcessEnv", from: "1.0.0"),
     // .package(url: "https://github.com/seznam/swift-unisocket", from: "0.14.0"),
-    .package(path: "./LanguageServerProtocol"),
+    // .package(path: "./LanguageServerProtocol"),
     .package(path: "./LanguageClient"),
     // .package(name: "UniSocket", path: "./swift-unisocket"),
     // .package(path: "./swift-unisocket"),
@@ -59,8 +59,7 @@ let package = Package(
         .product(name: "Logging", package: "swift-log"),
         // .product(name: "FileLogging", package: "swift-log-file"),
         "Puppy",
-        .product(name: "LanguageServerProtocol", package: "LanguageServerProtocol"),
-        .product(name: "LSPServer", package: "LanguageServerProtocol"),
+        "LanguageServer",
         // "JSONRPC-DataChannel-UniSocket",
         // "JSONRPC-DataChannel-Actor",
         .product(name: "HyloFrontEnd", package: "hylo"),

Sources/hylo-lsp/DocumentProvider.swift

@@ -1,7 +1,7 @@
 import JSONRPC
 import Foundation
 import LanguageServerProtocol
-import LSPServer
+import LanguageServer
 import StandardLibrary
 @preconcurrency import Core
 import FrontEnd
@@ -123,7 +123,7 @@ public actor DocumentProvider {
       return URL(fileURLWithPath: path)
     }
     else {
-      return StandardLibrary.standardLibrarySourceRoot
+      return StandardLibrary.freestandingLibrarySourceRoot
     }
   }
 
@@ -208,7 +208,7 @@ public actor DocumentProvider {
       // We need to replace stdlib files from in memory buffers if they have unsaved changes
       if let context = documents[file.url.absoluteString] {
         logger.debug("Replace content for stdlib source file: \(file.url)")
-        return SourceFile(filePath: file.url, withContent: context.doc.text)
+        return SourceFile(contents: context.doc.text, fileID: file.url)
       }
       else {
         return file
@@ -401,7 +401,7 @@ public actor DocumentProvider {
       }
       else {
         let url = URL.init(string: uri)!
-        sourceFiles = [SourceFile(filePath: url, withContent: context.doc.text)]
+        sourceFiles = [SourceFile(contents: context.doc.text, fileID: url)]
       }
 
       context.astTask = Task {

Sources/hylo-lsp/HyloServer.swift

@@ -1,6 +1,6 @@
 import JSONRPC
 import LanguageServerProtocol
-import LSPServer
+import LanguageServer
 import Foundation
 import Semaphore
 

Tests/hylo-lspTests/HyloServerTests.swift

@@ -1,7 +1,7 @@
 import XCTest
 import JSONRPC
 import LanguageServerProtocol
-import LSPServer
+import LanguageServer
 import Logging
 import Puppy
 

build-and-install-vscode-extension.sh

@@ -8,7 +8,7 @@ BUILD_DIR=$(swift build -c release --show-bin-path)
 DIST_DIR=hylo-vscode-extension/dist
 rm -rf $DIST_DIR
 mkdir -p $DIST_DIR
-cp -Rp hylo/Library/Hylo $DIST_DIR/hylo-stdlib
+cp -Rp hylo/StandardLibrary/Sources $DIST_DIR/hylo-stdlib
 mkdir -p $DIST_DIR/bin/
 cp -fv $BUILD_DIR/hylo-lsp-server $DIST_DIR/bin/
 PUBLISHED_AT=$(date -u '+%Y-%m-%dT%H:%M:%SZ')

setup-env.fish

@@ -0,0 +1,2 @@
+set xcode_bin_path $(dirname $(xcodebuild -find clang))
+fish_add_path $xcode_bin_path