Merge pull request #185 from pontem-network/positional-fields

Positional fields

src/main/kotlin/org/move/cli/MoveProject.kt

@@ -16,7 +16,7 @@ import com.intellij.psi.util.CachedValuesManager
 import com.intellij.psi.util.PsiModificationTracker
 import org.move.cli.manifest.AptosConfigYaml
 import org.move.cli.manifest.MoveToml
-import org.move.cli.tests.NamedAddressService
+import org.move.cli.tests.NamedAddressFromTestAnnotationService
 import org.move.lang.MoveFile
 import org.move.lang.core.psi.MvModule
 import org.move.lang.core.types.Address
@@ -87,23 +87,20 @@ data class MoveProject(
         return map
     }
 
-    fun getNamedAddressValue(name: String): String? = addressValues()[name]?.value
-
-    fun getNamedAddress(name: String): Address.Named? {
-        val value = getNamedAddressValue(name) ?: return null
-        return Address.Named(name, value, this)
-    }
-
     fun getNamedAddressTestAware(name: String): Address.Named? {
-        val namedAddress = getNamedAddress(name)
-        if (namedAddress != null) return namedAddress
+        val declaredNamedValue = getValueOfDeclaredNamedAddress(name)
+        if (declaredNamedValue != null) {
+            return Address.Named(name, declaredNamedValue)
+        }
         if (isUnitTestMode) {
-            val namedAddressService = project.service<NamedAddressService>()
+            val namedAddressService = project.service<NamedAddressFromTestAnnotationService>()
             return namedAddressService.getNamedAddress(this, name)
         }
         return null
     }
 
