benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-17 10:50:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(swift): add init/deinit indents

Browse source 
Signed-off-by: Phạm Huy Hoàng <hoangtun0810@gmail.com>
This commit is contained in:
再生花 2024-03-11 18:20:10 +09:00 • committed by Christian Clason
parent 8d3176cfbc
commit e73c775aa9
4 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lockfile.json
View file

@ -663,7 +663,7 @@
"revision": "04a126d9210def99f06d9ab84a255110b862d47c" "revision": "04a126d9210def99f06d9ab84a255110b862d47c"
}, },
"swift": { "swift": {
"revision": "7e5b912761c9abca60996b1250f40be1f46cf39a" "revision": "78f2d72e375f83b2ba6cfb5cc7750db3c94e9785"
}, },
"sxhkdrc": { "sxhkdrc": {
"revision": "440d5f913d9465c9c776a1bd92334d32febcf065" "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

18
queries/swift/indents.scm
View file

@ -5,6 +5,8 @@
(class_body) ; class Foo { ... } (class_body) ; class Foo { ... }
(enum_class_body) ; enum Foo { ... } (enum_class_body) ; enum Foo { ... }
(function_declaration) ; func Foo (...) {...} (function_declaration) ; func Foo (...) {...}
(init_declaration) ; init(...) {...}
(deinit_declaration) ; deinit {...}
(computed_property) ; { ... } (computed_property) ; { ... }
(subscript_declaration) ; subscript Foo(...) { ... } (subscript_declaration) ; subscript Foo(...) { ... }
@ -37,6 +39,22 @@
(didset_clause) (didset_clause)
] @indent.begin ] @indent.begin
(init_declaration) @indent.begin
(init_declaration
[
"init"
"("
] @indent.branch)
; indentation for init parameters
(init_declaration
")" @indent.branch @indent.end)
(init_declaration
(parameter) @indent.begin
(#set! indent.immediate))
; @something(...) ; @something(...)
(modifiers (modifiers
(attribute) @indent.begin) (attribute) @indent.begin)

2
tests/indent/swift/declarations.swift
View file

@ -12,6 +12,8 @@ class EquilateralTriangle: NamedShape {
) { ) {
self.sideLength = sideLength self.sideLength = sideLength
} }
deinit {
}
var perimeter: Double { var perimeter: Double {
willSet { willSet {

8
tests/indent/swift_spec.lua
View file

@ -14,9 +14,9 @@ describe("indent Swift:", function()
describe("new line:", function() describe("new line:", function()
run:new_line("declarations.swift", { on_line = 6, text = "var x = 1", indent = 2 }) run:new_line("declarations.swift", { on_line = 6, text = "var x = 1", indent = 2 })
run:new_line("declarations.swift", { on_line = 12, text = "var textInsideInit = true", indent = 4 }) run:new_line("declarations.swift", { on_line = 12, text = "var textInsideInit = true", indent = 4 })
run:new_line("declarations.swift", { on_line = 17, text = "var textInsideWillSet = 1", indent = 6 }) run:new_line("declarations.swift", { on_line = 19, text = "var textInsideWillSet = 1", indent = 6 })
run:new_line("declarations.swift", { on_line = 20, text = "var textInsideDidSet = 1", indent = 6 }) run:new_line("declarations.swift", { on_line = 22, text = "var textInsideDidSet = 1", indent = 6 })
run:new_line("declarations.swift", { on_line = 25, text = "var textInsideOverrideFunc", indent = 4 }) run:new_line("declarations.swift", { on_line = 27, text = "var textInsideOverrideFunc", indent = 4 })
run:new_line("declarations.swift", { on_line = 31, text = "var InsideProtocol: String { get }", indent = 2 }) run:new_line("declarations.swift", { on_line = 33, text = "var InsideProtocol: String { get }", indent = 2 })
end) end)
end) end)