-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #197 from pontem-network/enum-feature-flag
enum/match feature flag
- Loading branch information
Showing
7 changed files
with
155 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,14 @@ | ||
package org.move.lang.core.psi.ext | ||
|
||
import com.intellij.psi.PsiElement | ||
import org.move.lang.MvElementTypes.MATCH_KW | ||
import org.move.lang.core.psi.MvMatchArgument | ||
import org.move.lang.core.psi.MvMatchArm | ||
import org.move.lang.core.psi.MvMatchBody | ||
import org.move.lang.core.psi.MvMatchExpr | ||
|
||
val MvMatchExpr.matchKw: PsiElement? get() = findFirstChildByType(MATCH_KW) | ||
|
||
val MvMatchExpr.matchArgument: MvMatchArgument get() = childOfType<MvMatchArgument>()!! | ||
val MvMatchExpr.matchBody: MvMatchBody get() = childOfType<MvMatchBody>()!! | ||
val MvMatchExpr.arms: List<MvMatchArm> get() = matchBody.matchArmList |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
src/test/kotlin/org/move/ide/annotator/syntaxErrors/compilerV2/EnumMatchTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
package org.move.ide.annotator.syntaxErrors.compilerV2 | ||
|
||
import org.move.ide.annotator.MvSyntaxErrorAnnotator | ||
import org.move.utils.tests.MoveV2 | ||
import org.move.utils.tests.annotation.AnnotatorTestCase | ||
|
||
class EnumMatchTest: AnnotatorTestCase(MvSyntaxErrorAnnotator::class) { | ||
@MoveV2(false) | ||
fun `test enum is not supported in v1`() = checkWarnings(""" | ||
module 0x1::m { | ||
<error descr="Enums are not supported in Aptos Move V1">enum</error> S { One } | ||
} | ||
""") | ||
|
||
@MoveV2(true) | ||
fun `test enums in v2`() = checkWarnings(""" | ||
module 0x1::m { | ||
enum S { One } | ||
} | ||
""") | ||
|
||
@MoveV2(false) | ||
fun `test match is not supported in v1`() = checkWarnings(""" | ||
module 0x1::m { | ||
struct S {} | ||
fun main(s: S) { | ||
<error descr="Match expressions are not supported in Aptos Move V1">match</error> (s) {} | ||
} | ||
} | ||
""") | ||
|
||
@MoveV2(true) | ||
fun `test match in v2`() = checkWarnings(""" | ||
module 0x1::m { | ||
struct S {} | ||
fun main(s: S) { | ||
match (s) {} | ||
} | ||
} | ||
""") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters