Merge pull request #51 from slackhq/ssandler_function_reference_syntax

Ssandler function reference syntax

Author: ssandler

.github/workflows/build-and-test.yml

@@ -11,6 +11,7 @@ jobs:
         os: [ ubuntu ]
         hhvm:
           - '4.80'
+          - '4.102'
     runs-on: ${{matrix.os}}-latest
     steps:
       - uses: actions/checkout@v2

.hhconfig

@@ -1,8 +1,8 @@
 hackfmt.line_width=120
 ignored_paths = [ "vendor/.+/tests/.+", "vendor/.+/bin/.+" ]
 allowed_decl_fixme_codes=1002,2001,2050,2053,2071,3012,3015,4030,4032,4035,4047,4070,4101,4341
-allowed_fixme_codes_strict=1002,2001,2011,2025,2049,2050,2053,2071,2105,3012,3015,4005,4006,4009,4011,4026,4027,4030,4032,4035,4047,4051,4053,4057,4060,4062,4063,4064,4070,4101,4104,4106,4107,4108,4110,4112,4117,4119,4128,4135,4138,4163,4165,4188,4193,4224,4240,4249,4250,4281,4297,4298,4318,4321,4323,4324,4337,4341,4343,4370,4371,4372
-allowed_fixme_codes_partial=1002,2001,2011,2025,2049,2050,2053,2071,2105,3012,3015,4005,4006,4009,4011,4026,4027,4030,4032,4035,4047,4051,4053,4057,4060,4062,4063,4064,4070,4101,4104,4106,4107,4108,4110,4112,4117,4119,4128,4135,4138,4163,4165,4188,4193,4224,4240,4249,4250,4281,4297,4298,4318,4321,4323,4324,4337,4341,4343,4370,4371,4372
+allowed_fixme_codes_strict=1002,2001,2011,2025,2049,2050,2053,2071,2105,3012,3015,4005,4006,4009,4011,4026,4027,4030,4032,4035,4047,4051,4053,4057,4060,4062,4063,4064,4070,4101,4104,4106,4107,4108,4110,4112,4117,4119,4128,4135,4138,4163,4165,4188,4193,4224,4240,4249,4250,4281,4297,4298,4318,4321,4323,4324,4337,4341,4343,4370,4371,4372,4390
+allowed_fixme_codes_partial=1002,2001,2011,2025,2049,2050,2053,2071,2105,3012,3015,4005,4006,4009,4011,4026,4027,4030,4032,4035,4047,4051,4053,4057,4060,4062,4063,4064,4070,4101,4104,4106,4107,4108,4110,4112,4117,4119,4128,4135,4138,4163,4165,4188,4193,4224,4240,4249,4250,4281,4297,4298,4318,4321,4323,4324,4337,4341,4343,4370,4371,4372,4390
 enable_xhp_class_modifier=true
 disable_xhp_element_mangling=true
 

hhast-lint.json

@@ -3,6 +3,8 @@
   "builtinLinters": "all",
   "extraLinters": ["Facebook\\HHAST\\Linters\\PreferLambdasLinter"],
   "disabledLinters": [
+    "Facebook\\HHAST\\Linters\\DontHaveTwoEmptyLinesInARowLinter",
+    "Facebook\\HHAST\\Linters\\NoNewlineAtStartOfControlFlowBlockLinter",
     "Facebook\\HHAST\\Linters\\LicenseHeaderLinter",
     "Facebook\\HHAST\\Linters\\NoStringInterpolationLinter",
     "Facebook\\HHAST\\Linters\\NoPHPEqualityLinter",

src/Codegen/Constraints/StringBuilder.php

@@ -94,7 +94,7 @@ protected function getCheckMethod(): CodegenMethod {
       }
 
       $hb
-        ->addAssignment('$sanitize_string', "fun('\\$sanitization_func')", HackBuilderValues::literal())
+        ->addAssignment('$sanitize_string', "\\$sanitization_func<>", HackBuilderValues::literal())
         ->addAssignment('$typed', '$sanitize_string($typed)', HackBuilderValues::literal())
         ->ensureEmptyLine();
     }

src/Codegen/JsonSchemaCodegenConfig.php

@@ -12,14 +12,14 @@ public function getTypeNameSuffix(): string {
   }
 
   public function getClassNameFormatFunction(): (function(string...): string) {
-    return fun('\Slack\Hack\JsonSchema\Codegen\format');
+    return format<>;
   }
 
   public function getTypeNameFormatFunction(): (function(string...): string) {
-    return fun('\Slack\Hack\JsonSchema\Codegen\format');
+    return format<>;
   }
 
   public function getFileNameFormatFunction(): (function(string...): string) {
-    return fun('\Slack\Hack\JsonSchema\Codegen\format');
+    return format<>;
   }
 }

