Merge pull request #164 from pontem-network/indent-fixes

fix indentation in spec statements

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

@@ -5,6 +5,7 @@ import com.intellij.lang.ASTNode
 import org.move.ide.formatter.MoveFmtBlock
 import org.move.lang.MvElementTypes.*
 import org.move.lang.core.psi.MvExpr
+import org.move.lang.core.psi.MvPragmaSpecStmt
 
 fun MoveFmtBlock.computeChildIndent(childNode: ASTNode): Indent? {
     val parentNode = node
@@ -52,6 +53,9 @@ fun MoveFmtBlock.computeChildIndent(childNode: ASTNode): Indent? {
         //     .myotherfield
         parentPsi is MvExpr -> Indent.getContinuationWithoutFirstIndent()
 
+        // same thing as previous one, but for spec statements
+        parentPsi.isSpecStmt -> Indent.getContinuationWithoutFirstIndent()
+
         else -> Indent.getNoneIndent()
     }
 }

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

@@ -43,6 +43,14 @@ val DELIMITED_BLOCKS = orSet(
 
 fun ASTNode?.isWhitespaceOrEmpty() = this == null || textLength == 0 || elementType == TokenType.WHITE_SPACE
 
+val PsiElement.isSpecStmt: Boolean
+    get() = this is MvSchemaFieldStmt
+            || this is MvGlobalVariableStmt
+            || this is MvPragmaSpecStmt
+            || this is MvUpdateSpecStmt
+            || this is MvIncludeStmt
+            || this is MvApplySchemaStmt
+
 val PsiElement.isTopLevelItem: Boolean
     get() = (this is MvModule || this is MvAddressDef || this is MvScript || this is MvModuleSpec)
             && parent is MoveFile

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

@@ -2,6 +2,11 @@ module M {
     spec initialize {
 assert true;
 
+        pragma hello = world,
+        hello2 = world2;
+        include
+        MySchema;
+
     /// After genesis, time progresses monotonically.
     invariant update
     old(is_operating()) ==> old(spec_now_microseconds()) <= spec_now_microseconds();

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

@@ -2,6 +2,11 @@ module M {
     spec initialize {
         assert true;
 
+        pragma hello = world,
+            hello2 = world2;
+        include
+            MySchema;
+
         /// After genesis, time progresses monotonically.
         invariant update
             old(is_operating()) ==> old(spec_now_microseconds()) <= spec_now_microseconds();