feat(all): initial support for codeOf (#356)

Fixes #308
tact-lang · Feb 24, 2025 · 1dbb6e6 · 1dbb6e6
1 parent adfd0f0
commit 1dbb6e6
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 5 deletions.
diff --git a/server/src/TypeInferer.ts b/server/src/TypeInferer.ts
@@ -179,6 +179,12 @@ export class TypeInferer {
             return new StructTy("StateInit", stateInit)
         }
 
+        if (node.node.type === "codeOf") {
+            const cell = index.elementByName(IndexKey.Primitives, "Cell")
+            if (!cell) return null
+            return new PrimitiveTy("Cell", cell, null)
+        }
+
         if (node.node.type === "parenthesized_expression") {
             const inner = node.node.children[1]
             if (!inner) return null

diff --git a/server/src/completion/CompletionContext.ts b/server/src/completion/CompletionContext.ts
@@ -30,6 +30,7 @@ export class CompletionContext {
     public isMessageContext: boolean = false
     public isBouncedMessage: boolean = false
     public isInitOfName: boolean = false
+    public isCodeOfName: boolean = false
     public afterFieldType: boolean = false
     public insideImport: boolean = false
     public inDestruct: boolean = false
@@ -228,6 +229,10 @@ export class CompletionContext {
             this.isInitOfName = true
         }
 
+        if (parent.type === "codeOf" && parent.childForFieldName("name")?.equals(element.node)) {
+            this.isCodeOfName = true
+        }
+
         if (parent.type === "ERROR" && parent.parent?.type === "map_type") {
             this.isType = true
             this.isExpression = false
@@ -316,7 +321,8 @@ export class CompletionContext {
             !this.inParameter &&
             !this.afterFieldType &&
             !this.insideImport &&
-            !this.isInitOfName
+            !this.isInitOfName &&
+            !this.isCodeOfName
         )
     }
 }
diff --git a/server/src/completion/ReferenceCompletionProcessor.ts b/server/src/completion/ReferenceCompletionProcessor.ts
@@ -39,8 +39,8 @@ export class ReferenceCompletionProcessor implements ScopeProcessor {
                 return node instanceof Trait
             }
 
-            if (this.ctx.isInitOfName) {
-                // only contracts can be used in `initOf Name()`
+            if (this.ctx.isInitOfName || this.ctx.isCodeOfName) {
+                // only contracts can be used in `initOf Name()` or in `codeOf Name`
                 return node instanceof Contract
             }
 

diff --git a/server/src/completion/providers/KeywordsCompletionProvider.ts b/server/src/completion/providers/KeywordsCompletionProvider.ts
@@ -47,7 +47,17 @@ export class KeywordsCompletionProvider implements CompletionProvider {
             kind: CompletionItemKind.Keyword,
             insertText: "initOf $1($2)$0",
             insertTextFormat: InsertTextFormat.Snippet,
-            weight: contextWeight(CompletionWeight.KEYWORD, expectedNull),
+        })
+
+        result.add({
+            label: "codeOf",
+            labelDetails: {
+                detail: " Contract",
+                description: " Cell",
+            },
+            kind: CompletionItemKind.Keyword,
+            insertText: "codeOf $1$0",
+            insertTextFormat: InsertTextFormat.Snippet,
         })
     }
 }
diff --git a/server/src/completion/providers/MapTypeCompletionProvider.ts b/server/src/completion/providers/MapTypeCompletionProvider.ts
@@ -5,7 +5,13 @@ import {CompletionResult, CompletionWeight} from "@server/completion/WeightedCom
 
 export class MapTypeCompletionProvider implements CompletionProvider {
     public isAvailable(ctx: CompletionContext): boolean {
-        return ctx.isType && !ctx.inTraitList && !ctx.isMessageContext && !ctx.isInitOfName
+        return (
+            ctx.isType &&
+            !ctx.inTraitList &&
+            !ctx.isMessageContext &&
+            !ctx.isInitOfName &&
+            !ctx.isCodeOfName
+        )
     }
 
     public addCompletion(_ctx: CompletionContext, result: CompletionResult): void {

diff --git a/server/src/e2e/suite/testcases/types/codeOf.test b/server/src/e2e/suite/testcases/types/codeOf.test
@@ -0,0 +1,13 @@
+========================================================================
+Trait inheritance
+========================================================================
+primitive Cell;
+
+contract Foo {
+    fun derived() {
+        codeOf Foo;
+//!     ^ Cell
+    }
+}
+------------------------------------------------------------------------
+ok
diff --git a/syntaxes/.tmLanguage.json b/syntaxes/.tmLanguage.json
@@ -452,6 +452,11 @@
                     "match": "\\b(initOf)\\b",
                     "name": "keyword.operator.new.tact"
                 },
+                {
+                    "comment": "codeOf expression",
+                    "match": "\\b(codeOf)\\b",
+                    "name": "keyword.operator.new.tact"
+                },
                 {
                     "comment": "Ternary expression",
                     "begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)(?!\\?)",

diff --git a/tree-sitter-tact/grammar.js b/tree-sitter-tact/grammar.js
@@ -798,6 +798,7 @@ module.exports = grammar({
         $.identifier, // id
         $.null, // null
         $.initOf, // ExpressionInitOf
+        $.codeOf, // ExpressionCodeOf
         $.string, // stringLiteral
         $.self, // self
       ),
@@ -867,6 +868,12 @@ module.exports = grammar({
         optional(field("arguments", $.argument_list)),
       ),
 
+    codeOf: ($) =>
+      seq(
+        "codeOf",
+        field("name", alias($._type_identifier, $.type_identifier)),
+      ),
+
     /* Types */
 
     _type: ($) => choice($.map_type, $.bounced_type, $._simple_type),