Merge pull request #310 from pontem-network/simplify-analyzer

Simplify analyzer

Author: mkurnikov

src/main/kotlin/org/move/ide/inspections/imports/ImportAnalyzer.kt

@@ -38,6 +38,7 @@ class ImportAnalyzer2(val holder: ProblemsHolder): MvVisitor() {
                 .flatMap { it.descendantsOfType<MvPath>() }
                 .filter { it.basePath() == it }
                 .filter { it.usageScope == itemScope }
+                // remove paths inside the use stmts
                 .filter { !it.hasAncestor<MvUseSpeck>() }
 
         for (path in reachablePaths) {
@@ -75,15 +76,15 @@ class ImportAnalyzer2(val holder: ProblemsHolder): MvVisitor() {
         for (itemsOwner in reachableItemsOwners) {
             val scopeUseStmts = itemsOwner.useStmtList.filter { it.usageScope == itemScope }
             for (useStmt in scopeUseStmts) {
-                val unusedUseItems = useStmt.useItems.toSet() - allUseItemsHit
-                holder.registerStmtSpeckError2(useStmt, unusedUseItems)
+                holder.registerStmtSpeckError(useStmt, allUseItemsHit)
             }
         }
     }
 }
 
-fun ProblemsHolder.registerStmtSpeckError2(useStmt: MvUseStmt, useItems: Set<UseItem>) {
-    val moduleUseItems = useItems.filter { it.type is UseItemType.Module }
+fun ProblemsHolder.registerStmtSpeckError(useStmt: MvUseStmt, allUseItemsHit: Set<UseItem>) {
+    val unusedUseItems = useStmt.useItems.toSet() - allUseItemsHit
+    val moduleUseItems = unusedUseItems.filter { it.type is UseItemType.Module }
     if (moduleUseItems.isNotEmpty()) {
         this.registerProblem(
             useStmt,
@@ -93,15 +94,15 @@ fun ProblemsHolder.registerStmtSpeckError2(useStmt: MvUseStmt, useItems: Set<Use
         return
     }
 
-    if (useStmt.useItems.size == useItems.size) {
+    if (useStmt.useItems.size == unusedUseItems.size) {
         // all inner speck types are covered, highlight complete useStmt
         this.registerProblem(
             useStmt,
             "Unused use item",
             ProblemHighlightType.LIKE_UNUSED_SYMBOL
         )
     } else {
-        for (useItem in useItems) {
+        for (useItem in unusedUseItems) {
             this.registerProblem(
                 useItem.useSpeck,
                 "Unused use item",

src/main/kotlin/org/move/lang/core/types/infer/Patterns.kt

@@ -54,7 +54,7 @@ fun MvPat.collectBindings(fcx: TypePsiWalker, ty: Ty, defBm: RsBindingModeKind =
             }
 
             val namedFields = item?.namedFields?.associateBy { it.name } ?: emptyMap()
-            val tyAdtSubst = if (ty is TyAdt) ty.substitution else emptySubstitution
+            val tyAdtSubst = if (expected is TyAdt) expected.substitution else emptySubstitution
             for (fieldPat in this.patFieldList) {
                 val kind = fieldPat.kind
                 // wil have TyUnknown on unresolved item

src/main/resources/META-INF/plugin.xml

@@ -257,7 +257,7 @@
                      implementationClass="org.move.ide.inspections.MvTypeCheckInspection" />
     <localInspection language="Move" groupName="Move"
                      displayName="Acquires checking"
-                     enabledByDefault="false" level="WARNING"
+                     enabledByDefault="true" level="WARNING"
                      implementationClass="org.move.ide.inspections.MvAcquiresCheckInspection" />
     <localInspection language="Move" groupName="Move"
                      displayName="Unused struct type parameter"

src/test/kotlin/org/move/ide/inspections/MvTypeCheckInspectionTest.kt

@@ -1699,4 +1699,22 @@ module 0x1::pool {
             }
         }        
     """)
+
+    fun `test match expr should use generic substitution of unreferenced object`() = checkByText("""
+        module 0x1::mod {
+            struct Object<T> {
+                val: T
+            }
+            enum Relationship<phantom RelSource> {
+                V1 {
+                    source: Object<RelSource>
+                }
+            }
+            // This function triggers the false positive error
+            public fun get_source<FunSource: key>(relationship: Relationship<FunSource>): Object<FunSource> {
+                match(&relationship) {
+                    Relationship::V1 { source,.. } => *source
+                }
+            }
+        }    """)
 }

src/test/kotlin/org/move/ide/inspections/MvUnusedImportInspectionTest.kt

@@ -491,19 +491,18 @@ module 0x1::main {
 }        
     """)
 
-    // TODO: test
-//    fun `test unused top import with local present`() = checkWarnings("""
-//        module 0x1::string {
-//            public fun call() {}
-//        }
-//        module 0x1::main {
-//            <warning descr="Unused use item">use 0x1::string;</warning>
-//            fun main() {
-//                use 0x1::string;
-//                string::call();
-//            }
-//        }
-//    """)
+    fun `test unused top import with local present`() = checkWarnings("""
+        module 0x1::string {
+            public fun call() {}
+        }
+        module 0x1::main {
+            <warning descr="Unused use item">use 0x1::string;</warning>
+            fun main() {
+                use 0x1::string;
+                string::call();
+            }
+        }
+    """)
 
     fun `test unused local import`() = checkWarnings("""
         module 0x1::string {