commit 3b414a8de5643fdf7ff0e1aa6d162830f081c4e4
author Neel Mehta <mneel@google.com> Tue Jul 02 15:47:48 2019 -0700
committer Neel Mehta <mneel@google.com> Fri Jul 19 10:59:40 2019 -0700
tree 0df703db3d8845e6b76d13ebabd271e4be953c37
parent 8d5421845fe329fe38fca17f7d1eee736a6e600b

Add -Lformat option to format .hal files

Formats .hal files.

Bug: 137553653
Test: hidl-gen -Lformat <IFACE>
Test: aosp/1051701
Test: hidl-gen -Lformat (google-interfaces) & hidl-gen -Lcheck
(google-interfaces)
Change-Id: I5aa554d99fd4977acb7939d8c793081680a3f598

Method.cpp

diff --git a/Method.cpp b/Method.cpp
index 7954462..42b4d5c 100644
--- a/Method.cpp
+++ b/Method.cpp
@@ -18,12 +18,15 @@
 
 #include "Annotation.h"
 #include "ConstantExpression.h"
+#include "FormattingConstants.h"
 #include "ScalarType.h"
 #include "Type.h"
 
 #include <android-base/logging.h>
+#include <hidl-util/FQName.h>
 #include <hidl-util/Formatter.h>
 #include <algorithm>
+#include <vector>
 
 namespace android {
 
@@ -263,6 +266,53 @@
     out << ")";
 }
 
+static void fillHidlArgResultTokens(const std::vector<NamedReference<Type>*>& args,
+                                    WrappedOutput* wrappedOutput) {
+    for (auto iter = args.begin(); iter != args.end(); ++iter) {
+        auto arg = *iter;
+        std::string out = arg->localName() + " " + arg->name();
+        if (iter != args.begin()) {
+            *wrappedOutput << ",";
+            wrappedOutput->group([&] {
+                wrappedOutput->printUnlessWrapped(" ");
+                *wrappedOutput << out;
+            });
+        } else {
+            wrappedOutput->group([&] { *wrappedOutput << out; });
+        }
+    }
+}
+
+void Method::emitHidlDefinition(Formatter& out) const {
+    if (getDocComment() != nullptr) getDocComment()->emit(out);
+
+    out.join(mAnnotations->begin(), mAnnotations->end(), "\n",
+             [&](auto annotation) { annotation->dump(out); });
+    if (!mAnnotations->empty()) out << "\n";
+
+    WrappedOutput wrappedOutput(MAX_LINE_LENGTH);
+
+    if (isOneway()) wrappedOutput << "oneway ";
+    wrappedOutput << name() << "(";
+
+    wrappedOutput.group([&] { fillHidlArgResultTokens(args(), &wrappedOutput); });
+
+    wrappedOutput << ")";
+
+    if (!results().empty()) {
+        wrappedOutput.group([&] {
+            wrappedOutput.printUnlessWrapped(" ");
+            wrappedOutput << "generates (";
+            fillHidlArgResultTokens(results(), &wrappedOutput);
+            wrappedOutput << ")";
+        });
+    }
+
+    wrappedOutput << ";\n";
+
+    out << wrappedOutput;
+}
+
 bool Method::deepIsJavaCompatible(std::unordered_set<const Type*>* visited) const {
     if (!std::all_of(mArgs->begin(), mArgs->end(),
                      [&](const auto* arg) { return (*arg)->isJavaCompatible(visited); })) {