Support more version specifiers

DanielSchiavini · Jul 9, 2024 · b66684d · b66684d
1 parent 5232a3c
commit b66684d
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 62 deletions.
diff --git a/.idea/modules/vyper-plugin.iml b/.idea/modules/vyper-plugin.iml
diff --git a/.idea/modules/vyper-plugin.main.iml b/.idea/modules/vyper-plugin.main.iml
diff --git a/.idea/modules/vyper-plugin.test.iml b/.idea/modules/vyper-plugin.test.iml
diff --git a/src/main/kotlin/org/vyperlang/plugin/annotators/CompilerAnnotator.kt b/src/main/kotlin/org/vyperlang/plugin/annotators/CompilerAnnotator.kt
@@ -51,7 +51,7 @@ class CompilerAnnotator : ExternalAnnotator<FileInfo, List<CompilerError>>(), Du
             VyperCompilerDocker(info.project, info.file, info.version, info.indicator).run()
         } catch (e: CompilerMissingError) {
             LOG.error("Error while running compiler annotator", e)
-            null
+            null // todo: return warning to the editor
         }
         if (result?.statusDocker == StatusDocker.FAILED) {
             return parseErrors(info, result);

diff --git a/src/main/kotlin/org/vyperlang/plugin/psi/VyperFile.kt b/src/main/kotlin/org/vyperlang/plugin/psi/VyperFile.kt
@@ -10,7 +10,7 @@ import org.vyperlang.plugin.VyperLanguage
 import org.vyperlang.plugin.psi.VyperTypes.COMMENT
 
 private val CommentTokens = TokenSet.create(COMMENT, WHITE_SPACE)
-private val PragmaRegex = "#\\s*(?:pragma\\s+|@)version\\s+\\^?(\\d+\\.\\d+\\.\\d+)".toRegex()
+private val PragmaRegex = "#\\s*(?:pragma\\s+|@)version\\s+[\\^><~]?(\\d+\\.\\d+\\.\\d+)".toRegex()
 
 
 class VyperFile(viewProvider: FileViewProvider) : PsiFileBase(viewProvider, VyperLanguage) {

diff --git a/src/test/kotlin/org/vyperlang/plugin/annotators/TestColorAnnotator.kt b/src/test/kotlin/org/vyperlang/plugin/annotators/TestColorAnnotator.kt
@@ -63,7 +63,7 @@ class TestColorAnnotator : BasePlatformTestCase() {
         checkErrors(
             VyperInterfaceFileType.INSTANCE,
             """
-                # pragma version ^0.3.0
+                # pragma version >0.3.0
                 @view
                 @internal
                 def balanceOf(_owner: address) -> uint256: