Skip to content

Commit 177ed2a

Browse files
kateinoigakukunkateinoigakukun
authored
Merge pull request #308 from swiftwasm/katei/format-code
Add .swift-format configuration and add a script to format
2 parents 6406ec2 + c5c9ff9 commit 177ed2a

File tree

66 files changed

+1477
-903
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1477
-903
lines changed

‎.github/workflows/test.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,18 @@ jobs:
6767
- run: swift build
6868
env:
6969
DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer/
70+
71+
format:
72+
runs-on: ubuntu-latest
73+
container:
74+
image: swift:6.0.3
75+
steps:
76+
- uses: actions/checkout@v4
77+
- run: ./Utilities/format.swift
78+
- name: Check for formatting changes
79+
run: |
80+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
81+
git diff --exit-code || {
82+
echo "::error::The formatting changed some files. Please run \`./Utilities/format.swift\` and commit the changes."
83+
exit 1
84+
}

‎.swift-format‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version": 1,
3+
"lineLength": 120,
4+
"indentation": {
5+
"spaces": 4
6+
},
7+
"lineBreakBeforeEachArgument": true,
8+
"indentConditionalCompilationBlocks": false,
9+
"prioritizeKeepingFunctionOutputTogether": true,
10+
"rules": {
11+
"AlwaysUseLowerCamelCase": false
12+
}
13+
}

‎Examples/ActorOnWebWorker/Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ let package = Package(
66
name: "Example",
77
platforms: [.macOS("15"), .iOS("18"), .watchOS("11"), .tvOS("18"), .visionOS("2")],
88
dependencies: [
9-
.package(path: "../../"),
9+
.package(path: "../../")
1010
],
1111
targets: [
1212
.executableTarget(
@@ -15,6 +15,6 @@ let package = Package(
1515
.product(name: "JavaScriptKit", package: "JavaScriptKit"),
1616
.product(name: "JavaScriptEventLoop", package: "JavaScriptKit"),
1717
]
18-
),
18+
)
1919
]
2020
)

‎Examples/ActorOnWebWorker/Sources/MyApp.swift‎

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,21 @@ final class App {
144144
}
145145

146146
private func setupEventHandlers() {
147-
indexButton.onclick = .object(JSClosure { [weak self] _ in
148-
guard let self else { return .undefined }
149-
self.performIndex()
150-
return .undefined
151-
})
152-
153-
searchButton.onclick = .object(JSClosure { [weak self] _ in
154-
guard let self else { return .undefined }
155-
self.performSearch()
156-
return .undefined
157-
})
147+
indexButton.onclick = .object(
148+
JSClosure { [weak self] _ in
149+
guard let self else { return .undefined }
150+
self.performIndex()
151+
return .undefined
152+
}
153+
)
154+
155+
searchButton.onclick = .object(
156+
JSClosure { [weak self] _ in
157+
guard let self else { return .undefined }
158+
self.performSearch()
159+
return .undefined
160+
}
161+
)
158162
}
159163

160164
private func performIndex() {
@@ -221,7 +225,8 @@ final class App {
221225
"padding: 10px; margin: 5px 0; background: #f5f5f5; border-left: 3px solid blue;"
222226
)
223227
resultItem.innerHTML = .string(
224-
"<strong>Result \(index + 1):</strong> \(result.context)")
228+
"<strong>Result \(index + 1):</strong> \(result.context)"
229+
)
225230
_ = resultsElement.appendChild(resultItem)
226231
}
227232
}
@@ -245,18 +250,18 @@ final class App {
245250
}
246251

247252
#if canImport(wasi_pthread)
248-
import wasi_pthread
249-
import WASILibc
250-
251-
/// Trick to avoid blocking the main thread. pthread_mutex_lock function is used by
252-
/// the Swift concurrency runtime.
253-
@_cdecl("pthread_mutex_lock")
254-
func pthread_mutex_lock(_ mutex: UnsafeMutablePointer<pthread_mutex_t>) -> Int32 {
255-
// DO NOT BLOCK MAIN THREAD
256-
var ret: Int32
257-
repeat {
258-
ret = pthread_mutex_trylock(mutex)
259-
} while ret == EBUSY
260-
return ret
261-
}
253+
import wasi_pthread
254+
import WASILibc
255+
256+
/// Trick to avoid blocking the main thread. pthread_mutex_lock function is used by
257+
/// the Swift concurrency runtime.
258+
@_cdecl("pthread_mutex_lock")
259+
func pthread_mutex_lock(_ mutex: UnsafeMutablePointer<pthread_mutex_t>) -> Int32 {
260+
// DO NOT BLOCK MAIN THREAD
261+
var ret: Int32
262+
repeat {
263+
ret = pthread_mutex_trylock(mutex)
264+
} while ret == EBUSY
265+
return ret
266+
}
262267
#endif

‎Examples/Basic/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let package = Package(
1313
name: "Basic",
1414
dependencies: [
1515
"JavaScriptKit",
16-
.product(name: "JavaScriptEventLoop", package: "JavaScriptKit")
16+
.product(name: "JavaScriptEventLoop", package: "JavaScriptKit"),
1717
]
1818
)
1919
],

‎Examples/Basic/Sources/main.swift‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import JavaScriptKit
21
import JavaScriptEventLoop
2+
import JavaScriptKit
33

