Merge pull request #263 from github/bump_ts

nickrolfe · web-flow · commit ffd80fcc8804 · 2021-08-25T16:35:23.000+01:00
Bump tree-sitter versions to pick up parsing fixes
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/extractor/Cargo.toml b/extractor/Cargo.toml
@@ -9,9 +9,9 @@ edition = "2018"
 [dependencies]
 flate2 = "1.0"
 node-types = { path = "../node-types" }
-tree-sitter = "0.17"
-tree-sitter-embedded-template = { git = "https://github.com/tree-sitter/tree-sitter-embedded-template", rev = "d4aac29c08aa7c596633d00b5ec2dd2d247eafe4" }
-tree-sitter-ruby = { git = "https://github.com/tree-sitter/tree-sitter-ruby.git", rev = "32cd5a04adb4accb0c121f037ab59df3c3488228" }
+tree-sitter = "0.19"
+tree-sitter-embedded-template = "0.19"
+tree-sitter-ruby = "0.19"
 clap = "2.33"
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", features = ["env-filter"] }
diff --git a/generator/Cargo.toml b/generator/Cargo.toml
@@ -11,5 +11,5 @@ clap = "2.33"
 node-types = { path = "../node-types" }
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", features = ["env-filter"] }
-tree-sitter-embedded-template = { git = "https://github.com/tree-sitter/tree-sitter-embedded-template", rev = "d4aac29c08aa7c596633d00b5ec2dd2d247eafe4" }
-tree-sitter-ruby = { git = "https://github.com/tree-sitter/tree-sitter-ruby.git", rev = "32cd5a04adb4accb0c121f037ab59df3c3488228" }
+tree-sitter-embedded-template = "0.19"
+tree-sitter-ruby = "0.19"
diff --git a/ql/test/query-tests/diagnostics/NumberOfSuccessfullyExtractedFiles.expected b/ql/test/query-tests/diagnostics/NumberOfSuccessfullyExtractedFiles.expected
@@ -1 +1 @@
-| 2 |
+| 3 |
diff --git a/ql/test/query-tests/diagnostics/SuccessfullyExtractedFiles.expected b/ql/test/query-tests/diagnostics/SuccessfullyExtractedFiles.expected
@@ -1,2 +1,3 @@
+| src/bar.erb:0:0:0:0 | src/bar.erb |  |
 | src/foo.rb:0:0:0:0 | src/foo.rb |  |
 | src/vendor/cache/lib.rb:0:0:0:0 | src/vendor/cache/lib.rb |  |
diff --git a/ql/test/query-tests/diagnostics/src/bar.erb b/ql/test/query-tests/diagnostics/src/bar.erb
@@ -0,0 +1,2 @@
+<%# comment -%>
+blah

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+\| src/bar.erb:0:0:0:0 \| src/bar.erb \| \|`
`1`	`2`	`\| src/foo.rb:0:0:0:0 \| src/foo.rb \| \|`
`2`	`3`	`\| src/vendor/cache/lib.rb:0:0:0:0 \| src/vendor/cache/lib.rb \| \|`