Merge pull request #273 from pontem-network/move-2-compatibilities

Compatibility with Move 2
pontem-network · Jan 17, 2025 · 3d27474 · 3d27474
2 parents 84fd6f2 + 36d173c
commit 3d27474
Show file tree

Hide file tree

Showing 41 changed files with 233 additions and 219 deletions.
diff --git a/src/main/kotlin/org/move/cli/settings/MvProjectSettingsService.kt b/src/main/kotlin/org/move/cli/settings/MvProjectSettingsService.kt
@@ -61,7 +61,7 @@ class MvProjectSettingsService(
         var dumpStateOnTestFailure: Boolean by property(false)
 
         @AffectsHighlighting
-        var enableMove2: Boolean by property(false)
+        var enableMove2: Boolean by property(true)
 
         override fun copy(): MoveProjectSettings {
             val state = MoveProjectSettings()

diff --git a/src/main/kotlin/org/move/ide/annotator/MvSyntaxErrorAnnotator.kt b/src/main/kotlin/org/move/ide/annotator/MvSyntaxErrorAnnotator.kt
@@ -20,7 +20,6 @@ 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 visitFunction(o: MvFunction) = checkFunction(moveHolder, o)
             override fun visitSpecFunction(o: MvSpecFunction) = checkSpecFunction(moveHolder, o)
             override fun visitIndexExpr(o: MvIndexExpr) = checkIndexExpr(moveHolder, o)
@@ -74,15 +73,6 @@ class MvSyntaxErrorAnnotator: MvAnnotatorBase() {
         }
     }
 
-    private fun checkCastExpr(holder: MvAnnotationHolder, castExpr: MvCastExpr) {
-        val parent = castExpr.parent
-        if (parent !is MvParensExpr) {
-            Diagnostic
-                .ParensAreRequiredForCastExpr(castExpr)
-                .addToHolder(holder)
-        }
-    }
-
     private fun checkIndexExpr(holder: MvAnnotationHolder, indexExpr: MvIndexExpr) {
         // always supported in specs
         if (indexExpr.isMsl()) return

diff --git a/src/main/kotlin/org/move/ide/annotator/externalLinter/RsExternalLinterUtils.kt b/src/main/kotlin/org/move/ide/annotator/externalLinter/RsExternalLinterUtils.kt
@@ -48,7 +48,7 @@ import java.util.concurrent.CompletableFuture
 
 object RsExternalLinterUtils {
     private val LOG: Logger = logger<RsExternalLinterUtils>()
-    const val APTOS_TEST_MESSAGE: String = "RsExternalLint"
+    const val APTOS_TEST_MESSAGE: String = "MvExternalLint"
 
     /**
      * Returns (and caches if absent) lazily computed messages from external linter.

diff --git a/src/main/kotlin/org/move/ide/annotator/fixes/WrapWithParensExprFix.kt b/src/main/kotlin/org/move/ide/annotator/fixes/WrapWithParensExprFix.kt
diff --git a/src/main/kotlin/org/move/ide/hints/type/MvTypeHintsFactory.kt b/src/main/kotlin/org/move/ide/hints/type/MvTypeHintsFactory.kt
@@ -7,6 +7,7 @@ import com.intellij.psi.createSmartPointer
 import org.move.ide.presentation.hintText
 import org.move.lang.core.types.ty.Ty
 import org.move.lang.core.types.ty.TyAdt
+import org.move.lang.core.types.ty.TyReference
 import org.move.lang.core.types.ty.TyTuple
 import org.move.lang.core.types.ty.TyVector
 
@@ -23,6 +24,7 @@ object MvTypeHintsFactory {
             is TyTuple -> tupleTypeHint(level, type)
             is TyAdt -> adtTypeHint(level, type)
             is TyVector -> vectorTypeHint(level, type)
+            is TyReference -> referenceTypeHint(level, type)
             else -> {
                 text(type.hintText())
             }
@@ -90,6 +92,11 @@ object MvTypeHintsFactory {
             })
     }
 
+    private fun PresentationTreeBuilder.referenceTypeHint(level: Int, tyRef: TyReference) {
+        text(if (tyRef.isMut) "&mut " else "&")
+        typeHint(level, tyRef.referenced)
+    }
+
     private fun <T> PresentationTreeBuilder.join(
         elements: List<T>,
         op: PresentationTreeBuilder.(T) -> Unit,

diff --git a/src/main/kotlin/org/move/ide/inspections/MvUnresolvedReferenceInspection.kt b/src/main/kotlin/org/move/ide/inspections/MvUnresolvedReferenceInspection.kt
@@ -118,7 +118,7 @@ class MvUnresolvedReferenceInspection: MvLocalInspectionTool() {
             if (msl && !isDebugModeEnabled()) return
 
             // no error if receiver item is unknown (won't proc if unknown is nested)
-            if (methodOrField.inferReceiverTy(msl) is TyUnknown) return
+            if (methodOrField.inferReceiverTy(msl).derefIfNeeded() is TyUnknown) return
 
             tryMultiResolveOrRegisterError(methodOrField, holder)
         }

diff --git a/src/main/kotlin/org/move/lang/core/completion/providers/CommonCompletionProvider.kt b/src/main/kotlin/org/move/lang/core/completion/providers/CommonCompletionProvider.kt
@@ -85,12 +85,14 @@ object CommonCompletionProvider: MvCompletionProvider() {
 
     @VisibleForTesting
     fun addMethodOrFieldVariants(element: MvMethodOrField, result: CompletionResultSet, ctx: MvCompletionContext) {
-        val receiverTy = element.inferReceiverTy(ctx.msl).knownOrNull() ?: return
+        val receiverTy = element.inferReceiverTy(ctx.msl)
+        // unknown, &unknown, &mut unknown
+        if (receiverTy.derefIfNeeded() is TyUnknown) return
 
         val tyAdt = receiverTy.derefIfNeeded() as? TyAdt
         if (tyAdt != null) {
             collectCompletionVariants(result, ctx, subst = tyAdt.substitution) {
-                processFieldLookupResolveVariants(element, tyAdt, ctx.msl, it)
+                processFieldLookupResolveVariants(element, tyAdt.item, ctx.msl, it)
             }
         }
 

diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvPath.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvPath.kt
@@ -123,6 +123,9 @@ fun MvPath.allowedNamespaces(isCompletion: Boolean = false): Set<Namespace> {
         parent is MvCallExpr -> FUNCTIONS
         parent is MvPathExpr
                 && this.hasAncestor<MvAttrItemInitializer>() -> ALL_NAMESPACES
+        // TYPES for resource indexing, NAMES for vector indexing
+        parent is MvPathExpr
+                && parent.parent is MvIndexExpr -> TYPES_N_ENUMS_N_NAMES
 
         // can be anything in completion
         parent is MvPathExpr -> if (isCompletion) ALL_NAMESPACES else NAMES

diff --git a/src/main/kotlin/org/move/lang/core/resolve/ref/Namespace.kt b/src/main/kotlin/org/move/lang/core/resolve/ref/Namespace.kt
@@ -42,10 +42,9 @@ val ENUMS = setOf(Namespace.ENUM)
 val LABELS = setOf(Namespace.LABEL)
 val TYPES_N_ENUMS = setOf(Namespace.TYPE, Namespace.ENUM)
 
-val TYPES_N_NAMES = setOf(Namespace.TYPE, Namespace.NAME)
+val TYPES_N_ENUMS_N_NAMES = setOf(Namespace.TYPE, Namespace.NAME, Namespace.ENUM)
 val ENUMS_N_MODULES = setOf(Namespace.ENUM, Namespace.MODULE)
 val TYPES_N_ENUMS_N_MODULES = setOf(Namespace.TYPE, Namespace.ENUM, Namespace.MODULE)
-//val TYPES_N_ENUMS_N_MODULES_N_NAMES = setOf(Namespace.TYPE, Namespace.ENUM, Namespace.MODULE, Namespace.NAME)
 
 val ALL_NAMESPACES = Namespace.all()
 val ITEM_NAMESPACES =

diff --git a/src/main/kotlin/org/move/lang/core/resolve2/LexicalDeclarations2.kt b/src/main/kotlin/org/move/lang/core/resolve2/LexicalDeclarations2.kt
@@ -9,9 +9,9 @@ import org.move.lang.core.psi.ext.*
 import org.move.lang.core.resolve.*
 import org.move.lang.core.resolve.LetStmtScope.*
 import org.move.lang.core.resolve.ref.ENUMS
+import org.move.lang.core.resolve.ref.NAMES
 import org.move.lang.core.resolve.ref.NONE
 import org.move.lang.core.resolve.ref.Namespace
-import org.move.lang.core.resolve.ref.Namespace.NAME
 import org.move.lang.core.resolve.ref.TYPES
 import org.move.lang.core.resolve2.ref.ResolutionContext
 import org.move.lang.core.resolve2.util.forEachLeafSpeck
@@ -29,18 +29,15 @@ fun processItemsInScope(
     for (namespace in ns) {
         val elementNs = setOf(namespace)
         val stop = when (namespace) {
-            NAME -> {
+            Namespace.NAME -> {
                 val found = when (scope) {
                     is MvModule -> {
                         // try enum variants first
-                        if (processor.processAll(elementNs, scope.enumVariants())) return true
-                        processor.processAllItems(
-                            elementNs,
-                            scope.structs(),
-                            scope.consts()
-                        )
+                        if (processor.processAll(elementNs, scope.enumVariants())) {
+                            return true
+                        }
+                        processor.processAllItems(elementNs, scope.constList)
                     }
-                    is MvModuleSpecBlock -> processor.processAllItems(elementNs, scope.schemaList)
                     is MvScript -> processor.processAllItems(elementNs, scope.constList)
                     is MvFunctionLike -> processor.processAll(elementNs, scope.parametersAsBindings)
                     is MvLambdaExpr -> processor.processAll(elementNs, scope.parametersAsBindings)

diff --git a/src/main/kotlin/org/move/lang/core/resolve2/NameResolution2.kt b/src/main/kotlin/org/move/lang/core/resolve2/NameResolution2.kt
@@ -1,6 +1,5 @@
 package org.move.lang.core.resolve2
 
-import org.move.lang.core.completion.getOriginalOrSelf
 import org.move.lang.core.psi.*
 import org.move.lang.core.psi.ext.*
 import org.move.lang.core.resolve.*
@@ -15,11 +14,10 @@ import org.move.lang.index.MvModuleIndex
 
 fun processFieldLookupResolveVariants(
     fieldLookup: MvMethodOrField,
-    receiverTy: TyAdt,
+    receiverItem: MvStructOrEnumItemElement,
     msl: Boolean,
     originalProcessor: RsResolveProcessorBase<FieldResolveVariant>
 ): Boolean {
-    val receiverItem = receiverTy.item
     if (!isFieldsAccessible(fieldLookup, receiverItem, msl)) return false
 
     val processor = originalProcessor

diff --git a/src/main/kotlin/org/move/lang/core/types/infer/TypeInferenceWalker.kt b/src/main/kotlin/org/move/lang/core/types/infer/TypeInferenceWalker.kt
@@ -316,15 +316,22 @@ class TypeInferenceWalker(
             is MvConst -> item.type?.loweredType(msl) ?: TyUnknown
             is MvGlobalVariableStmt -> item.type?.loweredType(true) ?: TyUnknown
             is MvNamedFieldDecl -> item.type?.loweredType(msl) ?: TyUnknown
-            is MvStruct -> {
+            is MvStruct, is MvEnum -> {
                 if (project.moveSettings.enableIndexExpr && pathExpr.parent is MvIndexExpr) {
                     TyLowering().lowerPath(pathExpr.path, item, ctx.msl)
                 } else {
                     // invalid statements
                     TyUnknown
                 }
             }
-            is MvEnumVariant -> TyLowering().lowerPath(pathExpr.path, item, ctx.msl)
+            is MvEnumVariant -> {
+                // MyEnum<u8>::MyVariant
+                //   ^ we need this path to be able to handle explicit type parameters
+                val enumItemPath = pathExpr.path.qualifier ?: pathExpr.path
+                val baseTy = instantiatePath<TyAdt>(enumItemPath, item.enumItem)
+                    ?: return TyUnknown
+                baseTy
+            }
             is MvModule -> TyUnknown
             else -> debugErrorOrFallback(
                 "Referenced item ${item.elementType} " +
@@ -458,7 +465,7 @@ class TypeInferenceWalker(
 
         val field =
             resolveSingleResolveVariant(fieldLookup.referenceName) {
-                processFieldLookupResolveVariants(fieldLookup, tyAdt, msl, it)
+                processFieldLookupResolveVariants(fieldLookup, tyAdt.item, msl, it)
             } as? MvFieldDecl
         ctx.resolvedFields[fieldLookup] = field
 
@@ -552,11 +559,12 @@ class TypeInferenceWalker(
         @Suppress("UNCHECKED_CAST")
         val explicitPathTy = TyLowering().lowerPath(methodOrPath, genericItem, msl) as? T
             ?: return null
+        val typeParamToVarSubst = genericItem.tyVarsSubst
 
-        val tyVarsSubst = genericItem.tyVarsSubst
-        @Suppress("UNCHECKED_CAST")
         // TyTypeParameter -> TyVar for every TypeParameter which is not explicit set
-        return explicitPathTy.substitute(tyVarsSubst) as T
+        @Suppress("UNCHECKED_CAST")
+        val explicitPathTyWithTyVars = explicitPathTy.substitute(typeParamToVarSubst) as T
+        return explicitPathTyWithTyVars
     }
 
     @Suppress("UNCHECKED_CAST")
@@ -714,8 +722,6 @@ class TypeInferenceWalker(
         val genericItem = if (item is MvEnumVariant) item.enumItem else (item as MvStruct)
         val (tyAdt, tyVarsSubst) =
             instantiateMethodOrPath<TyAdt>(path, genericItem) ?: return TyUnknown
-//        val tyAdt = instantiatePath<TyAdt>(path, genericItem) ?: return TyUnknown
-//        val tyVarsSubst = genericItem.typeParamsToTyVarsSubst
 
         expectedType?.let { expectedTy ->
             val expectedTyTypeParams = expectedTy.typeParameterValues
@@ -811,7 +817,7 @@ class TypeInferenceWalker(
             return TyUnknown
         }
 
-        val derefTy = receiverTy.derefIfNeeded()
+        val derefTy = this.resolveTypeVarsIfPossible(receiverTy).derefIfNeeded()
         return when {
             derefTy is TyVector -> {
                 // argExpr can be either TyInteger or TyRange
@@ -829,7 +835,10 @@ class TypeInferenceWalker(
                 receiverTy
             }
             else -> {
-                ctx.reportTypeError(TypeError.IndexingIsNotAllowed(indexExpr.receiverExpr, receiverTy))
+                if (receiverTy !is TyUnknown) {
+                    // unresolved item
+                    ctx.reportTypeError(TypeError.IndexingIsNotAllowed(indexExpr.receiverExpr, receiverTy))
+                }
                 TyUnknown
             }
         }

diff --git a/src/main/kotlin/org/move/lang/core/types/ty/TyAdt.kt b/src/main/kotlin/org/move/lang/core/types/ty/TyAdt.kt
@@ -42,7 +42,6 @@ data class TyAdt(
             val typeParameters = struct.typeParamsToTypeParamsSubst
             return TyAdt(
                 struct,
-//                CompletionUtil.getOriginalOrSelf(struct),
                 typeParameters,
                 struct.tyTypeParams
             )

diff --git a/src/main/kotlin/org/move/lang/core/types/ty/TyTypeParameter.kt b/src/main/kotlin/org/move/lang/core/types/ty/TyTypeParameter.kt
@@ -33,7 +33,6 @@ class TyTypeParameter private constructor(
     companion object {
         fun named(parameter: MvTypeParameter): TyTypeParameter {
             // Treat the same parameters from original/copy files as equals
-//            val originalParameter = parameter
             val originalParameter = CompletionUtil.getOriginalOrSelf(parameter)
             return TyTypeParameter(originalParameter)
         }

diff --git a/src/main/kotlin/org/move/lang/utils/Diagnostic.kt b/src/main/kotlin/org/move/lang/utils/Diagnostic.kt
@@ -12,8 +12,6 @@ import com.intellij.openapi.util.text.StringUtil.pluralize
 import com.intellij.psi.PsiElement
 import org.move.ide.annotator.MvAnnotationHolder
 import org.move.ide.annotator.fixes.ItemSpecSignatureFix
-import org.move.ide.annotator.fixes.WrapWithParensExprFix
-import org.move.ide.annotator.pluralise
 import org.move.ide.inspections.fixes.EnableMoveV2Fix
 import org.move.lang.core.psi.*
 import org.move.lang.core.psi.ext.*
@@ -144,26 +142,6 @@ sealed class Diagnostic(
         }
     }
 
-    class ParensAreRequiredForCastExpr(castExpr: MvCastExpr): Diagnostic(castExpr) {
-        override fun prepare(): PreparedAnnotation {
-            val castExpr = element as MvCastExpr
-            return PreparedAnnotation(
-                ERROR,
-                "Parentheses are required for the cast expr",
-                fixes = listOf(WrapWithParensExprFix(castExpr))
-            )
-        }
-    }
-
-//    class NativeStructNotSupported(struct: MvStruct, errorRange: TextRange): Diagnostic(struct, errorRange) {
-//        override fun prepare(): PreparedAnnotation {
-//            return PreparedAnnotation(
-//                ERROR,
-//                "Native structs aren't supported by the Move VM anymore"
-//            )
-//        }
-//    }
-
     class SpecFunctionRequiresReturnType(specFunction: MvSpecFunction):
         Diagnostic(
             specFunction,

diff --git a/src/test/kotlin/org/move/cli/externalLinter/MvExternalLinterPassTest.kt b/src/test/kotlin/org/move/cli/externalLinter/MvExternalLinterPassTest.kt
@@ -32,7 +32,7 @@ class MvExternalLinterPassTest: WithAptosCliTestBase(
         """
         module 0x1::main {
             fun main() {
-                1 + <error descr="$APTOS_TEST_MESSAGE">/*caret*/true</error>
+                1 + <error descr="$APTOS_TEST_MESSAGE">/*caret*/true</error>;
             }
         }
     """, externalLinter = ExternalLinter.LINTER

diff --git a/src/test/kotlin/org/move/ide/annotator/HighlightingAnnotatorTest.kt b/src/test/kotlin/org/move/ide/annotator/HighlightingAnnotatorTest.kt
@@ -335,6 +335,7 @@ class HighlightingAnnotatorTest: AnnotatorTestCase(HighlightingAnnotator::class)
     """
     )
 
+    @MoveV2(false)
     fun `test do not highlight methods if compiler v1`() = checkHighlighting(
         """
         module 0x1::m {
-Original file line number
+Diff line change
@@ Expand Up @@
         """
         )
+        @MoveV2(false)
         fun `test do not highlight methods if compiler v1`() = checkHighlighting(
             """
             module 0x1::m {
@@ Expand Down @@