Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/signals/path-matchers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@ function isGeneratedFileFrom(parts: NormalizedPath): boolean {
/\.(generated|gen)\.[^/]+$/.test(norm) ||
// protoc output: Go/TS/JS plugins emit `.pb.{go,ts,js}`, the reference C++ plugin emits
// `.pb.cc` / `.pb.h`, the Swift plugin emits `.pb.swift`, the Dart plugin emits `.pb.dart`,
// the Kotlin plugin emits `.pb.kt`, the C# plugin emits `.pb.cs`, the Rust plugin emits `.pb.rs`,
// the Kotlin plugin emits `.pb.kt`, the Java plugin emits `.pb.java`, the C# plugin emits `.pb.cs`, the Rust plugin emits `.pb.rs`,
// the Elixir plugin emits `.pb.ex`, the Erlang gpb plugin emits `.pb.erl` / `.pb.hrl`, the Crystal
// plugin emits `.pb.cr`, the Haskell plugin emits `.pb.hs`, the Scala plugin emits `.pb.scala`, and the Objective-C plugin emits
// `.pbobjc.{h,m}` plus gRPC `.pbrpc.{h,m}` service stubs. Swift gRPC emits sibling `.grpc.swift`
// service stubs; grpc-kotlin emits sibling `*GrpcKt.kt` coroutine service stubs; grpc-java emits
// sibling `*Grpc.java` service stubs; grpc-dotnet emits sibling `*Grpc.cs` service stubs; the Dart
// gRPC plugin emits sibling `.pbgrpc.dart` service stubs.
// `.pb.dart`/`.pb.kt`/`.pb.cs` (the `.pb` infix keeps hand-written sources from matching).
/\.pb\.(go|ts|js|cc|h|swift|dart|kt|cs|rs|ex|erl|hrl|cr|hs|scala)$/.test(norm) ||
/\.pb\.(go|ts|js|cc|h|swift|dart|kt|cs|rs|ex|erl|hrl|cr|hs|scala|java)$/.test(norm) ||
/\.grpc\.swift$/.test(norm) ||
/grpckt\.kt$/.test(norm) ||
/grpc\.java$/.test(norm) ||
Expand Down
7 changes: 7 additions & 0 deletions test/unit/path-matchers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,12 @@ describe("isGeneratedFile", () => {
expect(classifyChangedFile("lib/foo.pbgrpc.dart")).toBe("generated");
});

it("matches Java protobuf message stubs alongside the other protoc plugins", () => {
expect(isGeneratedFile("proto/messages.pb.java")).toBe(true);
expect(isGeneratedFile("src/Main.java")).toBe(false);
expect(classifyChangedFile("proto/messages.pb.java")).toBe("generated");
});

it("matches Java gRPC service stubs alongside the other protoc plugins", () => {
expect(isGeneratedFile("gen/GreeterGrpc.java")).toBe(true);
expect(isGeneratedFile("src/Greeter.java")).toBe(false);
Expand Down Expand Up @@ -533,6 +539,7 @@ describe("classifyChangedFile", () => {
["proto/messages.pb.scala", "generated"],
["gen/GreeterGrpcKt.kt", "generated"],
["gen/GreeterGrpc.java", "generated"],
["proto/messages.pb.java", "generated"],
["gen/GreeterGrpc.cs", "generated"],
["lib/foo.pbgrpc.dart", "generated"],
["gen/service_grpc_pb.js", "generated"],
Expand Down
Loading