From 074caa09c2156180fc89a3c8d6c4d1c5d84e0d24 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 22 Jun 2022 16:18:52 -0700 Subject: [PATCH] Make python indent query more general Upgrade Tree-sitter for a query bugfix that I found while writing this indent query. --- Cargo.lock | 4 ++-- crates/zed/Cargo.toml | 2 +- crates/zed/src/languages/python/indents.scm | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 427db02e74e911bc34ea21691b4be53e61ae0e30..4b76e517e950ff07337c5e235d8752cf25a83ccf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5212,9 +5212,9 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.20.6" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b3b781640108d29892e8b9684642d2cda5ea05951fd58f0fea1db9edeb9b71" +checksum = "549a9faf45679ad50b7f603253635598cf5e007d8ceb806a23f95355938f76a0" dependencies = [ "cc", "regex", diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index 3e43f45c7af67b5c831e52e936fcd2a0ae6f761b..47a2df6a9a074f820b93d1208f22ca22f6104870 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -87,7 +87,7 @@ tempdir = { version = "0.3.7" } thiserror = "1.0.29" tiny_http = "0.8" toml = "0.5" -tree-sitter = "0.20.6" +tree-sitter = "0.20.7" tree-sitter-c = "0.20.1" tree-sitter-cpp = "0.20.0" tree-sitter-go = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "aeb2f33b366fd78d5789ff104956ce23508b85db" } diff --git a/crates/zed/src/languages/python/indents.scm b/crates/zed/src/languages/python/indents.scm index efc93466a7e39e2f3a0051376648ace62a33fbb0..ad262fd5013bfe458257b6ba51232c7a546ce1f2 100644 --- a/crates/zed/src/languages/python/indents.scm +++ b/crates/zed/src/languages/python/indents.scm @@ -1,6 +1,4 @@ -(class_definition body: (block)) @indent -(function_definition body: (block)) @indent - +(_ (block)) @indent (_ "[" "]" @end) @indent (_ "{" "}" @end) @indent (_ "(" ")" @end) @indent