Highlight.js: (protobuf) service definition seems to break highlighting

[YamiOdymel]

A service definition became a non-closed function that cause the comment is not well highlighted. (the // The request message containing the user's name. part)

The original picture without DOM tooltip.

The example code is from the official example.

syntax = "proto3";

option java_multiple_files = true;
option java_package = "io.grpc.examples.helloworld";
option java_outer_classname = "HelloWorldProto";

package helloworld;

// The greeting service definition.
service Greeter {
  // Sends a greeting
  rpc SayHello (HelloRequest) returns (HelloReply) {}
}

// The request message containing the user's name.
message HelloRequest {
  string name = 1;
}

// The response message containing the greetings
message HelloReply {
  string message = 1;
}

[joshgoebel]

Would it be possible to get this as a jsfiddle reproducible sample please? You can use my template:

https://jsfiddle.net/ajoshguy/qhpL58ec/

[YamiOdymel]

@yyyc514 Done.

https://jsfiddle.net/g4f58o06/

[joshgoebel]

@YamiOdymel Thanks so much!

[joshgoebel]

Don't you need a ; to end the rpc line? What are the line ending rules for protobuf?

[YamiOdymel]

It seems like when a line ended with a }, the ; can be omitted.

example from: https://github.com/golang/protobuf/issues/205

package example;

enum FOO { X = 17; }

message Test {
  required string label = 1;
  optional int32  type  = 2 [default=77];
  repeated int64  reps  = 3;
  optional group OptionalGroup = 4 {
    required string RequiredField = 5;
  }
  oneof union {
    int32  number = 6;
    string name   = 7;
  }
}

[joshgoebel]

All the examples I find look like:

service StatsService {
    rpc Push(PushRequest) returns (PushResponse);
}

What is the {} doing there? I'm not sure i Understand this syntax well enough yet to suggest a proper fix. Can you show me some additional variants of what rpc can look like or point me to some samples?

[YamiOdymel]

Well, I think it's a little bit complex, but I've seen people put the metadata in the {}.

https://github.com/grpc-ecosystem/grpc-gateway/blob/master/examples/proto/examplepb/stream.proto

import "google/api/annotations.proto";
import "google/protobuf/empty.proto";
import "examples/proto/examplepb/a_bit_of_everything.proto";
import "examples/proto/sub/message.proto";

// Defines some more operations to be added to ABitOfEverythingService
service StreamService {
    rpc BulkCreate(stream ABitOfEverything) returns (google.protobuf.Empty) {
        option (google.api.http) = {
            post: "/v1/example/a_bit_of_everything/bulk"
            body: "*"
        };
    }
    rpc List(google.protobuf.Empty) returns (stream ABitOfEverything) {
        option (google.api.http) = {
            get: "/v1/example/a_bit_of_everything"
        };
    }
    rpc BulkEcho(stream grpc.gateway.examples.sub.StringMessage) returns (stream grpc.gateway.examples.sub.StringMessage) {
        option (google.api.http) = {
            post: "/v1/example/a_bit_of_everything/echo"
            body: "*"
        };
    }
}

[joshgoebel]

How does that look? We could just end the function when we hit either a ; or {... right now it only counts ;.

[YamiOdymel]

Oh, that looks great.

I'd also like to ask, will it also be highlighted as well if I put the metadata inside of the {}? It's fine if it doesn't since it's another issue.

[joshgoebel]

I'd also like to ask, will it also be highlighted as well if I put the metadata inside of the {}? It's fine if it doesn't since it's another issue.

It would be highlighted with whatever rules were typically used for code inside a {} block. The function part would still be highlighted the same.