Sync fixtures, update test suppressions for unsupported syntax

Summary:
- Sync Haskell fixtures from fbthrift
- Emit `;` terminator after empty package statement - the package grammer requires a quoted string or `;` literal, if empty, to follow the `package` keyword
- Mark additional tests as failing, due to usage of Thrift features/syntax unsupported by the Haskell compiler parsing and/or pretty-printing
  - Include aliasing (`include "..." as foo`)
  - Bi-directional streaming
  - `performs Interaction;` syntax - Haskell parser does not store adequate location information to pretty print

Reviewed By: vitaut

Differential Revision: D92426921

fbshipit-source-id: 23b48474ee7166ba8cdf7b54b02a750a99a4c0fe

Author: hchokshi

exactprint/Thrift/ExactPrint/PrettyPrint.hs

@@ -71,7 +71,7 @@ ppHeader HPackage {..} = mconcat
   [ ppSAnns pkgSAnns
   , addHeader pkgKeywordLoc, "package"
   , foldMap addHeader pkgUriLoc
-  , maybe mempty (\uri -> ppStr uri (fromMaybe DoubleQuote pkgQuoteType)) pkgUri
+  , maybe ";" (\uri -> ppStr uri (fromMaybe DoubleQuote pkgQuoteType)) pkgUri
   ]
 
 -- Decls -----------------------------------------------------------------------

exactprint/tests/RoundTripTest.hs

@@ -29,10 +29,12 @@ headerSize = 4
 -- error message
 failingTests :: [FilePath]
 failingTests =
