Fix false positive in tuple structs

intellij-rust · Jul 4, 2019 · b427da8 · b427da8
1 parent f11fb5c
commit b427da8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/kotlin/org/rust/ide/annotator/RsErrorAnnotator.kt b/src/main/kotlin/org/rust/ide/annotator/RsErrorAnnotator.kt
@@ -112,10 +112,14 @@ class RsErrorAnnotator : RsAnnotatorBase(), HighlightRangeExtension {
             is RsPatTupleStruct -> {
                 val declaration = rsPat.path.reference.deepResolve() as? RsFieldsOwner ?: return
                 val bodyFields = rsPat.childrenOfType<RsPatField>()
-                if (rsPat.dotdot != null && (bodyFields.size + 1) > declaration.fields.size) {
-                    RsDiagnostic.InvalidMatchPattern(rsPat).addToHolder(holder)
+                if (rsPat.dotdot != null) {
+                    if ((bodyFields.size + 1) > declaration.fields.size) {
+                        RsDiagnostic.InvalidMatchPattern(rsPat).addToHolder(holder)
+                        return
+                    }
                 } else if (bodyFields.size != declaration.fields.size) {
                     RsDiagnostic.InvalidMatchPattern(rsPat).addToHolder(holder)
+                    return
                 }
             }
             else -> return