From a757ee6a35f612fc07e5ce35a1032370a6e78f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=E9=87=91=E5=8F=AF=E6=98=8E?= Date: Sun, 9 Jul 2023 19:32:44 +0200 Subject: [PATCH] fix(lua): downgrade tree-sitter-lua from 2.1.2 to 2.1.1 due to breaking linux changes --- .github/workflows/tests.yml | 8 ++++---- autoload/doge.vim | 1 + helper/Cargo.lock | 20 ++++++++++---------- helper/Cargo.toml | 20 ++++++++++---------- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 992a0099..309ed4f7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,11 +10,11 @@ on: jobs: tests_vim: - name: Vim + name: Vim (unix) strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-20.04, macos-latest] vim-version: [v7.4.2119, v8.2.5172, head] runs-on: ${{ matrix.os }} steps: @@ -88,11 +88,11 @@ jobs: tests_neovim: - name: Neovim + name: Neovim (unix) strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-20.04, macos-latest] vim-version: [v0.3.2, head] runs-on: ${{ matrix.os }} steps: diff --git a/autoload/doge.vim b/autoload/doge.vim index 79cb92b0..899f90a4 100644 --- a/autoload/doge.vim +++ b/autoload/doge.vim @@ -9,6 +9,7 @@ let s:comment_placeholder = doge#utils#placeholder() " actual docblock to be inserted later on. function! doge#run_parser() abort let l:executables = [ + \ '/helper/target/release/vim-doge-helper.exe', \ '/helper/target/release/vim-doge-helper', \ '/bin/vim-doge-helper', \ ] diff --git a/helper/Cargo.lock b/helper/Cargo.lock index 67099889..a7787b26 100644 --- a/helper/Cargo.lock +++ b/helper/Cargo.lock @@ -603,7 +603,7 @@ dependencies = [ [[package]] name = "tree-sitter-bash" version = "0.19.0" -source = "git+https://github.com/tree-sitter/tree-sitter-bash#493646764e7ad61ce63ce3b8c59ebeb37f71b841" +source = "git+https://github.com/tree-sitter/tree-sitter-bash?rev=4936467#493646764e7ad61ce63ce3b8c59ebeb37f71b841" dependencies = [ "cc", "tree-sitter", @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "tree-sitter-c" version = "0.20.2" -source = "git+https://github.com/tree-sitter/tree-sitter-c#84bdf409067676dd5c003b2a7cb7760456e731bf" +source = "git+https://github.com/tree-sitter/tree-sitter-c?rev=84bdf40#84bdf409067676dd5c003b2a7cb7760456e731bf" dependencies = [ "cc", "tree-sitter", @@ -621,7 +621,7 @@ dependencies = [ [[package]] name = "tree-sitter-c-sharp" version = "0.20.0" -source = "git+https://github.com/tree-sitter/tree-sitter-c-sharp#1648e21b4f087963abf0101ee5221bb413107b07" +source = "git+https://github.com/tree-sitter/tree-sitter-c-sharp?rev=1648e21#1648e21b4f087963abf0101ee5221bb413107b07" dependencies = [ "cc", "tree-sitter", @@ -630,7 +630,7 @@ dependencies = [ [[package]] name = "tree-sitter-cpp" version = "0.20.0" -source = "git+https://github.com/tree-sitter/tree-sitter-cpp#0e7b7a02b6074859b51c1973eb6a8275b3315b1d" +source = "git+https://github.com/tree-sitter/tree-sitter-cpp?rev=0e7b7a0#0e7b7a02b6074859b51c1973eb6a8275b3315b1d" dependencies = [ "cc", "tree-sitter", @@ -639,7 +639,7 @@ dependencies = [ [[package]] name = "tree-sitter-java" version = "0.20.0" -source = "git+https://github.com/tree-sitter/tree-sitter-java#c194ee5e6ede5f26cf4799feead4a8f165dcf14d" +source = "git+https://github.com/tree-sitter/tree-sitter-java?rev=c194ee5#c194ee5e6ede5f26cf4799feead4a8f165dcf14d" dependencies = [ "cc", "tree-sitter", @@ -648,7 +648,7 @@ dependencies = [ [[package]] name = "tree-sitter-lua" version = "0.0.1" -source = "git+https://github.com/Azganoth/tree-sitter-lua#6b02dfd7f07f36c223270e97eb0adf84e15a4cef" +source = "git+https://github.com/Azganoth/tree-sitter-lua?rev=6b02dfd#6b02dfd7f07f36c223270e97eb0adf84e15a4cef" dependencies = [ "cc", "tree-sitter", @@ -666,7 +666,7 @@ dependencies = [ [[package]] name = "tree-sitter-python" version = "0.20.2" -source = "git+https://github.com/tree-sitter/tree-sitter-python#36f9e33d52b7572536ac1a8af8d7e78363ad52c3" +source = "git+https://github.com/tree-sitter/tree-sitter-python?rev=36f9e33#36f9e33d52b7572536ac1a8af8d7e78363ad52c3" dependencies = [ "cc", "tree-sitter", @@ -675,7 +675,7 @@ dependencies = [ [[package]] name = "tree-sitter-ruby" version = "0.20.0" -source = "git+https://github.com/tree-sitter/tree-sitter-ruby#f257f3f57833d584050336921773738a3fd8ca22" +source = "git+https://github.com/tree-sitter/tree-sitter-ruby?rev=f257f3f#f257f3f57833d584050336921773738a3fd8ca22" dependencies = [ "cc", "tree-sitter", @@ -684,7 +684,7 @@ dependencies = [ [[package]] name = "tree-sitter-rust" version = "0.20.3" -source = "git+https://github.com/tree-sitter/tree-sitter-rust#0a70e15da977489d954c219af9b50b8a722630ee" +source = "git+https://github.com/tree-sitter/tree-sitter-rust?rev=0a70e15#0a70e15da977489d954c219af9b50b8a722630ee" dependencies = [ "cc", "tree-sitter", @@ -693,7 +693,7 @@ dependencies = [ [[package]] name = "tree-sitter-typescript" version = "0.20.2" -source = "git+https://github.com/tree-sitter/tree-sitter-typescript#3429d8c77d7a83e80032667f0642e6cb19d0c772" +source = "git+https://github.com/tree-sitter/tree-sitter-typescript?rev=3429d8c#3429d8c77d7a83e80032667f0642e6cb19d0c772" dependencies = [ "cc", "tree-sitter", diff --git a/helper/Cargo.toml b/helper/Cargo.toml index 4b75d946..2f7c2626 100644 --- a/helper/Cargo.toml +++ b/helper/Cargo.toml @@ -15,16 +15,16 @@ serde = { version = "1.0.104", features = ["derive"] } serde_json = "1.0.99" serde_yaml = "0.9.22" tree-sitter = "0.20.10" -tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash" } -tree-sitter-lua = { git = "https://github.com/Azganoth/tree-sitter-lua" } -tree-sitter-ruby = { git = "https://github.com/tree-sitter/tree-sitter-ruby" } -tree-sitter-rust = { git = "https://github.com/tree-sitter/tree-sitter-rust" } -tree-sitter-c-sharp = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp" } -tree-sitter-java = { git = "https://github.com/tree-sitter/tree-sitter-java" } -tree-sitter-python = { git = "https://github.com/tree-sitter/tree-sitter-python" } -tree-sitter-c = { git = "https://github.com/tree-sitter/tree-sitter-c" } -tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp" } -tree-sitter-typescript = { git = "https://github.com/tree-sitter/tree-sitter-typescript" } +tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "4936467" } +tree-sitter-lua = { git = "https://github.com/Azganoth/tree-sitter-lua", rev = "e198b76" } +tree-sitter-ruby = { git = "https://github.com/tree-sitter/tree-sitter-ruby", rev = "f257f3f" } +tree-sitter-rust = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "0a70e15" } +tree-sitter-c-sharp = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "1648e21" } +tree-sitter-java = { git = "https://github.com/tree-sitter/tree-sitter-java", rev = "c194ee5" } +tree-sitter-python = { git = "https://github.com/tree-sitter/tree-sitter-python", rev = "36f9e33" } +tree-sitter-c = { git = "https://github.com/tree-sitter/tree-sitter-c", rev = "84bdf40" } +tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "0e7b7a0" } +tree-sitter-typescript = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "3429d8c" } # Waiting for these to be merged: # - https://github.com/tree-sitter/tree-sitter-php/pull/181