Merge pull request #163 from pontem-network/formatting-fixes

fix formatting for item spec parameter lists

build.gradle.kts

@@ -40,7 +40,7 @@ fun gitTimestamp(): String {
 }
 
 val shortPlatformVersion = prop("shortPlatformVersion")
-val codeVersion = "1.36.0"
+val codeVersion = "1.36.1"
 
 var pluginVersion = "$codeVersion.$shortPlatformVersion"
 if (publishingChannel != "default") {

src/main/kotlin/org/move/ide/formatter/impl/utils.kt

@@ -21,9 +21,10 @@ val ONE_LINE_ITEMS = ts(USE_STMT, CONST)
 
 val PAREN_DELIMITED_BLOCKS = ts(
     PARENS_EXPR, TUPLE_PAT, TUPLE_TYPE, TUPLE_LIT_EXPR, CONDITION,
-    FUNCTION_PARAMETER_LIST, VALUE_ARGUMENT_LIST, ATTR_ITEM_LIST
+    FUNCTION_PARAMETER_LIST, VALUE_ARGUMENT_LIST, ATTR_ITEM_LIST,
+    ITEM_SPEC_FUNCTION_PARAMETER_LIST
 )
-val ANGLE_DELIMITED_BLOCKS = ts(TYPE_PARAMETER_LIST, TYPE_ARGUMENT_LIST)
+val ANGLE_DELIMITED_BLOCKS = ts(TYPE_PARAMETER_LIST, TYPE_ARGUMENT_LIST, ITEM_SPEC_TYPE_PARAMETER_LIST)
 val BRACKET_DELIMITED_BLOCKS = ts(VECTOR_LIT_ITEMS)
 
 val STRUCT_LITERAL_BLOCKS = ts(STRUCT_PAT_FIELDS_BLOCK, STRUCT_LIT_FIELDS_BLOCK)

src/test/kotlin/org/move/ide/formatter/FormatterTest.kt

@@ -8,6 +8,7 @@ class FormatterTest : MvFormatterTestBase() {
     fun `test address block`() = doTest()
     fun `test operators`() = doTest()
     fun `test functions`() = doTest()
+    fun `test function parameters`() = doTest()
     fun `test specs`() = doTest()
     fun `test structs`() = doTest()
     fun `test inner block`() = doTest()

src/test/resources/org/move/ide/formatter.fixtures/function_parameters.move

@@ -0,0 +1,27 @@
+module 0x1::function_parameters {
+    fun prologue(
+    a: u8,
+    b: u8,
+    c: u8,
+    ): u8 {}
+
+    spec prologue(
+    a: u8,
+    b: u8,
+    c: u8,
+    ): u8 {}
+
+    spec fun prologue(
+    a: u8,
+    b: u8,
+    c: u8,
+    ): u8 {}
+
+    spec module {
+        fun prologue(
+        a: u8,
+        b: u8,
+        c: u8,
+        ): u8 {}
+    }
+}

src/test/resources/org/move/ide/formatter.fixtures/function_parameters_after.move

@@ -0,0 +1,27 @@
+module 0x1::function_parameters {
+    fun prologue(
+        a: u8,
+        b: u8,
+        c: u8,
+    ): u8 {}
+
+    spec prologue(
+        a: u8,
+        b: u8,
+        c: u8,
+    ): u8 {}
+
+    spec fun prologue(
+        a: u8,
+        b: u8,
+        c: u8,
+    ): u8 {}
+
+    spec module {
+        fun prologue(
+            a: u8,
+            b: u8,
+            c: u8,
+        ): u8 {}
+    }
+}