44
let alert = JSObject.global.alert.function!
55
let document = JSObject.global.document
@@ -10,10 +10,12 @@ _ = document.body.appendChild(divElement)
1010

1111
var buttonElement = document.createElement("button")
1212
buttonElement.innerText = "Alert demo"
13-
buttonElement.onclick = .object(JSClosure { _ in
14-
alert("Swift is running on browser!")
15-
return .undefined
16-
})
13+
buttonElement.onclick = .object(
14+
JSClosure { _ in
15+
alert("Swift is running on browser!")
16+
return .undefined
17+
}
18+
)
1719

1820
_ = document.body.appendChild(buttonElement)
1921

@@ -30,19 +32,21 @@ struct Response: Decodable {
3032

3133
var asyncButtonElement = document.createElement("button")
3234
asyncButtonElement.innerText = "Fetch UUID demo"
33-
asyncButtonElement.onclick = .object(JSClosure { _ in
34-
Task {
35-
do {
36-
let response = try await fetch("https://httpbin.org/uuid").value
37-
let json = try await JSPromise(response.json().object!)!.value
38-
let parsedResponse = try JSValueDecoder().decode(Response.self, from: json)
39-
alert(parsedResponse.uuid)
40-
} catch {
41-
print(error)
35+
asyncButtonElement.onclick = .object(
36+
JSClosure { _ in
37+
Task {
38+
do {
39+
let response = try await fetch("https://httpbin.org/uuid").value
40+
let json = try await JSPromise(response.json().object!)!.value
41+
let parsedResponse = try JSValueDecoder().decode(Response.self, from: json)
42+
alert(parsedResponse.uuid)
43+
} catch {
44+
print(error)
45+
}
4246
}
43-
}
4447

45-
return .undefined
46-
})
48+
return .undefined
49+
}
50+
)
4751

4852
_ = document.body.appendChild(asyncButtonElement)

‎Examples/Embedded/Package.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ let package = Package(
66
name: "Embedded",
77
dependencies: [
88
.package(name: "JavaScriptKit", path: "../../"),
9-
.package(url: "https://github.com/swiftwasm/swift-dlmalloc", branch: "0.1.0")
9+
.package(url: "https://github.com/swiftwasm/swift-dlmalloc", branch: "0.1.0"),
1010
],
1111
targets: [
1212
.executableTarget(
1313
name: "EmbeddedApp",
1414
dependencies: [
1515
"JavaScriptKit",
16-
.product(name: "dlmalloc", package: "swift-dlmalloc")
16+
.product(name: "dlmalloc", package: "swift-dlmalloc"),
1717
],
1818
cSettings: [.unsafeFlags(["-fdeclspec"])],
1919
swiftSettings: [
@@ -28,7 +28,7 @@ let package = Package(
2828
.unsafeFlags([
2929
"-Xclang-linker", "-nostdlib",
3030
"-Xlinker", "--no-entry",
31-
"-Xlinker", "--export-if-defined=__main_argc_argv"
31+
"-Xlinker", "--export-if-defined=__main_argc_argv",
3232
])
3333
]
3434
)

‎Examples/Embedded/Sources/EmbeddedApp/main.swift‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ _ = document.body.appendChild(divElement)
1313

1414
var buttonElement = document.createElement("button")
1515
buttonElement.innerText = "Click me"
16-
buttonElement.onclick = JSValue.object(JSClosure { _ in
17-
count += 1
18-
divElement.innerText = .string("Count \(count)")
19-
return .undefined
20-
})
16+
buttonElement.onclick = JSValue.object(
17+
JSClosure { _ in
18+
count += 1
19+
divElement.innerText = .string("Count \(count)")
20+
return .undefined
21+
}
22+
)
2123

2224
_ = document.body.appendChild(buttonElement)
2325

‎Examples/Multithreading/Package.swift‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ let package = Package(
77
platforms: [.macOS("15"), .iOS("18"), .watchOS("11"), .tvOS("18"), .visionOS("2")],
88
dependencies: [
99
.package(path: "../../"),
10-
.package(url: "https://github.com/kateinoigakukun/chibi-ray", revision: "c8cab621a3338dd2f8e817d3785362409d3b8cf1"),
10+
.package(
11+
url: "https://github.com/kateinoigakukun/chibi-ray",
12+
revision: "c8cab621a3338dd2f8e817d3785362409d3b8cf1"
13+
),
1114
],
1215
targets: [
1316
.executableTarget(
@@ -17,6 +20,6 @@ let package = Package(
1720
.product(name: "JavaScriptEventLoop", package: "JavaScriptKit"),
1821
.product(name: "ChibiRay", package: "chibi-ray"),
1922
]
20-
),
23+
)
2124
]
2225
)

‎Examples/Multithreading/Sources/MyApp/Scene.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func createDemoScene(size: Int) -> Scene {
6060
surface: .diffuse
6161
)
6262
)
63-
)
63+
),
6464
],
6565
lights: [
6666
.spherical(
@@ -83,7 +83,7 @@ func createDemoScene(size: Int) -> Scene {
8383
color: Color(red: 0.8, green: 0.8, blue: 0.8),
8484
intensity: 0.2
8585
)
86-
)
86+
),
8787
],
8888
shadowBias: 1e-13,
8989
maxRecursionDepth: 10

0 commit comments

Comments
 (0)