+    fun getValueOfDeclaredNamedAddress(name: String): String? = addressValues()[name]?.value
+
     fun getAddressNamesForValue(addressValue: String): List<String> {
         val addressLit = AddressLit(addressValue)
         val names = mutableListOf<String>()

src/main/kotlin/org/move/cli/runConfigurations/aptos/CommandConfigurationHandler.kt

@@ -28,7 +28,7 @@ abstract class CommandConfigurationHandler {
                 ?: return null
         val moveProject = function.moveProject ?: return null
 
-        val functionId = function.functionId(moveProject) ?: return null
+        val functionId = function.functionId() ?: return null
         val profileName = moveProject.profiles.firstOrNull()
         val workingDirectory = moveProject.contentRootPath
 
@@ -55,11 +55,10 @@ abstract class CommandConfigurationHandler {
     abstract fun getFunctionParameters(function: MvFunction): List<MvFunctionParameter>
 
     fun generateCommand(
-        moveProject: MoveProject,
         functionCall: FunctionCall,
         signerAccount: String?,
     ): RsResult<String, String> {
-        val functionId = functionCall.functionId(moveProject) ?: return RsResult.Err("FunctionId is null")
+        val functionId = functionCall.functionId() ?: return RsResult.Err("FunctionId is null")
 
         val typeParams = functionCall.typeParams
             .mapNotNull { it.value }.flatMap { listOf("--type-args", it) }

src/main/kotlin/org/move/cli/runConfigurations/aptos/FunctionCall.kt

@@ -1,7 +1,6 @@
 package org.move.cli.runConfigurations.aptos
 
 import com.intellij.psi.SmartPsiElementPointer
-import org.move.cli.MoveProject
 import org.move.lang.core.psi.MvFunction
 import org.move.lang.core.psi.parametersAsBindings
 import org.move.lang.core.psi.ext.*
@@ -31,7 +30,7 @@ data class FunctionCall(
     val valueParams: MutableMap<String, FunctionCallParam?>
 ) {
     fun itemName(): String? = item?.element?.qualName?.editorText()
-    fun functionId(moveProject: MoveProject): String? = item?.element?.functionId(moveProject)
+    fun functionId(): String? = item?.element?.functionId()
 
     fun parametersRequired(): Boolean {
         val fn = item?.element ?: return false

src/main/kotlin/org/move/cli/runConfigurations/aptos/FunctionCallConfigurationEditor.kt

@@ -84,7 +84,7 @@ class FunctionCallConfigurationEditor<T: FunctionCallConfigurationBase>(
 
 //                editor.functionCall = functionCall
                 editor.rawCommandField.text =
-                    commandHandler.generateCommand(mp, functionCall, accountTextField.text).unwrapOrNull() ?: ""
+                    commandHandler.generateCommand(functionCall, accountTextField.text).unwrapOrNull() ?: ""
             }
         })
 

src/main/kotlin/org/move/cli/runConfigurations/test/AptosTestLocator.kt

@@ -29,8 +29,7 @@ object AptosTestLocator : SMTestLocator {
             val name = qualifiedName.substringAfterLast(NAME_SEPARATOR)
             for (element in MvNamedElementIndex.getElementsByName(project, name, scope)) {
                 if (element is MvFunction) {
-                    val moveProject = element.moveProject ?: continue
-                    if (element.qualName?.cmdText(moveProject) == qualifiedName) {
+                    if (element.qualName?.cmdText() == qualifiedName) {
                         add(PsiLocation.fromPsiElement(element))
                     }
                 }

src/main/kotlin/org/move/cli/tests/NamedAddressService.kt → src/main/kotlin/org/move/cli/tests/NamedAddressFromTestAnnotationService.kt

@@ -1,23 +1,22 @@
 package org.move.cli.tests
 
 import org.move.cli.MoveProject
-import org.move.lang.core.types.Address
 import org.move.lang.core.types.Address.Named
 
-interface NamedAddressService {
-    fun getNamedAddress(moveProject: MoveProject, name: String): Address.Named?
+interface NamedAddressFromTestAnnotationService {
+    fun getNamedAddress(moveProject: MoveProject, name: String): Named?
 }
 
-class NamedAddressServiceImpl: NamedAddressService {
-    override fun getNamedAddress(moveProject: MoveProject, name: String): Address.Named? = null
+class NamedAddressServiceImpl: NamedAddressFromTestAnnotationService {
+    override fun getNamedAddress(moveProject: MoveProject, name: String): Named? = null
 }
 
 
-class NamedAddressServiceTestImpl: NamedAddressService {
+class NamedAddressServiceTestImpl: NamedAddressFromTestAnnotationService {
     val namedAddresses: MutableMap<String, String> = mutableMapOf()
 
     override fun getNamedAddress(moveProject: MoveProject, name: String): Named? {
         val value = namedAddresses[name] ?: return null
-        return Named(name, value, moveProject)
+        return Named(name, value)
     }
 }

src/main/kotlin/org/move/ide/MoveIcons.kt

@@ -23,6 +23,9 @@ object MoveIcons {
     val STRUCT_FIELD = AllIcons.Nodes.Field
     val SCHEMA = AllIcons.Nodes.Static
 
+    val FIELD = load("/icons/nodes/field.svg")
+    val ENUM_VARIANT = load("/icons/nodes/enumVariant.svg")
+
     val CONST = AllIcons.Nodes.Constant
     val FUNCTION = AllIcons.Nodes.Function
 

src/main/kotlin/org/move/ide/annotator/HighlightingAnnotator.kt

@@ -72,7 +72,7 @@ class HighlightingAnnotator: MvAnnotatorBase() {
             }
         if (element is MvStruct) return MvColor.STRUCT
         if (element is MvNamedFieldDecl) return MvColor.FIELD
-        if (element is MvStructDotField) return MvColor.FIELD
+        if (element is MvFieldLookup) return MvColor.FIELD
         if (element is MvMethodCall) return MvColor.METHOD_CALL
         if (element is MvPatFieldFull) return MvColor.FIELD
         if (element is MvPatField) return MvColor.FIELD

src/main/kotlin/org/move/ide/annotator/MvErrorAnnotator.kt

@@ -179,14 +179,14 @@ class MvErrorAnnotator: MvAnnotatorBase() {
 
     private fun checkModuleDef(moveHolder: MvAnnotationHolder, mod: MvModule) {
         val modName = mod.name ?: return
-        val moveProj = mod.moveProject ?: return
-        val addressIdent = mod.address(moveProj) ?: return
+        val moveProject = mod.moveProject ?: return
+        val addressIdent = mod.address(moveProject) ?: return
         val modIdent = Pair(addressIdent.text(), modName)
         val file = mod.containingMoveFile ?: return
         val duplicateIdents =
             file.modules()
                 .filter { it.name != null }
-                .groupBy { Pair(it.address(moveProj)?.text(), it.name) }
+                .groupBy { Pair(it.address(moveProject)?.text(), it.name) }
                 .filter { it.value.size > 1 }
                 .map { it.key }
                 .toSet()
@@ -310,7 +310,7 @@ class MvErrorAnnotator: MvAnnotatorBase() {
 
     private fun checkTypeArgumentList(
         typeArgumentList: MvTypeArgumentList,
-        item: MvTypeParametersOwner,
+        item: MvGenericDeclaration,
         holder: MvAnnotationHolder,
     ) {
         val qualName = (item as? MvQualNamedElement)?.qualName ?: return

src/main/kotlin/org/move/ide/annotator/MvSyntaxErrorAnnotator.kt

@@ -20,7 +20,7 @@ class MvSyntaxErrorAnnotator: MvAnnotatorBase() {
         val visitor = object: MvVisitor() {
             override fun visitLitExpr(expr: MvLitExpr) = checkLitExpr(moveHolder, expr)
             override fun visitCastExpr(expr: MvCastExpr) = checkCastExpr(moveHolder, expr)
-            override fun visitStruct(s: MvStruct) = checkStruct(moveHolder, s)
+//            override fun visitStruct(s: MvStruct) = checkStruct(moveHolder, s)
             override fun visitFunction(o: MvFunction) = checkFunction(moveHolder, o)
             override fun visitSpecFunction(o: MvSpecFunction) = checkSpecFunction(moveHolder, o)
             override fun visitIndexExpr(o: MvIndexExpr) = checkIndexExpr(moveHolder, o)
@@ -75,12 +75,12 @@ class MvSyntaxErrorAnnotator: MvAnnotatorBase() {
         }
     }
 
-    private fun checkStruct(holder: MvAnnotationHolder, struct: MvStruct) {
-        val native = struct.native ?: return
-        val errorRange = TextRange.create(native.startOffset, struct.structKw.endOffset)
-        Diagnostic.NativeStructNotSupported(struct, errorRange)
-            .addToHolder(holder)
-    }
+//    private fun checkStruct(holder: MvAnnotationHolder, struct: MvStruct) {
+//        val native = struct.native ?: return
+//        val errorRange = TextRange.create(native.startOffset, struct.structKw.endOffset)
+//        Diagnostic.NativeStructNotSupported(struct, errorRange)
+//            .addToHolder(holder)
+//    }
 
     private fun checkVisibilityModifiers(
         holder: MvAnnotationHolder,

src/main/kotlin/org/move/ide/docs/MvDocumentationProvider.kt

@@ -42,9 +42,9 @@ class MvDocumentationProvider : AbstractDocumentationProvider() {
                 // TODO: add docs for both [addresses] and [dev-addresses]
                 val moveProject = docElement.moveProject ?: return null
                 val refName = docElement.referenceName
-                val named = moveProject.getNamedAddress(refName) ?: return null
+                val named = moveProject.getNamedAddressTestAware(refName) ?: return null
                 val address =
-                    named.addressLit(moveProject)?.original ?: angleWrapped("unassigned")
+                    named.addressLit()?.original ?: angleWrapped("unassigned")
                 return "$refName = \"$address\""
             }
             is MvDocAndAttributeOwner -> generateOwnerDoc(docElement, buffer)
@@ -178,7 +178,7 @@ private fun PsiElement.generateDocumentation(
 
         is MvFunctionParameter -> {
             buffer += this.patBinding.identifier.text
-            this.typeAnnotation?.type?.generateDocumentation(buffer, ": ")
+            this.type?.generateDocumentation(buffer, ": ")
         }
 
         is MvTypeParameterList ->

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

@@ -30,7 +30,7 @@ fun createSpacingBuilder(commonSettings: CommonCodeStyleSettings): SpacingBuilde
         .after(COLON).spaceIf(true)
         .before(COLON).spaceIf(false)
 
-        .before(TYPE_ANNOTATION).spacing(0, 0, 0, true, 0)
+//        .before(TYPE_ANNOTATION).spacing(0, 0, 0, true, 0)
         .before(INITIALIZER).spacing(1, 1, 0, true, 0)
 
         .between(AND, MUT).spacing(0, 0, 0, false, 0)

src/main/kotlin/org/move/ide/hints/StructLiteralFieldsInfoHandler.kt

@@ -99,11 +99,10 @@ class FieldsDescription(val fields: Array<String>) {
             val structPath = block.litExpr.path
             val struct = structPath.maybeStruct ?: return null
             val msl = structPath.isMslScope
-//            val itemContext = struct.outerItemContext(msl)
             val fieldParams =
-                struct.fieldsMap.entries.map { (name, field) ->
+                struct.namedFields.map { field ->
+                    val name = field.name
                     val type = field.type?.loweredType(msl) ?: TyUnknown
-//                    val type = itemContext.getStructFieldItemTy(field).fullname()
                     "$name: $type"
                 }.toTypedArray()
             return FieldsDescription(fieldParams)

src/main/kotlin/org/move/ide/hints/TypeParameterInfoHandler.kt

@@ -21,7 +21,7 @@ class TypeParameterInfoHandler :
         val parentPath = element.parent as? MvPath ?: return null
         val owner = parentPath.reference?.resolveFollowingAliases() ?: return null
         // if zero type parameters
-        if (owner !is MvTypeParametersOwner) return null
+        if (owner !is MvGenericDeclaration) return null
 
         return arrayOf(typeParamsDescription(owner.typeParameters))
     }

src/main/kotlin/org/move/ide/hints/type/MvInlayTypeHintsProvider.kt

@@ -88,7 +88,7 @@ class MvInlayTypeHintsProvider : InlayHintsProvider<MvInlayTypeHintsProvider.Set
             private fun presentVariable(element: MvElement) {
                 when (element) {
                     is MvLetStmt -> {
-                        if (element.typeAnnotation != null) return
+                        if (element.type != null) return
                         val pat = element.pat ?: return
                         presentTypeForPat(pat, element.initializer?.expr)
                     }