-  [ "common/hs/thrift/exactprint/tests/fbthrift-tests/basic/src/module.thrift"
+  [ "common/hs/thrift/exactprint/tests/fbthrift-tests/aliasing/src/module.thrift"
+  , "common/hs/thrift/exactprint/tests/fbthrift-tests/basic/src/module.thrift"
   , "common/hs/thrift/exactprint/tests/fbthrift-tests/basic-annotations/src/module.thrift"
-  , "common/hs/thrift/exactprint/tests/fbthrift-tests/basic-enum/src/module.thrift"
+  , "common/hs/thrift/exactprint/tests/fbthrift-tests/bidi/src/module.thrift"
   , "common/hs/thrift/exactprint/tests/fbthrift-tests/constants/src/module.thrift"
+  , "common/hs/thrift/exactprint/tests/fbthrift-tests/cpp2-struct-footprint/src/module.thrift"
   , "common/hs/thrift/exactprint/tests/fbthrift-tests/exceptions/src/module.thrift"
   , "common/hs/thrift/exactprint/tests/fbthrift-tests/fatal/src/module.thrift"
   , "common/hs/thrift/exactprint/tests/fbthrift-tests/from_map_construct/src/module.thrift"
@@ -42,7 +44,7 @@ failingTests =
   , "common/hs/thrift/exactprint/tests/fbthrift-tests/interactions/src/shared.thrift"
   , "common/hs/thrift/exactprint/tests/fbthrift-tests/json_experimental/src/ThriftdocTest.thrift"
   , "common/hs/thrift/exactprint/tests/fbthrift-tests/map_construct/src/module.thrift"
-  , "common/hs/thrift/exactprint/tests/fbthrift-tests/mcpp2-compare/src/module.thrift"
+  , "common/hs/thrift/exactprint/tests/fbthrift-tests/method_decorators/src/module.thrift"
   , "common/hs/thrift/exactprint/tests/fbthrift-tests/patch/src/module.thrift"
   , "common/hs/thrift/exactprint/tests/fbthrift-tests/php-migration/src/module.thrift"
   , "common/hs/thrift/exactprint/tests/fbthrift-tests/python_capi/src/serialized_dep.thrift"

exactprint/tests/fbthrift-tests/adapter/src/a.thrift

@@ -19,6 +19,10 @@
  */
 
 include "b.thrift"
+include "thrift/annotation/thrift.thrift"
+
+@thrift.AllowLegacyMissingUris
+package;
 
 struct MyStruct {
   1: b.B a;

exactprint/tests/fbthrift-tests/adapter/src/b.thrift

@@ -21,6 +21,10 @@
 include "thrift/annotation/python.thrift"
 
 include "c.thrift"
+include "thrift/annotation/thrift.thrift"
+
+@thrift.AllowLegacyMissingUris
+package;
 
 typedef c.C1 C1
 

exactprint/tests/fbthrift-tests/adapter/src/c.thrift

@@ -19,6 +19,10 @@
  */
 
 include "thrift/annotation/python.thrift"
+include "thrift/annotation/thrift.thrift"
+
+@thrift.AllowLegacyMissingUris
+package;
 
 @python.Adapter{
   name = "three.AdapterThree",

exactprint/tests/fbthrift-tests/adapter/src/module.thrift

@@ -27,27 +27,40 @@ include "thrift/annotation/python.thrift"
 include "thrift/annotation/thrift.thrift"
 include "thrift/annotation/scope.thrift"
 include "thrift/annotation/hack.thrift"
+include "thrift/annotation/java.thrift"
 include "thrift/annotation/rust.thrift"
 
 @thrift.Experimental
-package "facebook.com/thrift/test"
+package "facebook.com/thrift/test/fixtures/adapter"
 
 @thrift.AllowLegacyTypedefUri
 @hack.Adapter{name = '\\Adapter2'}
 @cpp.Adapter{name = '::my::Adapter2'}
 @rust.Adapter{name = "::my::Adapter2"}
+@java.Adapter{
+  adapterClassName = "com.facebook.thrift.my.Adapter2",
+  typeClassName = "com.facebook.thrift.my.AdaptedSet_2",
+}
 typedef set<string> (py.adapter = 'my.Adapter2') SetWithAdapter
 @thrift.AllowLegacyTypedefUri
 @hack.Adapter{name = '\\Adapter1'}
 @cpp.Adapter{name = '::my::Adapter1'}
 @rust.Adapter{name = "::my::Adapter1"}
+@java.Adapter{
+  adapterClassName = "com.facebook.thrift.my.Adapter1",
+  typeClassName = "com.facebook.thrift.my.AdaptedString_1",
+}
 typedef string (py.adapter = 'my.Adapter1') StringWithAdapter
 @thrift.AllowLegacyTypedefUri
 typedef list<StringWithAdapter> ListWithElemAdapter
 @thrift.AllowLegacyTypedefUri
 @hack.Adapter{name = '\\Adapter2'}
 @cpp.Adapter{name = '::my::Adapter2'}
 @rust.Adapter{name = "::my::Adapter2"}
+@java.Adapter{
+  adapterClassName = "com.facebook.thrift.my.Adapter2",
+  typeClassName = "com.facebook.thrift.my.AdaptedList_2",
+}
 typedef ListWithElemAdapter ListWithElemAdapter_withAdapter
 
 enum Color {
@@ -70,6 +83,10 @@ struct MyAnnotation {
 @thrift.AllowLegacyTypedefUri
 @cpp.Adapter{name = "::my::Adapter1"}
 @rust.Adapter{name = "::my::Adapter1"}
+@java.Adapter{
+  adapterClassName = "com.facebook.thrift.my.Adapter1",
+  typeClassName = "com.facebook.thrift.my.AdaptedI64_1",
+}
 @MyAnnotation{signature = "MyI64", color = Color.GREEN}
 typedef i64 MyI64
 
@@ -80,40 +97,72 @@ typedef MyI64 DoubleTypedefI64
 @hack.Adapter{name = '\\Adapter1'}
 @cpp.Adapter{name = '::my::Adapter1'}
 @rust.Adapter{name = "::my::Adapter1"}
+@java.Adapter{
+  adapterClassName = "com.facebook.thrift.my.Adapter1",
+  typeClassName = "com.facebook.thrift.my.AdaptedI32_1",
+}
 typedef i32 MyI32
 
 @cpp.EnableCustomTypeOrdering
 struct Foo {
   @hack.Adapter{name = '\\Adapter1'}
   @cpp.Adapter{name = '::my::Adapter1'}
   @rust.Adapter{name = "::my::Adapter1"}
+  @java.Adapter{
+    adapterClassName = "com.facebook.thrift.my.Adapter1",
+    typeClassName = "com.facebook.thrift.my.AdaptedI32_5137_1",
+  }
   1: i32_5137 intField;
   @hack.Adapter{name = '\\Adapter1'}
   @cpp.Adapter{name = '::my::Adapter1'}
   @rust.Adapter{name = "::my::Adapter1"}
+  @java.Adapter{
+    adapterClassName = "com.facebook.thrift.my.Adapter1",
+    typeClassName = "com.facebook.thrift.my.AdaptedI32_5137_1",
+  }
   2: optional i32_5137 optionalIntField;
   @hack.Adapter{name = '\\Adapter1'}
   @cpp.Adapter{name = '::my::Adapter1'}
   @rust.Adapter{name = "::my::Adapter1"}
+  @java.Adapter{
+    adapterClassName = "com.facebook.thrift.my.Adapter1",
+    typeClassName = "com.facebook.thrift.my.AdaptedI32_5137_1",
+  }
   3: i32_5137 intFieldWithDefault = 13;
   4: SetWithAdapter setField;
   5: optional SetWithAdapter optionalSetField;
   @hack.Adapter{name = '\\Adapter3'}
   @cpp.Adapter{name = '::my::Adapter3'}
   @rust.Adapter{name = "::my::Adapter3"}
+  @java.Adapter{
+    adapterClassName = "com.facebook.thrift.my.Adapter3",
+    typeClassName = "com.facebook.thrift.my.AdaptedMap_string_ListWithElemAdapter_withAdapter_8454_3",
+  }
   6: map_string_ListWithElemAdapter_withAdapter_8454 mapField;
   @hack.Adapter{name = '\\Adapter3'}
   @cpp.Adapter{name = '::my::Adapter3'}
   @rust.Adapter{name = "::my::Adapter3"}
+  @java.Adapter{
+    adapterClassName = "com.facebook.thrift.my.Adapter3",
+    typeClassName = "com.facebook.thrift.my.AdaptedMap_string_ListWithElemAdapter_withAdapter_8454_3",
+  }
   7: optional map_string_ListWithElemAdapter_withAdapter_8454 optionalMapField;
   @hack.Adapter{name = '\\Adapter1'}
   @cpp.Adapter{name = '::my::Adapter3'}
   @rust.Adapter{name = "::my::Adapter3"}
+  @java.Adapter{
+    adapterClassName = "com.facebook.thrift.my.Adapter3",
+    typeClassName = "com.facebook.thrift.my.AdaptedBinary_5673_3",
+  }
   8: binary_5673 binaryField;
   9: MyI64 longField;
   @cpp.Adapter{name = "::my::Adapter2"}
   @python.Adapter{name = "my.Adapter3", typeHint = "my.AdaptedType3[]"}
   @rust.Adapter{name = "::my::Adapter2"}
+  @java.Adapter{
+    adapterClassName = "com.facebook.thrift.my.Adapter2",
+    typeClassName = "com.facebook.thrift.my.AdaptedMyI64_2",
+  }
   10: MyI64 adaptedLongField;
   11: DoubleTypedefI64 doubleAdaptedField;
   @python.Adapter{name = "my.ListAdapter", typeHint = "typing.Sequence[int]"}
@@ -136,15 +185,27 @@ union Baz {
   @hack.Adapter{name = '\\Adapter1'}
   @cpp.Adapter{name = '::my::Adapter1'}
   @rust.Adapter{name = "::my::Adapter1"}
+  @java.Adapter{
+    adapterClassName = "com.facebook.thrift.my.Adapter1",
+    typeClassName = "com.facebook.thrift.my.AdaptedI32_5137_1",
+  }
   1: i32_5137 intField;
   4: SetWithAdapter setField;
   @hack.Adapter{name = '\\Adapter3'}
   @cpp.Adapter{name = '::my::Adapter3'}
   @rust.Adapter{name = "::my::Adapter3"}
+  @java.Adapter{
+    adapterClassName = "com.facebook.thrift.my.Adapter3",
+    typeClassName = "com.facebook.thrift.my.AdaptedMap_string_ListWithElemAdapter_withAdapter_8454_3",
+  }
   6: map_string_ListWithElemAdapter_withAdapter_8454 mapField;
   @hack.Adapter{name = '\\Adapter1'}
   @cpp.Adapter{name = '::my::Adapter1'}
   @rust.Adapter{name = "::my::Adapter1"}
+  @java.Adapter{
+    adapterClassName = "com.facebook.thrift.my.Adapter1",
+    typeClassName = "com.facebook.thrift.my.AdaptedBinary_5673_1",
+  }
   8: binary_5673 binaryField;
   9: MyI64 longField;
 }
@@ -153,8 +214,14 @@ union Baz {
 @hack.Adapter{name = '\\Adapter1'}
 @cpp.Adapter{name = '::my::Adapter1'}
 @rust.Adapter{name = "::my::Adapter1"}
+@java.Adapter{
+  adapterClassName = "com.facebook.thrift.my.Adapter1",
+  typeClassName = "com.facebook.thrift.my.AdaptedFoo_1",
+}
 typedef Foo FooWithAdapter
 
+typedef list<Foo> ListOfFooTypedef
+
 struct Bar {
   @hack.Adapter{name = '\\Adapter1'}
   @cpp.Adapter{name = '::my::Adapter1', adaptedType = '::my::Cpp::Type1'}
@@ -171,6 +238,7 @@ struct Bar {
   @cpp.Adapter{name = '::my::Adapter1'}
   6: optional Baz_7352 optionalUnionField;
   7: DirectlyAdapted adaptedStructField;
+  8: ListOfFooTypedef structListFieldWithTypedef;
 }
 
 @cpp.Adapter{name = "::my::Adapter"}
@@ -191,6 +259,10 @@ struct StructWithFieldAdapter {
   @cpp.Adapter{name = "::my::Adapter1"}
   @python.Adapter{name = "my.Adapter1", typeHint = "my.AdaptedType1"}
   @rust.Adapter{name = "::my::Adapter1<>"}
+  @java.Adapter{
+    adapterClassName = "com.facebook.thrift.my.Adapter1",
+    typeClassName = "com.facebook.thrift.my.AdaptedI32_1",
+  }
   1: i32 field;
   @cpp.Adapter{name = "::my::Adapter1"}
   @cpp.Ref{type = cpp.RefType.Shared}
@@ -199,6 +271,10 @@ struct StructWithFieldAdapter {
   @cpp.Adapter{name = "::my::Adapter1"}
   @cpp.Ref{type = cpp.RefType.Shared}
   @rust.Adapter{name = "::my::Adapter1<>"}
+  @java.Adapter{
+    adapterClassName = "com.facebook.thrift.my.Adapter1",
+    typeClassName = "com.facebook.thrift.my.AdaptedI32_1",
+  }
   3: optional i32 opt_shared_field;
   @cpp.Adapter{name = "::my::Adapter1"}
   @thrift.Box
@@ -235,11 +311,14 @@ struct B {
 typedef A AdaptedA
 struct A {}
 
+@thrift.AllowLegacyTypedefUri
+@cpp.Adapter{name = "::my::Adapter2"}
+typedef string StringWithCppAdapter
+
 service Service {
   MyI32_4873 func(
     1: StringWithAdapter_7208 arg1,
-    @cpp.Adapter{name = "::my::Adapter2"}
-    2: string arg2,
+    2: StringWithCppAdapter arg2,
     3: Foo arg3,
   );
 }

exactprint/tests/fbthrift-tests/adapter/src/module_no_uri.thrift

@@ -19,6 +19,10 @@
  */
 
 include "thrift/annotation/cpp.thrift"
+include "thrift/annotation/thrift.thrift"
+
+@thrift.AllowLegacyMissingUris
+package;
 
 union RefUnion {
   @cpp.Adapter{name = '::my::Adapter1'}

exactprint/tests/fbthrift-tests/adapter/src/with_containers.thrift

@@ -20,6 +20,10 @@
 
 include "thrift/annotation/python.thrift"
 include "thrift/annotation/scope.thrift"
+include "thrift/annotation/thrift.thrift"
+
+@thrift.AllowLegacyMissingUris
+package;
 
 @python.Adapter{name = "my.Adapter", typeHint = "my.AdaptedType[]"}
 @scope.Transitive

exactprint/tests/fbthrift-tests/aliasing/src/module.thrift

@@ -0,0 +1,29 @@
+// THIS FILE IS COPIED FROM FBTHRIFT, DO NOT MODIFY ITS CONTENTS DIRECTLY
+// generated-by : fbcode/common/hs/thrift/exactprint/tests/sync-fbthrift-tests.sh
+// source: xplat/thrift/compiler/test/fixtures/*
+// @generated
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package "facebook.com/thrift/compiler/test/fixtures/aliasing"
+
+include "other/module.thrift" as other_module
+include "not_module.thrift" as module
+
+struct Foo {
+  1: other_module.Foo other_foo;
+  2: module.Foo yet_another_foo;
+}

exactprint/tests/fbthrift-tests/aliasing/src/not_module.thrift

@@ -0,0 +1,28 @@
+// THIS FILE IS COPIED FROM FBTHRIFT, DO NOT MODIFY ITS CONTENTS DIRECTLY
+// generated-by : fbcode/common/hs/thrift/exactprint/tests/sync-fbthrift-tests.sh
+// source: xplat/thrift/compiler/test/fixtures/*
+// @generated
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+include "thrift/annotation/thrift.thrift"
+
+@thrift.AllowLegacyMissingUris
+package;
+
+struct Foo {
+  1: i64 baz;
+}