Migrate to an improved proto grammar (#12225)

languages.toml

@@ -340,16 +340,17 @@ source = { git = "https://github.com/Beaglefoot/tree-sitter-awk", rev = "a799bc5
 [[language]]
 name = "protobuf"
 scope = "source.proto"
-injection-regex = "protobuf"
+injection-regex = "proto"
 file-types = ["proto"]
 language-servers = [ "bufls", "pbkit" ]
 comment-token = "//"
 block-comment-tokens = { start = "/*", end = "*/" }
 indent = { tab-width = 2, unit = "  " }
+grammar = "proto"
 
 [[grammar]]
-name = "protobuf"
+name = "proto"
-source = { git = "https://github.com/yusdacra/tree-sitter-protobuf", rev = "19c211a01434d9f03efff99f85e19f967591b175"}
+source = { git = "https://github.com/sdoerner/tree-sitter-proto", rev = "778ab6ed18a7fcf82c83805a87d63376c51e80bc"}
 
 [[language]]
 name = "textproto"

runtime/queries/protobuf/highlights.scm

@@ -1,5 +1,6 @@
 [
   "syntax"
+  "edition"
   "package"
   "option"
   "import"
@@ -7,44 +8,45 @@
   "rpc"
   "returns"
   "message"
+  "map"
   "enum"
   "oneof"
   "repeated"
+  "optional"
+  "required"
   "reserved"
   "to"
   "stream"
   "extend"
-  "optional"
 ] @keyword
 
 [
-  (keyType)
+  (key_type)
   (type)
+  (message_or_enum_type)
 ] @type.builtin
 
 [
-  (mapName)
+  (enum_name)
-  (enumName)
+  (message_name)
-  (messageName)
+  (service_name)
-  (extendName)
+  (rpc_name)
-  (serviceName)
-  (rpcName)
 ] @type
 
 [
-  (fieldName)
+  (field_name)
-  (optionName)
+  (option_name)
 ] @variable.other.member
-(enumVariantName) @type.enum.variant
+(enum_variant_name) @type.enum.variant
 
-(fullIdent) @namespace
+(full_ident) @namespace
 
-(intLit) @constant.numeric.integer
+(int_lit) @constant.numeric.integer
-(floatLit) @constant.numeric.float
+(float_lit) @constant.numeric.float
-(boolLit) @constant.builtin.boolean
+(bool) @constant.builtin.boolean
-(strLit) @string
+(string) @string
 
-(constant) @constant
+(block_lit) @constant
 
 (comment) @comment
 
@@ -55,12 +57,8 @@
   "]"
   "{"
   "}"
-] @punctuation.bracket
+]  @punctuation.bracket
 
-[
+"=" @operator
-  "="
-] @operator
 
-[
+";" @punctuation.delimiter
-  ";"
-] @punctuation.delimiter

runtime/queries/protobuf/indents.scm

@@ -1,10 +1,10 @@
 [
-  (messageBody)
+  (message_body)
-  (enumBody)
+  (enum_body)
-  (oneofBody)
+  (oneof_body)
-  (serviceBody)
+  (service_body)
-  (rpcBody)
+  (rpc_body)
-  (msgLit)
+  (block_lit)
 ] @indent
 
 "}" @outdent

runtime/queries/protobuf/textobjects.scm

@@ -1,9 +1,9 @@
-(message (messageBody) @class.inside) @class.around
+(message (message_body) @class.inside) @class.around
-(enum (enumBody) @class.inside) @class.around
+(enum (enum_body) @class.inside) @class.around
-(service (serviceBody) @class.inside) @class.around
+(service (service_body) @class.inside) @class.around
 
-(rpc (enumMessageType) @parameter.inside) @function.inside
+(rpc (message_or_enum_type) @parameter.inside) @function.inside
-(rpc (enumMessageType) @parameter.around) @function.around
+(rpc (message_or_enum_type) @parameter.around) @function.around
 
 (comment) @comment.inside
 (comment)+ @comment.around