Emit 'swift-format-ignore-file' in generated files to avoid having th…

…em reformatted by swift-format (grpc#1606)
sundayfun · Aug 24, 2023 · 6aeda21 · 6aeda21
1 parent 9721aa0
commit 6aeda21
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 1 deletion.
diff --git a/Examples/Google/NaturalLanguage/Sources/language_service.grpc.swift b/Examples/Google/NaturalLanguage/Sources/language_service.grpc.swift
@@ -1,5 +1,6 @@
 //
 // DO NOT EDIT.
+// swift-format-ignore-file
 //
 // Generated by the protocol buffer compiler.
 // Source: google/cloud/language/v1/language_service.proto

diff --git a/Sources/Examples/Echo/Model/echo.grpc.swift b/Sources/Examples/Echo/Model/echo.grpc.swift
@@ -1,5 +1,6 @@
 //
 // DO NOT EDIT.
+// swift-format-ignore-file
 //
 // Generated by the protocol buffer compiler.
 // Source: echo.proto

diff --git a/Sources/Examples/HelloWorld/Model/helloworld.grpc.swift b/Sources/Examples/HelloWorld/Model/helloworld.grpc.swift
@@ -1,5 +1,6 @@
 //
 // DO NOT EDIT.
+// swift-format-ignore-file
 //
 // Generated by the protocol buffer compiler.
 // Source: helloworld.proto

diff --git a/Sources/Examples/RouteGuide/Model/route_guide.grpc.swift b/Sources/Examples/RouteGuide/Model/route_guide.grpc.swift
@@ -1,5 +1,6 @@
 //
 // DO NOT EDIT.
+// swift-format-ignore-file
 //
 // Generated by the protocol buffer compiler.
 // Source: route_guide.proto

diff --git a/Sources/GRPCInteroperabilityTestModels/Generated/test.grpc.swift b/Sources/GRPCInteroperabilityTestModels/Generated/test.grpc.swift
@@ -1,5 +1,6 @@
 //
 // DO NOT EDIT.
+// swift-format-ignore-file
 //
 // Generated by the protocol buffer compiler.
 // Source: src/proto/grpc/testing/test.proto

diff --git a/Sources/protoc-gen-grpc-swift/Generator.swift b/Sources/protoc-gen-grpc-swift/Generator.swift
@@ -111,6 +111,7 @@ class Generator {
     self.printer.print("""
     //
     // DO NOT EDIT.
+    // swift-format-ignore-file
     //
     // Generated by the protocol buffer compiler.
     // Source: \(self.file.name)

diff --git a/Tests/GRPCTests/Codegen/Normalization/normalization.grpc.swift b/Tests/GRPCTests/Codegen/Normalization/normalization.grpc.swift
@@ -1,5 +1,6 @@
 //
 // DO NOT EDIT.
+// swift-format-ignore-file
 //
 // Generated by the protocol buffer compiler.
 // Source: normalization.proto

diff --git a/dev/codegen-tests/01-echo/golden/echo.grpc.swift b/dev/codegen-tests/01-echo/golden/echo.grpc.swift
@@ -1,5 +1,6 @@
 //
 // DO NOT EDIT.
+// swift-format-ignore-file
 //
 // Generated by the protocol buffer compiler.
 // Source: echo.proto

diff --git a/dev/codegen-tests/02-multifile/golden/a.grpc.swift b/dev/codegen-tests/02-multifile/golden/a.grpc.swift
@@ -1,5 +1,6 @@
 //
 // DO NOT EDIT.
+// swift-format-ignore-file
 //
 // Generated by the protocol buffer compiler.
 // Source: a.proto

diff --git a/dev/codegen-tests/02-multifile/golden/b.grpc.swift b/dev/codegen-tests/02-multifile/golden/b.grpc.swift
@@ -1,5 +1,6 @@
 //
 // DO NOT EDIT.
+// swift-format-ignore-file
 //
 // Generated by the protocol buffer compiler.
 // Source: b.proto

diff --git a/dev/codegen-tests/03-multifile-with-module-map/golden/a.grpc.swift b/dev/codegen-tests/03-multifile-with-module-map/golden/a.grpc.swift
@@ -1,5 +1,6 @@
 //
 // DO NOT EDIT.
+// swift-format-ignore-file
 //
 // Generated by the protocol buffer compiler.
 // Source: a.proto

diff --git a/dev/codegen-tests/03-multifile-with-module-map/golden/b.grpc.swift b/dev/codegen-tests/03-multifile-with-module-map/golden/b.grpc.swift
@@ -1,5 +1,6 @@
 //
 // DO NOT EDIT.
+// swift-format-ignore-file
 //
 // Generated by the protocol buffer compiler.
 // Source: b.proto

diff --git a/dev/codegen-tests/04-service-with-message-import/golden/service.grpc.swift b/dev/codegen-tests/04-service-with-message-import/golden/service.grpc.swift
@@ -1,5 +1,6 @@
 //
 // DO NOT EDIT.
+// swift-format-ignore-file
 //
 // Generated by the protocol buffer compiler.
 // Source: service.proto

diff --git a/dev/codegen-tests/05-service-only/golden/test.grpc.swift b/dev/codegen-tests/05-service-only/golden/test.grpc.swift
@@ -1,5 +1,6 @@
 //
 // DO NOT EDIT.
+// swift-format-ignore-file
 //
 // Generated by the protocol buffer compiler.
 // Source: test.proto

diff --git a/dev/codegen-tests/06-test-client-only/golden/test.grpc.swift b/dev/codegen-tests/06-test-client-only/golden/test.grpc.swift
@@ -1,5 +1,6 @@
 //
 // DO NOT EDIT.
+// swift-format-ignore-file
 //
 // Generated by the protocol buffer compiler.
 // Source: test.proto

diff --git a/scripts/license-check.sh b/scripts/license-check.sh
@@ -97,7 +97,7 @@ check_copyright_headers() {
       # Package.swift is preceeded by a "swift-tools-version" line.
       *.grpc.swift)
         expected_sha="$SWIFT_GRPC_SHA"
-        drop_first=8
+        drop_first=9
         expected_lines=13
         ;;
       *.pb.swift)