src/Codegen/Utils.php

@@ -27,7 +27,7 @@ function sanitize(string $input): string {
 }
 
 function format(string ...$parts): string {
-  return Vec\map($parts, fun('\Slack\Hack\JsonSchema\Codegen\sanitize'))
+  return Vec\map($parts, sanitize<>)
     |> Str\join($$, '');
 }
 

tests/CodegenForPathsTest.php

@@ -24,8 +24,8 @@ public function testGenerateWithPaths(): void {
           ),
         ),
         'sanitize_string' => shape(
-          'uniline' => fun('\Slack\Hack\JsonSchema\Tests\_string_schema_validator_test_uniline'),
-          'multiline' => fun('\Slack\Hack\JsonSchema\Tests\_string_schema_validator_test_multiline'),
+          'uniline' => _string_schema_validator_test_uniline<>,
+          'multiline' => _string_schema_validator_test_multiline<>,
         ),
       ),
       'generatedFrom' => '`make test`',

tests/CustomCodegenConfigTest.php

@@ -14,8 +14,8 @@ public function testCustomConfig(): void {
       'CustomCodegenConfigValidator',
       shape(
         'sanitize_string' => shape(
-          'uniline' => fun('\Slack\Hack\JsonSchema\Codegen\format'),
-          'multiline' => fun('\Slack\Hack\JsonSchema\Codegen\format'),
+          'uniline' => \Slack\Hack\JsonSchema\Codegen\format<>,
+          'multiline' => \Slack\Hack\JsonSchema\Codegen\format<>,
         ),
         'json_schema_codegen_config' => $config,
       ),
@@ -38,7 +38,7 @@ public function getTypeNameSuffix(): string {
   }
 
   public function getClassNameFormatFunction(): (function(string...): string) {
-    return fun('\Slack\Hack\JsonSchema\Codegen\format');
+    return \Slack\Hack\JsonSchema\Codegen\format<>;
   }
 
   public function getTypeNameFormatFunction(): (function(string...): string) {
@@ -49,15 +49,15 @@ public function getTypeNameFormatFunction(): (function(string...): string) {
   }
 
   public function getFileNameFormatFunction(): (function(string...): string) {
-    return fun('\Slack\Hack\JsonSchema\Codegen\format');
+    return \Slack\Hack\JsonSchema\Codegen\format<>;
   }
 
   public function sanitize(string $input): string {
     return $input
       |> Str\replace_every($$, dict['_' => ' ', '-' => ' ', '.' => ' '])
       |> \preg_split('/(?=[A-Z])/', $$)
       |> \array_filter($$)
-      |> Vec\map($$, fun('\HH\Lib\Str\lowercase'))
+      |> Vec\map($$, Str\lowercase<>)
       |> Str\join($$, ' ')
       |> \preg_replace('/[^A-Za-z0-9 ]/', ' nan ', $$)
       |> Str\replace($$, ' ', '_');

tests/StringSchemaValidatorTest.php

@@ -26,8 +26,8 @@ final class StringSchemaValidatorTest extends BaseCodegenTestCase {
       'StringSchemaValidator',
       shape(
         'sanitize_string' => shape(
-          'uniline' => fun('\Slack\Hack\JsonSchema\Tests\_string_schema_validator_test_uniline'),
-          'multiline' => fun('\Slack\Hack\JsonSchema\Tests\_string_schema_validator_test_multiline'),
+          'uniline' => _string_schema_validator_test_uniline<>,
+          'multiline' => _string_schema_validator_test_multiline<>,
         ),
       ),
     );

tests/UntypedSchemaValidatorTest.php

@@ -28,8 +28,8 @@ final class UntypedSchemaValidatorTest extends BaseCodegenTestCase {
       'UntypedSchemaValidator',
       shape(
         'sanitize_string' => shape(
-          'uniline' => fun('\Slack\Hack\JsonSchema\Tests\_untyped_schema_validator_test_uniline'),
-          'multiline' => fun('\Slack\Hack\JsonSchema\Tests\_untyped_schema_validator_test_multiline'),
+          'uniline' => _untyped_schema_validator_test_uniline<>,
+          'multiline' => _untyped_schema_validator_test_multiline<>,
         ),
       ),
     );