apply suggestions

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-## 0.0.16
+## 0.1.0
 - new: logo for Vyper files in the explorer view
 - fix: compilation for Vyper 0.4.x
 - fix: don't compile interface files

README.md

@@ -86,6 +86,9 @@ Note: Active features can be disabled by setting `Settings` → `Vyper` → `Mod
 * **Q**: My project uses Vyper 0.3.x and import some interfaces from other contracts. but the extension does not recognize them and output `FileNotFoundError: Cannot locate interface 'interface/my_interface{.vy,.json}`.
 * **A** The extension compiles your file with the command `vyper`. You should set the setting: `vyper.command` to `vyper -p path/to/your/project/directory` to make the compiler aware of the interfaces in your project.
 
+* **Q** My multi-module project uses Vyper 0.4.x and while the extension does not report compilation error for any files, when compiling the project with the Vyper cli or some framework such as `ape`, `foundry` or `titanoboa`, it fails with some issue about modules usage/initialization.
+* **A** In 0.4.x, A Vyper modules might be valid when being imported but not a valid standalone contracts to compile into bytecode. Hence the extension stops the compilation at the ``annotated_ast` phase, before the global constraint checker. For more info see https://github.com/vyperlang/vyper/pull/3810.
+
 ## Developer Notes
 
 * install vyper `pip3 install vyper`

package.json

@@ -3,7 +3,7 @@
     "displayName": "Vyper",
     "description": "Ethereum Vyper language support for Visual Studio Code",
     "license": "MIT",
-    "version": "0.0.16",
+    "version": "0.1.0",
     "keywords": [
         "vyper",
         "ethereum",

scripts/fetch_vyper_language_spec.py

@@ -12,20 +12,14 @@
 import json
 
 
-
 class VyperLang:
     builtin_functions = DISPATCH_TABLE.keys()
     builtin_raw_functions = STMT_DISPATCH_TABLE.keys()
     base_types = set(
-        [
-            x
-            for x in PRIMITIVE_TYPES.keys()
-            if not x.startswith("$")
-        ]
-    )
-    reserved_words = (
-        vyper.ast.identifiers.RESERVED_KEYWORDS
+        [x for x in PRIMITIVE_TYPES.keys() if not x.startswith("$")]
     )
+    reserved_words = vyper.ast.identifiers.RESERVED_KEYWORDS
+    special_attributes = {"__interface__"}
     fallback_name = "__default__"
     constructor_name = "__init__"
     modifiers_safe = [
@@ -34,6 +28,7 @@ class VyperLang:
         "view",
         "pure",
         "private",
+        "immutable",
         "constant",
     ]  # private,constant for backward compatibility
     modifiers_unsafe = [
@@ -52,8 +47,7 @@ class VyperLang:
         "DynArray",
         "Bytes",
         "String",
-    ]
-    # kept for backward compatibility
+    ]  # enum kept for backward compatibility
     constants = [
         "ZERO_ADDRESS",
         "EMPTY_BYTES32",
@@ -65,10 +59,18 @@ class VyperLang:
         "MAX_UINT256",
     ]  # kept for backward compatibility
     modules = ["implements", "uses", "initializes", "exports"]
-    special_vars = ["log", "msg", "block", "tx", "chain", "extcall", "staticcall"]
+    special_vars = [
+        "log",
+        "msg",
+        "block",
+        "tx",
+        "chain",
+        "extcall",
+        "staticcall",
+    ]
 
     tmlanguage_match_wordboundary = "(?x)\n  \\b (%(match)s) \\b\n"
-    tmlanguage_match_functions = "(?x)\n  (?<!\\.) \\b(\n    %(match)s   )\\b\n"
+    tmlanguage_match_functions = "(?x)\n  (?<!\\.) \\b(\n %(match)s)\\b\n"
     tmlanguage_match_types = "(?x)\n  (?<!\\.) \\b(\n    %(match)s \n\n    (?# Although 'super' is not a type, it's related to types,\n        and is special enough to be highlighted differently from\n        other built-ins)\n    | super\n  )\\b\n"
 
     #    "name": "support.type.keywords.vyper", <--> for syntax recognition / highlighting
@@ -174,12 +176,25 @@ def generate_tmlanguage(template_file):
             repo["special-variables-types"]["patterns"].append(
                 {
                     "name": f"variable.language.special.{special}.vyper",
-                    "match": VyperLang.tmlanguage_match_functions % {"match": special},
+                    "match": VyperLang.tmlanguage_match_functions
+                    % {"match": special},
+                }
+            )
+        for special in VyperLang.special_attributes:
+            repo["special-variables-types"]["patterns"].append(
+                {
+                    "name": f"variable.language.special.{special}.vyper",
+                    "match": VyperLang.tmlanguage_match_wordboundary
+                    % {"match": special},
                 }
             )
         # link patterns
         # special-variables-vyper
-        for repo_item in ("expression-bare", "member-access-base", "item-name"):
+        for repo_item in (
+            "expression-bare",
+            "member-access-base",
+            "item-name",
+        ):
             repo[repo_item]["patterns"].append(
                 {"include": "#special-variables-types"},
             )

syntaxes/vyper.tmLanguage.json

@@ -1737,23 +1737,23 @@
                 },
                 {
                     "name": "support.function.builtin.vyper",
-                    "match": "(?x)\n  (?<!\\.) \\b(\n    abi_encode | abi_decode | _abi_encode | _abi_decode | floor | ceil | convert | slice | len | concat | sha256 | method_id | keccak256 | ecrecover | ecadd | ecmul | extract32 | as_wei_value | raw_call | blockhash | blobhash | bitwise_and | bitwise_or | bitwise_xor | bitwise_not | uint256_addmod | uint256_mulmod | unsafe_add | unsafe_sub | unsafe_mul | unsafe_div | pow_mod256 | uint2str | isqrt | sqrt | shift | create_minimal_proxy_to | create_forwarder_to | create_copy_of | create_from_blueprint | min | max | empty | abs | min_value | max_value | epsilon   )\\b\n"
+                    "match": "(?x)\n  (?<!\\.) \\b(\n abi_encode | abi_decode | _abi_encode | _abi_decode | floor | ceil | convert | slice | len | concat | sha256 | method_id | keccak256 | ecrecover | ecadd | ecmul | extract32 | as_wei_value | raw_call | blockhash | blobhash | bitwise_and | bitwise_or | bitwise_xor | bitwise_not | uint256_addmod | uint256_mulmod | unsafe_add | unsafe_sub | unsafe_mul | unsafe_div | pow_mod256 | uint2str | isqrt | sqrt | shift | create_minimal_proxy_to | create_forwarder_to | create_copy_of | create_from_blueprint | min | max | empty | abs | min_value | max_value | epsilon)\\b\n"
                 },
                 {
                     "name": "support.function.builtin.lowlevel.vyper",
-                    "match": "(?x)\n  (?<!\\.) \\b(\n    send | print | breakpoint | selfdestruct | raw_call | raw_log | raw_revert | create_minimal_proxy_to | create_forwarder_to | create_copy_of | create_from_blueprint   )\\b\n"
+                    "match": "(?x)\n  (?<!\\.) \\b(\n send | print | breakpoint | selfdestruct | raw_call | raw_log | raw_revert | create_minimal_proxy_to | create_forwarder_to | create_copy_of | create_from_blueprint)\\b\n"
                 },
                 {
                     "name": "support.type.reference.vyper",
-                    "match": "(?x)\n  (?<!\\.) \\b(\n    struct | enum | flag | event | interface | HashMap | DynArray | Bytes | String   )\\b\n"
+                    "match": "(?x)\n  (?<!\\.) \\b(\n struct | enum | flag | event | interface | HashMap | DynArray | Bytes | String)\\b\n"
                 },
                 {
                     "name": "support.function.builtin.modifiers.safe.vyper",
-                    "match": "(?x)\n  (?<!\\.) \\b(\n    nonreentrant | internal | view | pure | private | constant   )\\b\n"
+                    "match": "(?x)\n  (?<!\\.) \\b(\n nonreentrant | internal | view | pure | private | immutable | constant)\\b\n"
                 },
                 {
                     "name": "support.function.builtin.modifiers.unsafe.vyper",
-                    "match": "(?x)\n  (?<!\\.) \\b(\n    deploy | nonpayable | payable | externalmodifying   )\\b\n"
+                    "match": "(?x)\n  (?<!\\.) \\b(\n deploy | nonpayable | payable | externalmodifying)\\b\n"
                 }
             ]
         },
@@ -1765,19 +1765,19 @@
                 },
                 {
                     "name": "support.type.basetype.vyper",
-                    "match": "(?x)\n  (?<!\\.) \\b(\n    uint200 | uint256 | int8 | uint40 | uint232 | bytes17 | uint104 | uint128 | uint56 | int176 | bytes32 | bytes12 | int120 | uint120 | int32 | uint112 | int16 | bytes4 | uint144 | bytes10 | bytes13 | uint32 | bytes20 | uint72 | bytes15 | int80 | int160 | int96 | decimal | uint136 | int192 | int240 | int200 | int104 | int152 | uint64 | uint24 | bytes6 | bytes30 | int224 | bytes25 | bytes28 | int208 | HashMap | int56 | address | uint208 | Bytes | int128 | int24 | uint184 | uint80 | bytes23 | uint88 | uint216 | int136 | int232 | uint48 | bytes18 | bytes11 | int40 | int168 | int184 | bytes26 | bytes29 | bool | int248 | uint152 | bytes1 | int64 | uint96 | int112 | int216 | bytes24 | uint240 | uint160 | int72 | String | bytes19 | int48 | uint248 | uint16 | bytes31 | bytes3 | bytes22 | bytes7 | bytes2 | bytes14 | uint176 | int88 | bytes9 | uint224 | uint8 | bytes5 | bytes21 | DynArray | uint168 | int144 | bytes16 | uint192 | bytes8 | int256 | bytes27   )\\b\n"
+                    "match": "(?x)\n  (?<!\\.) \\b(\n HashMap | uint120 | bytes31 | int16 | int144 | uint232 | bytes17 | uint48 | bytes5 | bool | uint248 | Bytes | uint24 | uint72 | int232 | bytes2 | int112 | uint80 | int56 | int168 | bytes26 | uint56 | int72 | bytes22 | uint192 | int224 | uint216 | bytes27 | address | int208 | bytes23 | uint16 | int216 | int24 | int8 | int96 | int200 | bytes3 | bytes10 | int136 | int32 | int48 | uint240 | int160 | int176 | bytes9 | bytes30 | int256 | int192 | bytes7 | uint104 | bytes12 | int240 | uint224 | bytes25 | uint112 | bytes28 | DynArray | bytes32 | int88 | bytes20 | uint8 | uint256 | bytes4 | uint160 | bytes21 | int152 | String | int64 | bytes14 | bytes29 | uint168 | bytes11 | int80 | int184 | bytes19 | bytes24 | bytes15 | uint200 | uint208 | uint176 | bytes18 | decimal | uint128 | uint144 | uint64 | uint88 | uint152 | bytes6 | int104 | uint32 | bytes8 | int128 | bytes1 | int40 | bytes16 | int248 | uint40 | uint184 | int120 | uint136 | bytes13 | uint96)\\b\n"
                 },
                 {
                     "name": "support.type.keywords.vyper",
-                    "match": "(?x)\n  (?<!\\.) \\b(\n    del | babbage | true | lovelace | is | shannon | for | default | nonlocal | false | from | struct | enum | max_uint256 | def | pwei | return | if | import | min_decimal | flagunreachable | ether | while | as | payable | with | event | init | interface | not | async | immutable | try | nonpayable | lambda | global | assert | ____init____ | zero_address | or | pass | transient | constant | yield | gwei | twei | empty_bytes32 | szabo | raise | finally | class | ada | wei | else | zero_wei | max_decimal | elif | _init_ | except | await | break | ___default___ | and | none | _default_ | indexed | finney | kwei | nonreentrant | range | mwei | in | ___init___ | max_int128 | external | public | ____default____ | internal | min_int128 | continue   )\\b\n"
+                    "match": "(?x)\n  (?<!\\.) \\b(\n _default_ | payable | nonreentrant | for | ether | import | with | enum | public | global | wei | lambda | empty_bytes32 | from | yield | gwei | event | transient | pwei | szabo | internal | continue | and | pass | while | init | if | babbage | async | immutable | interface | kwei | finally | min_decimal | or | none | ___init___ | max_uint256 | zero_wei | finney | max_decimal | return | elif | false | default | ____default____ | flagunreachable | struct | def | except | nonpayable | del | twei | true | range | raise | class | lovelace | indexed | min_int128 | external | try | as | not | assert | constant | break | ____init____ | ada | is | await | max_int128 | else | zero_address | mwei | ___default___ | nonlocal | _init_ | in | shannon)\\b\n"
                 },
                 {
                     "name": "support.type.constant.vyper",
                     "match": "(?x)\n  (?<!\\.) \\b(\n    ZERO_ADDRESS | EMPTY_BYTES32 | MAX_INT128 | MIN_INT128 | MAX_DECIMAL | MIN_DECIMAL | MIN_UINT256 | MAX_UINT256 \n\n    (?# Although 'super' is not a type, it's related to types,\n        and is special enough to be highlighted differently from\n        other built-ins)\n    | super\n  )\\b\n"
                 },
                 {
                     "name": "entity.other.inherited-class.modules.vyper",
-                    "match": "(?x)\n  (?<!\\.) \\b(\n    implements | uses | initializes | exports   )\\b\n"
+                    "match": "(?x)\n  (?<!\\.) \\b(\n implements | uses | initializes | exports)\\b\n"
                 }
             ]
         },
@@ -4273,37 +4273,41 @@
             "patterns": [
                 {
                     "name": "variable.language.special.log.vyper",
-                    "match": "(?x)\n  (?<!\\.) \\b(\n    log   )\\b\n"
+                    "match": "(?x)\n  (?<!\\.) \\b(\n log)\\b\n"
                 },
                 {
                     "name": "variable.language.special.msg.vyper",
-                    "match": "(?x)\n  (?<!\\.) \\b(\n    msg   )\\b\n"
+                    "match": "(?x)\n  (?<!\\.) \\b(\n msg)\\b\n"
                 },
                 {
                     "name": "variable.language.special.block.vyper",
-                    "match": "(?x)\n  (?<!\\.) \\b(\n    block   )\\b\n"
+                    "match": "(?x)\n  (?<!\\.) \\b(\n block)\\b\n"
                 },
                 {
                     "name": "variable.language.special.tx.vyper",
-                    "match": "(?x)\n  (?<!\\.) \\b(\n    tx   )\\b\n"
+                    "match": "(?x)\n  (?<!\\.) \\b(\n tx)\\b\n"
                 },
                 {
                     "name": "variable.language.special.chain.vyper",
-                    "match": "(?x)\n  (?<!\\.) \\b(\n    chain   )\\b\n"
+                    "match": "(?x)\n  (?<!\\.) \\b(\n chain)\\b\n"
                 },
                 {
                     "name": "variable.language.special.extcall.vyper",
-                    "match": "(?x)\n  (?<!\\.) \\b(\n    extcall   )\\b\n"
+                    "match": "(?x)\n  (?<!\\.) \\b(\n extcall)\\b\n"
                 },
                 {
                     "name": "variable.language.special.staticcall.vyper",
-                    "match": "(?x)\n  (?<!\\.) \\b(\n    staticcall   )\\b\n"
+                    "match": "(?x)\n  (?<!\\.) \\b(\n staticcall)\\b\n"
+                },
+                {
+                    "name": "variable.language.special.__interface__.vyper",
+                    "match": "(?x)\n  \\b (__interface__) \\b\n"
                 }
             ]
         },
         "reserved-names-vyper": {
             "name": "name.reserved.vyper",
-            "match": "(?x)\n  \\b (del | babbage | true | lovelace | is | shannon | for | default | nonlocal | false | from | struct | enum | max_uint256 | def | pwei | return | if | import | min_decimal | flagunreachable | ether | while | as | payable | with | event | init | interface | not | async | immutable | try | nonpayable | lambda | global | assert | ____init____ | zero_address | or | pass | transient | constant | yield | gwei | twei | empty_bytes32 | szabo | raise | finally | class | ada | wei | else | zero_wei | max_decimal | elif | _init_ | except | await | break | ___default___ | and | none | _default_ | indexed | finney | kwei | nonreentrant | range | mwei | in | ___init___ | max_int128 | external | public | ____default____ | internal | min_int128 | continue) \\b\n"
+            "match": "(?x)\n  \\b (_default_ | payable | nonreentrant | for | ether | import | with | enum | public | global | wei | lambda | empty_bytes32 | from | yield | gwei | event | transient | pwei | szabo | internal | continue | and | pass | while | init | if | babbage | async | immutable | interface | kwei | finally | min_decimal | or | none | ___init___ | max_uint256 | zero_wei | finney | max_decimal | return | elif | false | default | ____default____ | flagunreachable | struct | def | except | nonpayable | del | twei | true | range | raise | class | lovelace | indexed | min_int128 | external | try | as | not | assert | constant | break | ____init____ | ada | is | await | max_int128 | else | zero_address | mwei | ___default___ | nonlocal | _init_ | in | shannon) \\b\n"
         }
     }
 }