Restoring authorship annotation for <thegeorg@yandex-team.ru>. Commit 1 of 2.

16 files changed, 232 insertions, 232 deletions

diff --git a/contrib/tools/bison/bison/data/yacc.c b/contrib/tools/bison/bison/data/yacc.c
index c18a9350cf..45e0a87d5b 100644
--- a/contrib/tools/bison/bison/data/yacc.c
+++ b/contrib/tools/bison/bison/data/yacc.c
@@ -770,7 +770,7 @@ int yydebug;
 # define YYMAXDEPTH ]b4_stack_depth_max[
 #endif]b4_lac_if([[
 
-
+ 
 /* Given a state stack such that *YYBOTTOM is its bottom, such that
    *YYTOP is either its top or is YYTOP_EMPTY to indicate an empty
    stack, and such that *YYCAPACITY is the maximum number of elements it
@@ -1054,11 +1054,11 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
    backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
    null, do not copy; instead, return the length of what the result
    would have been.  */
-#ifdef __cplusplus
-# define BISON_FALLTHROUGH [[fallthrough]]
-#else
-# define BISON_FALLTHROUGH
-#endif
+#ifdef __cplusplus 
+# define BISON_FALLTHROUGH [[fallthrough]] 
+#else 
+# define BISON_FALLTHROUGH 
+#endif 
 static YYSIZE_T
 yytnamerr (char *yyres, const char *yystr)
 {
@@ -1077,7 +1077,7 @@ yytnamerr (char *yyres, const char *yystr)
           case '\\':
             if (*++yyp != '\\')
               goto do_not_strip_quotes;
-            BISON_FALLTHROUGH;
+            BISON_FALLTHROUGH; 
           default:
             if (yyres)
               yyres[yyn] = *yyp;
diff --git a/contrib/tools/bison/bison/src/scan-skel.c b/contrib/tools/bison/bison/src/scan-skel.c
index 1e116da14d..63445a3872 100644
--- a/contrib/tools/bison/bison/src/scan-skel.c
+++ b/contrib/tools/bison/bison/src/scan-skel.c
@@ -42,11 +42,11 @@
 #endif
 
 /* %if-c++-only */
-#define BISON_FALLTHROUGH [[fallthrough]]
+#define BISON_FALLTHROUGH [[fallthrough]] 
 /* %endif */
 
 /* %if-c-only */
-#define BISON_FALLTHROUGH 
+#define BISON_FALLTHROUGH  
 /* %endif */
 
 /* %if-c-only */
@@ -1619,7 +1619,7 @@ static int yy_get_next_buffer (void)
 					/* Reset buffer status. */
 					skel_restart(skel_in );
 
-					BISON_FALLTHROUGH;
+					BISON_FALLTHROUGH; 
 
 				case EOB_ACT_END_OF_FILE:
 					{
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp b/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
index cd96aa0565..a6a3f16ab3 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
@@ -1,11 +1,11 @@
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/cpp/cpp_helpers.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/strutil.h>
+#include <google/protobuf/compiler/code_generator.h> 
+#include <google/protobuf/compiler/cpp/cpp_helpers.h> 
+#include <google/protobuf/descriptor.h> 
+#include <google/protobuf/descriptor.pb.h> 
+#include <google/protobuf/io/printer.h> 
+#include <google/protobuf/io/zero_copy_stream.h> 
+#include <google/protobuf/stubs/common.h> 
+#include <google/protobuf/stubs/strutil.h> 
 
 #include "cpp_styleguide.h"
 #include <util/stream/output.h>
@@ -41,12 +41,12 @@ namespace NPlugins {
     }
 
     TProtoStringType HeaderFileName(const FileDescriptor* file) {
-        TProtoStringType basename = compiler::StripProto(file->name());
+        TProtoStringType basename = compiler::StripProto(file->name()); 
         return basename.append(".pb.h");
     }
 
     TProtoStringType SourceFileName(const FileDescriptor* file) {
-        TProtoStringType basename = compiler::StripProto(file->name());
+        TProtoStringType basename = compiler::StripProto(file->name()); 
         return basename.append(".pb.cc");
     }
 
@@ -105,15 +105,15 @@ namespace NPlugins {
             }
 
             void GenerateAccessorDeclarations(io::Printer* printer) {
-                Variables_["type"] = QualifiedClassName(Field_->message_type());
+                Variables_["type"] = QualifiedClassName(Field_->message_type()); 
 
                 printer->Print(Variables_,
-                    "inline const $type$& Get$rname$() const { return $name$(); }\n"
-                    "inline $type$* Mutable$rname$() { return mutable_$name$(); }\n");
+                    "inline const $type$& Get$rname$() const { return $name$(); }\n" 
+                    "inline $type$* Mutable$rname$() { return mutable_$name$(); }\n"); 
                 if (Variables_.end() != Variables_.find("RName"))
                     printer->Print(Variables_,
-                        "inline const $type$& Get$RName$() const { return $name$(); }\n"
-                        "inline $type$* Mutable$RName$() { return mutable_$name$(); }\n");
+                        "inline const $type$& Get$RName$() const { return $name$(); }\n" 
+                        "inline $type$* Mutable$RName$() { return mutable_$name$(); }\n"); 
             }
 
             void GenerateJSONPrinting(io::Printer* printer) override {
@@ -132,7 +132,7 @@ namespace NPlugins {
 
                 switch (Val_->cpp_type()) {
                     case FieldDescriptor::CPPTYPE_MESSAGE:
-                        Variables_["val_cpp"] = QualifiedClassName(Val_->message_type());
+                        Variables_["val_cpp"] = QualifiedClassName(Val_->message_type()); 
                         break;
                     case FieldDescriptor::CPPTYPE_ENUM:
                         Variables_["val_cpp"] = ClassName(Val_->enum_type(), true);
@@ -144,12 +144,12 @@ namespace NPlugins {
 
             void GenerateAccessorDeclarations(io::Printer* printer) {
                 printer->Print(Variables_,
-                    "inline const ::google::protobuf::Map<$key_cpp$, $val_cpp$>& Get$rname$() const { return $name$(); }\n"
-                    "inline ::google::protobuf::Map<$key_cpp$, $val_cpp$>* Mutable$rname$() { return mutable_$name$(); }\n");
+                    "inline const ::google::protobuf::Map<$key_cpp$, $val_cpp$>& Get$rname$() const { return $name$(); }\n" 
+                    "inline ::google::protobuf::Map<$key_cpp$, $val_cpp$>* Mutable$rname$() { return mutable_$name$(); }\n"); 
                 if (Variables_.end() != Variables_.find("RName"))
                     printer->Print(Variables_,
-                        "inline const ::google::protobuf::Map<$key_cpp$, $val_cpp$>& Get$RName$() const { return $name$(); }\n"
-                        "inline ::google::protobuf::Map<$key_cpp$, $val_cpp$>* Mutable$RName$() { return mutable_$name$(); }\n");
+                        "inline const ::google::protobuf::Map<$key_cpp$, $val_cpp$>& Get$RName$() const { return $name$(); }\n" 
+                        "inline ::google::protobuf::Map<$key_cpp$, $val_cpp$>* Mutable$RName$() { return mutable_$name$(); }\n"); 
             }
 
             void GenerateKeyValuePrinting(io::Printer* printer, const char* scopeName, bool isKey) {
@@ -205,28 +205,28 @@ namespace NPlugins {
             }
 
             void GenerateAccessorDeclarations(io::Printer* printer) {
-                Variables_["type"] = QualifiedClassName(Field_->message_type());
+                Variables_["type"] = QualifiedClassName(Field_->message_type()); 
 
                 printer->Print(Variables_,
-                    "inline const $type$& Get$rname$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(int(_index)); }\n"
-                    "inline $type$* Mutable$rname$(size_t _index) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return mutable_$name$(int(_index)); }\n"
-                    "inline $type$* Add$rname$() { return add_$name$(); }\n"
-                    "inline const $type$& get_idx_$name$(int _index) const { return $name$(_index); }\n"
-                    "inline const ::google::protobuf::RepeatedPtrField< $type$ >&\n"
+                    "inline const $type$& Get$rname$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(int(_index)); }\n" 
+                    "inline $type$* Mutable$rname$(size_t _index) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return mutable_$name$(int(_index)); }\n" 
+                    "inline $type$* Add$rname$() { return add_$name$(); }\n" 
+                    "inline const $type$& get_idx_$name$(int _index) const { return $name$(_index); }\n" 
+                    "inline const ::google::protobuf::RepeatedPtrField< $type$ >&\n" 
                     "    get_arr_$name$() const { return $name$(); }\n"
-                    "inline const ::google::protobuf::RepeatedPtrField< $type$ >&\n"
+                    "inline const ::google::protobuf::RepeatedPtrField< $type$ >&\n" 
                     "    Get$rname$() const { return $name$(); }\n"
-                    "inline ::google::protobuf::RepeatedPtrField< $type$ >*\n"
+                    "inline ::google::protobuf::RepeatedPtrField< $type$ >*\n" 
                     "    Mutable$rname$() { return mutable_$name$(); }\n");
 
                 if (Variables_.end() != Variables_.find("RName"))
                     printer->Print(Variables_,
-                        "inline const $type$& Get$RName$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(int(_index)); }\n"
-                        "inline $type$* Mutable$RName$(size_t _index) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return mutable_$name$(int(_index)); }\n"
-                        "inline $type$* Add$RName$() { return add_$name$(); }\n"
-                        "inline const ::google::protobuf::RepeatedPtrField< $type$ >&\n"
+                        "inline const $type$& Get$RName$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(int(_index)); }\n" 
+                        "inline $type$* Mutable$RName$(size_t _index) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return mutable_$name$(int(_index)); }\n" 
+                        "inline $type$* Add$RName$() { return add_$name$(); }\n" 
+                        "inline const ::google::protobuf::RepeatedPtrField< $type$ >&\n" 
                         "    Get$RName$() const { return $name$(); }\n"
-                        "inline ::google::protobuf::RepeatedPtrField< $type$ >*\n"
+                        "inline ::google::protobuf::RepeatedPtrField< $type$ >*\n" 
                         "    Mutable$RName$() { return mutable_$name$(); }\n"
                     );
             }
@@ -255,21 +255,21 @@ namespace NPlugins {
                 }
 
                 printer->Print(Variables_,
-                    "inline const TProtoStringType& Get$rname$() const { return $name$(); }\n"
-                    "inline void Set$rname$(const TProtoStringType& value) { set_$name$(value); }\n"
-                    "inline void Set$rname$(TProtoStringType&& value) { set_$name$(std::move(value)); }\n"
-                    "inline void Set$rname$(const char* value) { set_$name$(value); }\n"
-                    "inline void Set$rname$(const $pointer_type$* value, size_t size) { set_$name$(value, size); }\n"
-                    "inline TProtoStringType* Mutable$rname$() { return mutable_$name$(); }\n");
+                    "inline const TProtoStringType& Get$rname$() const { return $name$(); }\n" 
+                    "inline void Set$rname$(const TProtoStringType& value) { set_$name$(value); }\n" 
+                    "inline void Set$rname$(TProtoStringType&& value) { set_$name$(std::move(value)); }\n" 
+                    "inline void Set$rname$(const char* value) { set_$name$(value); }\n" 
+                    "inline void Set$rname$(const $pointer_type$* value, size_t size) { set_$name$(value, size); }\n" 
+                    "inline TProtoStringType* Mutable$rname$() { return mutable_$name$(); }\n"); 
 
                 if (Variables_.end() != Variables_.find("RName"))
                     printer->Print(Variables_,
-                        "inline const TProtoStringType& Get$RName$() const { return $name$(); }\n"
-                        "inline void Set$RName$(const TProtoStringType& value) { set_$name$(value); }\n"
-                        "inline void Set$RName$(TProtoStringType&& value) { set_$name$(std::move(value)); }\n"
-                        "inline void Set$RName$(const char* value) { set_$name$(value); }\n"
-                        "inline void Set$RName$(const $pointer_type$* value, size_t size) { set_$name$(value, size); }\n"
-                        "inline TProtoStringType* Mutable$RName$() { return mutable_$name$(); }\n"
+                        "inline const TProtoStringType& Get$RName$() const { return $name$(); }\n" 
+                        "inline void Set$RName$(const TProtoStringType& value) { set_$name$(value); }\n" 
+                        "inline void Set$RName$(TProtoStringType&& value) { set_$name$(std::move(value)); }\n" 
+                        "inline void Set$RName$(const char* value) { set_$name$(value); }\n" 
+                        "inline void Set$RName$(const $pointer_type$* value, size_t size) { set_$name$(value, size); }\n" 
+                        "inline TProtoStringType* Mutable$RName$() { return mutable_$name$(); }\n" 
                     );
 
                 if (Field_->options().ctype() != FieldOptions::STRING) {
@@ -304,41 +304,41 @@ namespace NPlugins {
                 }
 
                 printer->Print(Variables_,
-                    "inline const TProtoStringType& Get$rname$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(_index); }\n"
-                    "inline TProtoStringType* Mutable$rname$(size_t _index) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return mutable_$name$(_index); }\n"
-                    "inline void Set$rname$(size_t _index, const TProtoStringType& value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n"
-                    "inline void Set$rname$(size_t _index, TProtoStringType&& value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, std::move(value)); }\n"
-                    "inline void Set$rname$(size_t _index, const char* value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n"
-                    "inline void Set$rname$(size_t _index, const $pointer_type$* value, size_t size) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value, size); }\n"
-                    "inline TProtoStringType* Add$rname$() { return add_$name$(); }\n"
-                    "inline void Add$rname$(const TProtoStringType& value) { add_$name$(value); }\n"
-                    "inline void Add$rname$(TProtoStringType&& value) { add_$name$(std::move(value)); }\n"
-                    "inline void Add$rname$(const char* value) { add_$name$(value); }\n"
-                    "inline void Add$rname$(const $pointer_type$* value, size_t size) { add_$name$(value, size); }\n"
-                    "inline const TProtoStringType& get_idx_$name$(int _index) const { return $name$(_index); }\n"
-                    "inline const ::google::protobuf::RepeatedPtrField<TProtoStringType>& get_arr_$name$() const"
+                    "inline const TProtoStringType& Get$rname$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(_index); }\n" 
+                    "inline TProtoStringType* Mutable$rname$(size_t _index) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return mutable_$name$(_index); }\n" 
+                    "inline void Set$rname$(size_t _index, const TProtoStringType& value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n" 
+                    "inline void Set$rname$(size_t _index, TProtoStringType&& value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, std::move(value)); }\n" 
+                    "inline void Set$rname$(size_t _index, const char* value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n" 
+                    "inline void Set$rname$(size_t _index, const $pointer_type$* value, size_t size) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value, size); }\n" 
+                    "inline TProtoStringType* Add$rname$() { return add_$name$(); }\n" 
+                    "inline void Add$rname$(const TProtoStringType& value) { add_$name$(value); }\n" 
+                    "inline void Add$rname$(TProtoStringType&& value) { add_$name$(std::move(value)); }\n" 
+                    "inline void Add$rname$(const char* value) { add_$name$(value); }\n" 
+                    "inline void Add$rname$(const $pointer_type$* value, size_t size) { add_$name$(value, size); }\n" 
+                    "inline const TProtoStringType& get_idx_$name$(int _index) const { return $name$(_index); }\n" 
+                    "inline const ::google::protobuf::RepeatedPtrField<TProtoStringType>& get_arr_$name$() const" 
                     "{ return $name$(); }\n"
-                    "inline const ::google::protobuf::RepeatedPtrField<TProtoStringType>& Get$rname$() const"
+                    "inline const ::google::protobuf::RepeatedPtrField<TProtoStringType>& Get$rname$() const" 
                     "{ return $name$(); }\n"
-                    "inline ::google::protobuf::RepeatedPtrField<TProtoStringType>* Mutable$rname$()"
+                    "inline ::google::protobuf::RepeatedPtrField<TProtoStringType>* Mutable$rname$()" 
                     "{ return mutable_$name$(); }\n");
 
                 if (Variables_.end() != Variables_.find("RName"))
                     printer->Print(Variables_,
-                        "inline const TProtoStringType& Get$RName$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(_index); }\n"
-                        "inline TProtoStringType* Mutable$RName$(size_t _index) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return mutable_$name$(_index); }\n"
-                        "inline void Set$RName$(size_t _index, const TProtoStringType& value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n"
-                        "inline void Set$RName$(size_t _index, TProtoStringType&& value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, std::move(value)); }\n"
-                        "inline void Set$RName$(size_t _index, const char* value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n"
-                        "inline void Set$RName$(size_t _index, const $pointer_type$* value, size_t size) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value, size); }\n"
-                        "inline TProtoStringType* Add$RName$() { return add_$name$(); }\n"
-                        "inline void Add$RName$(const TProtoStringType& value) { add_$name$(value); }\n"
-                        "inline void Add$RName$(TProtoStringType&& value) { add_$name$(std::move(value)); }\n"
-                        "inline void Add$RName$(const char* value) { add_$name$(value); }\n"
-                        "inline void Add$RName$(const $pointer_type$* value, size_t size) { add_$name$(value, size); }\n"
-                        "inline const ::google::protobuf::RepeatedPtrField<TProtoStringType>& Get$RName$() const"
+                        "inline const TProtoStringType& Get$RName$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(_index); }\n" 
+                        "inline TProtoStringType* Mutable$RName$(size_t _index) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return mutable_$name$(_index); }\n" 
+                        "inline void Set$RName$(size_t _index, const TProtoStringType& value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n" 
+                        "inline void Set$RName$(size_t _index, TProtoStringType&& value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, std::move(value)); }\n" 
+                        "inline void Set$RName$(size_t _index, const char* value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n" 
+                        "inline void Set$RName$(size_t _index, const $pointer_type$* value, size_t size) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value, size); }\n" 
+                        "inline TProtoStringType* Add$RName$() { return add_$name$(); }\n" 
+                        "inline void Add$RName$(const TProtoStringType& value) { add_$name$(value); }\n" 
+                        "inline void Add$RName$(TProtoStringType&& value) { add_$name$(std::move(value)); }\n" 
+                        "inline void Add$RName$(const char* value) { add_$name$(value); }\n" 
+                        "inline void Add$RName$(const $pointer_type$* value, size_t size) { add_$name$(value, size); }\n" 
+                        "inline const ::google::protobuf::RepeatedPtrField<TProtoStringType>& Get$RName$() const" 
                         "{ return $name$(); }\n"
-                        "inline ::google::protobuf::RepeatedPtrField<TProtoStringType>* Mutable$RName$()"
+                        "inline ::google::protobuf::RepeatedPtrField<TProtoStringType>* Mutable$RName$()" 
                         "{ return mutable_$name$(); }\n"
                     );
 
@@ -368,13 +368,13 @@ namespace NPlugins {
                 Variables_["type"] = ClassName(Field_->enum_type(), true);
 
                 printer->Print(Variables_,
-                    "inline $type$ Get$rname$() const { return $name$(); }\n"
-                    "inline void Set$rname$($type$ value) { set_$name$(value); }\n");
+                    "inline $type$ Get$rname$() const { return $name$(); }\n" 
+                    "inline void Set$rname$($type$ value) { set_$name$(value); }\n"); 
 
                 if (Variables_.end() != Variables_.find("RName"))
                     printer->Print(Variables_,
-                        "inline $type$ Get$RName$() const { return $name$(); } \n"
-                        "inline void Set$RName$($type$ value) { set_$name$(value); }\n"
+                        "inline $type$ Get$RName$() const { return $name$(); } \n" 
+                        "inline void Set$RName$($type$ value) { set_$name$(value); }\n" 
                     );
             }
 
@@ -394,20 +394,20 @@ namespace NPlugins {
                 Variables_["type"] = ClassName(Field_->enum_type(), true);
 
                 printer->Print(Variables_,
-                    "inline $type$ Get$rname$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(_index); }\n"
-                    "inline void Set$rname$(size_t _index, $type$ value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n"
-                    "inline void Add$rname$($type$ value) { add_$name$(value); }\n"
-                    "inline $type$ get_idx_$name$(int _index) const {return $name$(_index); }\n"
-                    "inline const ::google::protobuf::RepeatedField<int>& get_arr_$name$() const { return $name$(); }\n"
-                    "inline const ::google::protobuf::RepeatedField<int>& Get$rname$() const { return $name$(); }\n"
-                    "inline ::google::protobuf::RepeatedField<int>* Mutable$rname$() { return mutable_$name$(); }\n");
+                    "inline $type$ Get$rname$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(_index); }\n" 
+                    "inline void Set$rname$(size_t _index, $type$ value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n" 
+                    "inline void Add$rname$($type$ value) { add_$name$(value); }\n" 
+                    "inline $type$ get_idx_$name$(int _index) const {return $name$(_index); }\n" 
+                    "inline const ::google::protobuf::RepeatedField<int>& get_arr_$name$() const { return $name$(); }\n" 
+                    "inline const ::google::protobuf::RepeatedField<int>& Get$rname$() const { return $name$(); }\n" 
+                    "inline ::google::protobuf::RepeatedField<int>* Mutable$rname$() { return mutable_$name$(); }\n"); 
                 if (Variables_.end() != Variables_.find("RName"))
                     printer->Print(Variables_,
-                        "inline $type$ Get$RName$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(_index); }\n"
-                        "inline void Set$RName$(size_t _index, $type$ value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n"
-                        "inline void Add$RName$($type$ value) { add_$name$(value); }\n"
-                        "inline const ::google::protobuf::RepeatedField<int>& Get$RName$() const { return $name$(); }\n"
-                        "inline ::google::protobuf::RepeatedField<int>* Mutable$RName$() { return mutable_$name$(); }\n"
+                        "inline $type$ Get$RName$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(_index); }\n" 
+                        "inline void Set$RName$(size_t _index, $type$ value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n" 
+                        "inline void Add$RName$($type$ value) { add_$name$(value); }\n" 
+                        "inline const ::google::protobuf::RepeatedField<int>& Get$RName$() const { return $name$(); }\n" 
+                        "inline ::google::protobuf::RepeatedField<int>* Mutable$RName$() { return mutable_$name$(); }\n" 
                     );
             }
 
@@ -427,12 +427,12 @@ namespace NPlugins {
                 Variables_["type"] = PrimitiveTypeName(Field_->cpp_type());
 
                 printer->Print(Variables_,
-                    "inline $type$ Get$rname$() const { return $name$();}\n"
-                    "inline void Set$rname$($type$ value) { set_$name$(value); }\n");
+                    "inline $type$ Get$rname$() const { return $name$();}\n" 
+                    "inline void Set$rname$($type$ value) { set_$name$(value); }\n"); 
                 if (Variables_.end() != Variables_.find("RName"))
                     printer->Print(Variables_,
-                        "inline $type$ Get$RName$() const { return $name$();}\n"
-                        "inline void Set$RName$($type$ value) { set_$name$(value); }\n"
+                        "inline $type$ Get$RName$() const { return $name$();}\n" 
+                        "inline void Set$RName$($type$ value) { set_$name$(value); }\n" 
                     );
             }
 
@@ -452,24 +452,24 @@ namespace NPlugins {
                 Variables_["type"] = PrimitiveTypeName(Field_->cpp_type());
 
                 printer->Print(Variables_,
-                    "inline $type$ Get$rname$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(_index); }\n"
-                    "inline void Set$rname$(size_t _index, $type$ value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n"
-                    "inline void Add$rname$($type$ value) { add_$name$(value); }\n"
-                    "inline $type$ get_idx_$name$(int _index) const { return $name$(_index); }\n"
-                    "inline const ::google::protobuf::RepeatedField< $type$ >&\n"
+                    "inline $type$ Get$rname$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(_index); }\n" 
+                    "inline void Set$rname$(size_t _index, $type$ value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n" 
+                    "inline void Add$rname$($type$ value) { add_$name$(value); }\n" 
+                    "inline $type$ get_idx_$name$(int _index) const { return $name$(_index); }\n" 
+                    "inline const ::google::protobuf::RepeatedField< $type$ >&\n" 
                     "    get_arr_$name$() const { return $name$(); }\n"
-                    "inline const ::google::protobuf::RepeatedField< $type$ >&\n"
+                    "inline const ::google::protobuf::RepeatedField< $type$ >&\n" 
                     "    Get$rname$() const { return $name$(); }\n"
-                    "inline ::google::protobuf::RepeatedField< $type$ >*\n"
+                    "inline ::google::protobuf::RepeatedField< $type$ >*\n" 
                     "    Mutable$rname$() { return mutable_$name$(); }\n");
                 if (Variables_.end() != Variables_.find("RName"))
                     printer->Print(Variables_,
-                        "inline $type$ Get$RName$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(_index); }\n"
-                        "inline void Set$RName$(size_t _index, $type$ value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n"
-                        "inline void Add$RName$($type$ value) { add_$name$(value); }\n"
-                        "inline const ::google::protobuf::RepeatedField< $type$ >&\n"
+                        "inline $type$ Get$RName$(size_t _index) const {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); return $name$(_index); }\n" 
+                        "inline void Set$RName$(size_t _index, $type$ value) {Y_ASSERT(_index < static_cast<size_t>(::Max<int>())); set_$name$(_index, value); }\n" 
+                        "inline void Add$RName$($type$ value) { add_$name$(value); }\n" 
+                        "inline const ::google::protobuf::RepeatedField< $type$ >&\n" 
                         "    Get$RName$() const { return $name$(); }\n"
-                        "inline ::google::protobuf::RepeatedField< $type$ >*\n"
+                        "inline ::google::protobuf::RepeatedField< $type$ >*\n" 
                         "    Mutable$RName$() { return mutable_$name$(); }\n"
                     );
             }
@@ -662,23 +662,23 @@ namespace NPlugins {
             {
                 for (int i = 0, idx = 0; i < descriptor->nested_type_count(); i++) {
                     if (!IsAutogeneratedNestedType(descriptor->nested_type(i))) {
-                        NestedGenerators_.emplace_back(descriptor->nested_type(i), OutputDirectory_);
+                        NestedGenerators_.emplace_back(descriptor->nested_type(i), OutputDirectory_); 
                     }
                 }
 
-                FieldGenerators_.reserve(descriptor->field_count());
+                FieldGenerators_.reserve(descriptor->field_count()); 
                 for (int i = 0; i < descriptor->field_count(); i++) {
-                    FieldGenerators_.emplace_back(MakeGenerator(descriptor->field(i)));
+                    FieldGenerators_.emplace_back(MakeGenerator(descriptor->field(i))); 
                 }
 
-                ExtensionGenerators_.reserve(descriptor->extension_count());
+                ExtensionGenerators_.reserve(descriptor->extension_count()); 
                 for (int i = 0; i < descriptor->extension_count(); i++) {
-                    ExtensionGenerators_.emplace_back(descriptor->extension(i));
+                    ExtensionGenerators_.emplace_back(descriptor->extension(i)); 
                 }
 
-                OneofGenerators_.reserve(descriptor->real_oneof_decl_count());
-                for (int i = 0; i < descriptor->real_oneof_decl_count(); i++) {
-                    OneofGenerators_.emplace_back(descriptor->oneof_decl(i));
+                OneofGenerators_.reserve(descriptor->real_oneof_decl_count()); 
+                for (int i = 0; i < descriptor->real_oneof_decl_count(); i++) { 
+                    OneofGenerators_.emplace_back(descriptor->oneof_decl(i)); 
                 }
             }
 
@@ -686,40 +686,40 @@ namespace NPlugins {
                 GenerateSaveLoadImplementation();
                 GenerateJSONImplementation();
 
-                for (auto& nestedGenerator: NestedGenerators_) {
-                    nestedGenerator.GenerateClassDefinitionExtension();
+                for (auto& nestedGenerator: NestedGenerators_) { 
+                    nestedGenerator.GenerateClassDefinitionExtension(); 
                 }
             }
 
             void GenerateDebugOutputExtension() {
                 GenerateDebugOutput();
 
-                for (auto& nestedGenerator: NestedGenerators_) {
-                    nestedGenerator.GenerateDebugOutputExtension();
+                for (auto& nestedGenerator: NestedGenerators_) { 
+                    nestedGenerator.GenerateDebugOutputExtension(); 
                 }
             }
 
             void GenerateTypedefOutputExtension(bool nested) {
                 GenerateTypedefOutput(nested);
 
-                for (auto& nestedGenerator: NestedGenerators_) {
-                    nestedGenerator.GenerateTypedefOutputExtension(true);
+                for (auto& nestedGenerator: NestedGenerators_) { 
+                    nestedGenerator.GenerateTypedefOutputExtension(true); 
                 }
             }
 
 
             void GenerateClassExtension() {
                 GenerateDebugStringImplementation();
-                for (auto& nestedGenerator: NestedGenerators_) {
-                    nestedGenerator.GenerateClassExtension();
+                for (auto& nestedGenerator: NestedGenerators_) { 
+                    nestedGenerator.GenerateClassExtension(); 
                 }
             }
 
             void GenerateDeclarations() {
                 GenerateFieldAccessorDeclarations();
 
-                for (auto& nestedGenerator: NestedGenerators_) {
-                    nestedGenerator.GenerateDeclarations();
+                for (auto& nestedGenerator: NestedGenerators_) { 
+                    nestedGenerator.GenerateDeclarations(); 
                 }
             }
 
@@ -733,7 +733,7 @@ namespace NPlugins {
             void GenerateFieldAccessorDeclarations() {
                 TProtoStringType fileName = HeaderFileName(Descriptor_->file());
                 TProtoStringType scope = "class_scope:" + Descriptor_->full_name();
-                std::unique_ptr<io::ZeroCopyOutputStream> output(
+                std::unique_ptr<io::ZeroCopyOutputStream> output( 
                     OutputDirectory_->OpenForInsert(fileName, scope));
                 io::Printer printer(output.get(), '$');
 
@@ -747,44 +747,44 @@ namespace NPlugins {
                     const bool hasRName = (vars.end() != vars.find("RName"));
                     if (field->is_repeated()) {
                         printer.Print(vars,
-                            "inline size_t $rname$Size() const { return (size_t)$name$_size(); }\n");
+                            "inline size_t $rname$Size() const { return (size_t)$name$_size(); }\n"); 
                         if (hasRName)
                             printer.Print(vars,
-                                "inline size_t $RName$Size() const { return (size_t)$name$_size(); }\n");
-                    } else if (field->has_presence()) {
+                                "inline size_t $RName$Size() const { return (size_t)$name$_size(); }\n"); 
+                    } else if (field->has_presence()) { 
                         printer.Print(vars,
-                            "inline bool Has$rname$() const { return has_$name$(); }\n");
+                            "inline bool Has$rname$() const { return has_$name$(); }\n"); 
                         if (hasRName)
                             printer.Print(vars,
-                                "inline bool Has$RName$() const { return has_$name$(); }\n");
+                                "inline bool Has$RName$() const { return has_$name$(); }\n"); 
                     }
 
-                    printer.Print(vars, "inline void Clear$rname$() { clear_$name$(); }\n");
+                    printer.Print(vars, "inline void Clear$rname$() { clear_$name$(); }\n"); 
                     if (hasRName)
                         printer.Print(vars,
-                            "inline void Clear$RName$() { clear_$name$(); }\n");
+                            "inline void Clear$RName$() { clear_$name$(); }\n"); 
 
                     // Generate type-specific accessor declarations.
                     FieldGenerators_[i]->GenerateAccessorDeclarations(&printer);
 
                     printer.Print("\n");
                 }
-                for (auto& extensionGenerator: ExtensionGenerators_) {
-                    extensionGenerator.GenerateDeclaration(&printer);
+                for (auto& extensionGenerator: ExtensionGenerators_) { 
+                    extensionGenerator.GenerateDeclaration(&printer); 
                 }
-                for (auto& oneofGenerator: OneofGenerators_) {
-                    oneofGenerator.GenerateDeclarations(&printer);
+                for (auto& oneofGenerator: OneofGenerators_) { 
+                    oneofGenerator.GenerateDeclarations(&printer); 
                 }
                 TVariables vars;
                 vars["class"] = ClassName(Descriptor_, false);
                 if (!IsLiteRuntimeMessage(Descriptor_)) {
                     printer.Print("TProtoStringType ShortUtf8DebugString() const;\n");
-
-                    printer.Print("void PrintJSON(IOutputStream&) const override;\n");
-                    printer.Print(vars, "::google::protobuf::io::TAsJSON<$class$> AsJSON() const {\n");
-                    printer.Print(vars, "    return ::google::protobuf::io::TAsJSON<$class$>(*this);\n");
-                    printer.Print("}\n");
-
+ 
+                    printer.Print("void PrintJSON(IOutputStream&) const override;\n"); 
+                    printer.Print(vars, "::google::protobuf::io::TAsJSON<$class$> AsJSON() const {\n"); 
+                    printer.Print(vars, "    return ::google::protobuf::io::TAsJSON<$class$>(*this);\n"); 
+                    printer.Print("}\n"); 
+ 
                     printer.Print("void Save(IOutputStream* output) const;\n");
                     printer.Print("void Load(IInputStream* input);\n");
                 }
@@ -794,7 +794,7 @@ namespace NPlugins {
             void GenerateSaveLoadImplementation() {
                 TProtoStringType fileName = SourceFileName(Descriptor_->file());
                 TProtoStringType scope = "namespace_scope";
-                std::unique_ptr<io::ZeroCopyOutputStream> output(
+                std::unique_ptr<io::ZeroCopyOutputStream> output( 
                     OutputDirectory_->OpenForInsert(fileName, scope));
                 io::Printer printer(output.get(), '$');
 
@@ -815,7 +815,7 @@ namespace NPlugins {
             void GenerateDebugStringImplementation() {
                 TProtoStringType fileName = SourceFileName(Descriptor_->file());
                 TProtoStringType scope = "namespace_scope";
-                std::unique_ptr<io::ZeroCopyOutputStream> output(
+                std::unique_ptr<io::ZeroCopyOutputStream> output( 
                     OutputDirectory_->OpenForInsert(fileName, scope));
                 io::Printer printer(output.get(), '$');
 
@@ -831,13 +831,13 @@ namespace NPlugins {
             }
 
             void GenerateJSONImplementation() {
-                if (IsLiteRuntimeMessage(Descriptor_)) {
-                    return;
-                }
-
+                if (IsLiteRuntimeMessage(Descriptor_)) { 
+                    return; 
+                } 
+ 
                 TProtoStringType fileName = SourceFileName(Descriptor_->file());
                 TProtoStringType scope = "namespace_scope";
-                std::unique_ptr<io::ZeroCopyOutputStream> output(
+                std::unique_ptr<io::ZeroCopyOutputStream> output( 
                     OutputDirectory_->OpenForInsert(fileName, scope));
                 io::Printer printer(output.get(), '$');
                 printer.Print("// Yandex JSON extension\n");
@@ -859,7 +859,7 @@ namespace NPlugins {
                     if (field->is_repeated()) {
                         // map or repeated field in both proto3 and proto2 syntax
                         printer.Print(vars, "if ($rname$Size() > 0) {\n");
-                    } else if (field->has_presence()) {
+                    } else if (field->has_presence()) { 
                         // any optional or required field in proto2 syntax
                         // message-field or any oneof field in proto3 syntax
                         printer.Print(vars, "if (Has$rname$()) {\n");
@@ -886,7 +886,7 @@ namespace NPlugins {
             void GenerateDebugOutput() {
                 TProtoStringType fileName = SourceFileName(Descriptor_->file());
                 TProtoStringType scope = "global_scope";
-                std::unique_ptr<io::ZeroCopyOutputStream> output(
+                std::unique_ptr<io::ZeroCopyOutputStream> output( 
                     OutputDirectory_->OpenForInsert(fileName, scope));
                 io::Printer printer(output.get(), '$');
                 if (!IsLiteRuntimeMessage(Descriptor_)) {
@@ -908,7 +908,7 @@ namespace NPlugins {
                 TProtoStringType scope = nested ? "class_scope:" + Descriptor_->full_name().substr(0,
                                                     Descriptor_->full_name().size() - Descriptor_->name().size() - 1)
                                                 : "namespace_scope";
-                std::unique_ptr<io::ZeroCopyOutputStream> output(
+                std::unique_ptr<io::ZeroCopyOutputStream> output( 
                     OutputDirectory_->OpenForInsert(fileName, scope));
                 io::Printer printer(output.get(), '$');
                 TString name = Descriptor_->name();
@@ -926,12 +926,12 @@ namespace NPlugins {
 
         private:
             const Descriptor* Descriptor_;
-            TProtoStringType Classname_;
+            TProtoStringType Classname_; 
             OutputDirectory* OutputDirectory_;
-            std::vector<std::unique_ptr<TFieldExtGenerator>>  FieldGenerators_;
-            std::vector<TMessageExtGenerator> NestedGenerators_;
-            std::vector<TExtensionGenerator> ExtensionGenerators_;
-            std::vector<TOneofGenerator> OneofGenerators_;
+            std::vector<std::unique_ptr<TFieldExtGenerator>>  FieldGenerators_; 
+            std::vector<TMessageExtGenerator> NestedGenerators_; 
+            std::vector<TExtensionGenerator> ExtensionGenerators_; 
+            std::vector<TOneofGenerator> OneofGenerators_; 
     };
 
     class TFileExtGenerator {
@@ -940,26 +940,26 @@ namespace NPlugins {
                 : File_(file)
                 , OutputDirectory_(output_directory)
             {
-                MessageGenerators_.reserve(file->message_type_count());
-                for (size_t i = 0; i < file->message_type_count(); i++) {
-                    MessageGenerators_.emplace_back(file->message_type(i), OutputDirectory_);
+                MessageGenerators_.reserve(file->message_type_count()); 
+                for (size_t i = 0; i < file->message_type_count(); i++) { 
+                    MessageGenerators_.emplace_back(file->message_type(i), OutputDirectory_); 
                 }
             }
 
             void GenerateHeaderExtensions() {
                 GenerateHeaderIncludeExtensions();
 
-                for (auto& messageGenerator: MessageGenerators_) {
-                    messageGenerator.GenerateTypedefOutputExtension(false);
-                    messageGenerator.GenerateDeclarations();
+                for (auto& messageGenerator: MessageGenerators_) { 
+                    messageGenerator.GenerateTypedefOutputExtension(false); 
+                    messageGenerator.GenerateDeclarations(); 
                 }
             }
 
             void GenerateSourceExtensions() {
                 GenerateSourceIncludeExtensions();
 
-                for (auto& messageGenerator: MessageGenerators_) {
-                    messageGenerator.GenerateDefinitions();
+                for (auto& messageGenerator: MessageGenerators_) { 
+                    messageGenerator.GenerateDefinitions(); 
                 }
             }
 
@@ -967,7 +967,7 @@ namespace NPlugins {
             void GenerateSourceIncludeExtensions() {
                 TProtoStringType fileName = SourceFileName(File_);
                 TProtoStringType scope = "includes";
-                std::unique_ptr<io::ZeroCopyOutputStream> output(
+                std::unique_ptr<io::ZeroCopyOutputStream> output( 
                     OutputDirectory_->OpenForInsert(fileName, scope));
                 io::Printer printer(output.get(), '$');
                 printer.Print("#include <google/protobuf/messagext.h>\n");
@@ -976,7 +976,7 @@ namespace NPlugins {
             void GenerateHeaderIncludeExtensions() {
                 TProtoStringType fileName = HeaderFileName(File_);
                 TProtoStringType scope = "includes";
-                std::unique_ptr<io::ZeroCopyOutputStream> output(
+                std::unique_ptr<io::ZeroCopyOutputStream> output( 
                     OutputDirectory_->OpenForInsert(fileName, scope));
                 io::Printer printer(output.get(), '$');
                 printer.Print("#include <google/protobuf/json_util.h>\n");
@@ -986,7 +986,7 @@ namespace NPlugins {
             const FileDescriptor* File_;
             OutputDirectory* OutputDirectory_;
             size_t MessageTypeCount_;
-            std::vector<TMessageExtGenerator> MessageGenerators_;
+            std::vector<TMessageExtGenerator> MessageGenerators_; 
     };
 
     bool TCppStyleGuideExtensionGenerator::Generate(const FileDescriptor* file,
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.h b/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.h
index b428730edb..c0dc1df119 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.h
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.h
@@ -1,20 +1,20 @@
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/plugin.h>
-#include <google/protobuf/stubs/common.h>
+#include <google/protobuf/compiler/code_generator.h> 
+#include <google/protobuf/compiler/plugin.h> 
+#include <google/protobuf/stubs/common.h> 
 
-namespace NProtobuf::NCompiler::NPlugins {
+namespace NProtobuf::NCompiler::NPlugins { 
 
 class TCppStyleGuideExtensionGenerator : public google::protobuf::compiler::CodeGenerator {
-public:
-    bool Generate(const google::protobuf::FileDescriptor* file,
-        const TProtoStringType& parameter,
-        google::protobuf::compiler::OutputDirectory* output_directory,
-        TProtoStringType* error
-    ) const override;
+public: 
+    bool Generate(const google::protobuf::FileDescriptor* file, 
+        const TProtoStringType& parameter, 
+        google::protobuf::compiler::OutputDirectory* output_directory, 
+        TProtoStringType* error 
+    ) const override; 
 
-    uint64_t GetSupportedFeatures() const override {
-        return FEATURE_PROTO3_OPTIONAL;
-    }
+    uint64_t GetSupportedFeatures() const override { 
+        return FEATURE_PROTO3_OPTIONAL; 
+    } 
 };
 
-} // namespace NProtobuf::NCompiler::NPlugins
+} // namespace NProtobuf::NCompiler::NPlugins 
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/ya.make b/contrib/tools/protoc/plugins/cpp_styleguide/ya.make
index 5a5f17d49a..8ee9f2e57e 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/ya.make
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/ya.make
@@ -7,7 +7,7 @@ ENDIF()
 IF (NOT PREBUILT)
     INCLUDE(${ARCADIA_ROOT}/contrib/tools/protoc/plugins/cpp_styleguide/bin/ya.make)
 ENDIF()
-
+ 
 RECURSE(
     bin
 )
diff --git a/contrib/tools/protoc/plugins/grpc_java/ya.make b/contrib/tools/protoc/plugins/grpc_java/ya.make
index 82b18378a0..7df2c6e31c 100644
--- a/contrib/tools/protoc/plugins/grpc_java/ya.make
+++ b/contrib/tools/protoc/plugins/grpc_java/ya.make
@@ -10,7 +10,7 @@ ENDIF()
 IF (NOT PREBUILT)
     INCLUDE(${ARCADIA_ROOT}/contrib/tools/protoc/plugins/grpc_java/bin/ya.make)
 ENDIF()
-
+ 
 RECURSE(
     bin
 )
diff --git a/contrib/tools/protoc/plugins/ya.make b/contrib/tools/protoc/plugins/ya.make
index 44254ae111..7101688a54 100644
--- a/contrib/tools/protoc/plugins/ya.make
+++ b/contrib/tools/protoc/plugins/ya.make
@@ -1,6 +1,6 @@
-RECURSE(
-    cpp_styleguide
-    grpc_cpp
-    grpc_java
-    grpc_python
-)
+RECURSE( 
+    cpp_styleguide 
+    grpc_cpp 
+    grpc_java 
+    grpc_python 
+) 
diff --git a/contrib/tools/protoc/ya.make b/contrib/tools/protoc/ya.make
index 81244e1259..3cbd1fdf43 100644
--- a/contrib/tools/protoc/ya.make
+++ b/contrib/tools/protoc/ya.make
@@ -1,18 +1,18 @@
-OWNER(
-    velavokr
-    g:contrib
-    g:cpp-contrib
-)
+OWNER( 
+    velavokr 
+    g:contrib 
+    g:cpp-contrib 
+) 
 
 IF (USE_PREBUILT_TOOLS)
     INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/ya.make.prebuilt)
 ENDIF()
-
+ 
 IF (NOT PREBUILT)
     INCLUDE(${ARCADIA_ROOT}/contrib/tools/protoc/bin/ya.make)
 ENDIF()
 
 RECURSE(
     bin
-    plugins
+    plugins 
 )
diff --git a/contrib/tools/python/src/Include/abstract.h b/contrib/tools/python/src/Include/abstract.h
index 7818e45304..7785df6677 100644
--- a/contrib/tools/python/src/Include/abstract.h
+++ b/contrib/tools/python/src/Include/abstract.h
@@ -324,7 +324,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
        */
 
      PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *callable_object,
-                                                 const char *format, ...);
+                                                 const char *format, ...); 
 
        /*
      Call a callable Python object, callable_object, with a
@@ -337,8 +337,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
        */
 
 
-     PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *o, const char *m,
-                                               const char *format, ...);
+     PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *o, const char *m, 
+                                               const char *format, ...); 
 
        /*
      Call the method named m of object o with a variable number of
@@ -350,10 +350,10 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
        */
 
      PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable,
-                                                         const char *format, ...);
+                                                         const char *format, ...); 
      PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *o,
-                                                       const char *name,
-                                                       const char *format, ...);
+                                                       const char *name, 
+                                                       const char *format, ...); 
 
      PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable,
                                                         ...);
diff --git a/contrib/tools/python/src/Include/descrobject.h b/contrib/tools/python/src/Include/descrobject.h
index d2c9468dcf..65c909e0b4 100644
--- a/contrib/tools/python/src/Include/descrobject.h
+++ b/contrib/tools/python/src/Include/descrobject.h
@@ -9,10 +9,10 @@ typedef PyObject *(*getter)(PyObject *, void *);
 typedef int (*setter)(PyObject *, PyObject *, void *);
 
 typedef struct PyGetSetDef {
-    const char *name;
+    const char *name; 
     getter get;
     setter set;
-    const char *doc;
+    const char *doc; 
     void *closure;
 } PyGetSetDef;
 
diff --git a/contrib/tools/python/src/Include/pythonrun.h b/contrib/tools/python/src/Include/pythonrun.h
index ba644b375a..7b3c8db08f 100644
--- a/contrib/tools/python/src/Include/pythonrun.h
+++ b/contrib/tools/python/src/Include/pythonrun.h
@@ -19,7 +19,7 @@ typedef struct {
     int cf_flags;  /* bitmask of CO_xxx flags relevant to future */
 } PyCompilerFlags;
 
-PyAPI_FUNC(void) Py_SetProgramName(const char *);
+PyAPI_FUNC(void) Py_SetProgramName(const char *); 
 PyAPI_FUNC(char *) Py_GetProgramName(void);
 
 PyAPI_FUNC(void) Py_SetPythonHome(char *);
diff --git a/contrib/tools/python/src/Include/sysmodule.h b/contrib/tools/python/src/Include/sysmodule.h
index cf11a2bc50..7bb92fdf75 100644
--- a/contrib/tools/python/src/Include/sysmodule.h
+++ b/contrib/tools/python/src/Include/sysmodule.h
@@ -7,8 +7,8 @@
 extern "C" {
 #endif
 
-PyAPI_FUNC(PyObject *) PySys_GetObject(const char *);
-PyAPI_FUNC(int) PySys_SetObject(const char *, PyObject *);
+PyAPI_FUNC(PyObject *) PySys_GetObject(const char *); 
+PyAPI_FUNC(int) PySys_SetObject(const char *, PyObject *); 
 PyAPI_FUNC(FILE *) PySys_GetFile(char *, FILE *);
 PyAPI_FUNC(void) PySys_SetArgv(int, char **);
 PyAPI_FUNC(void) PySys_SetArgvEx(int, char **, int);
diff --git a/contrib/tools/python3/src/Include/pyconfig-linux.h b/contrib/tools/python3/src/Include/pyconfig-linux.h
index 98de8abc72..a4e2999bb0 100644
--- a/contrib/tools/python3/src/Include/pyconfig-linux.h
+++ b/contrib/tools/python3/src/Include/pyconfig-linux.h
@@ -1053,7 +1053,7 @@
 /* #undef HAVE_STRLCPY */
 
 /* Define to 1 if you have the <stropts.h> header file. */
-/* #undef HAVE_STROPTS_H */
+/* #undef HAVE_STROPTS_H */ 
 
 /* Define to 1 if you have the `strsignal' function. */
 #define HAVE_STRSIGNAL 1
diff --git a/contrib/tools/python3/src/Modules/posixmodule.c b/contrib/tools/python3/src/Modules/posixmodule.c
index 0918266843..7019b48b0e 100644
--- a/contrib/tools/python3/src/Modules/posixmodule.c
+++ b/contrib/tools/python3/src/Modules/posixmodule.c
@@ -7168,9 +7168,9 @@ error:
 #endif /* HAVE_PTY_H */
 #ifdef HAVE_STROPTS_H
 #include <stropts.h>
-#else
-    #define __SID  ('S' << 8)
-    #define I_PUSH (__SID | 2)
+#else 
+    #define __SID  ('S' << 8) 
+    #define I_PUSH (__SID | 2) 
 #endif
 #endif /* defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) || defined(HAVE_DEV_PTMX) */
 
diff --git a/contrib/tools/python3/src/tsan.supp b/contrib/tools/python3/src/tsan.supp
index 65dce089ff..3286944ae6 100644
--- a/contrib/tools/python3/src/tsan.supp
+++ b/contrib/tools/python3/src/tsan.supp
@@ -1,3 +1,3 @@
-# Thread sanitizers reports a data race during main thread shutdown.
-# This race was consiered to be safe. See DEVTOOLSSUPPORT-8443 for details
+# Thread sanitizers reports a data race during main thread shutdown. 
+# This race was consiered to be safe. See DEVTOOLSSUPPORT-8443 for details 
 race:PyInterpreterState_Delete
diff --git a/contrib/tools/python3/src/ya.make b/contrib/tools/python3/src/ya.make
index 64637cd287..5e0433ad2a 100644
--- a/contrib/tools/python3/src/ya.make
+++ b/contrib/tools/python3/src/ya.make
@@ -179,19 +179,19 @@ SRCS(
     Python/traceback.c
 )
 
-SUPPRESSIONS(
-    tsan.supp
+SUPPRESSIONS( 
+    tsan.supp 
 )
 
 IF (OS_WINDOWS)
     SRCS(
-        PC/WinMain.c
-        PC/dl_nt.c
-        PC/getpathp.c
-        PC/invalid_parameter_handler.c
-        PC/msvcrtmodule.c
-        PC/winreg.c
-        PC/winsound.c
+        PC/WinMain.c 
+        PC/dl_nt.c 
+        PC/getpathp.c 
+        PC/invalid_parameter_handler.c 
+        PC/msvcrtmodule.c 
+        PC/winreg.c 
+        PC/winsound.c 
         Python/dynload_win.c
     )
 ELSE()