overrides -> override, #13, #12

package.json

@@ -4,7 +4,7 @@
   "description": "Tact language (for .tact file) extension to use together with Tact compiler for Visual Studio Code to develop smart contract for TON blockchain",
   "publisher": "KonVik",
   "icon": "icons/logo.png",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "keywords": [
     "tact",
     "blockchain",

src/hoverService.ts

@@ -114,8 +114,8 @@ const hoverDescription = {
         "description": [
             "Tact compiler allows user to import files.\n",
             "Example:\n",
-            "```\nimport \"@stdlib/jetton\";\n```",
-            "```\ncontract SampleJetton with Jetton {\n\\\\...\n}\n```"
+            "```\nimport \"@stdlib/deploy\";\n```",
+            "```\ncontract SampleJetton with deploy {\n\\\\...\n}\n```"
         ]
     },
     "address": {

src/parser/tact.pegjs

@@ -496,7 +496,7 @@ PrimitiveToken     = "primitive"        !IdentifierPart
 TraitToken         = "trait"            !IdentifierPart
 
 GetToken           = "get"              !IdentifierPart
-OverridesToken     = "overrides"        !IdentifierPart
+OverridesToken     = "override"        !IdentifierPart
 InlineToken        = "inline"           !IdentifierPart
 VirtualToken       = "virtual"          !IdentifierPart
 
@@ -804,12 +804,14 @@ DeclarativeExpression
   }
 
 Mapping
-  = MappingToken __ "<" __ from:Type __ "," __ to:Type __ ">" __
+  = MappingToken __ "<" __ from:Type __ "as"? __ fromPrimitive:Type? __ "," __ to:Type __ "as"? __ toPrimitive:Type? __  ">" __
   {
     return {
      type: "MappingExpression",
      from: from,
      to: to,
+     fromPrimitive: fromPrimitive != null ? fromPrimitive: "",
+     toPrimitive: toPrimitive != null ? toPrimitive: "",
      start: location().start.offset,
      end: location().end.offset
    }
@@ -1503,7 +1505,7 @@ FunctionDeclaration
         end: location().end.offset
       };
     }
-  / modifier:((__ GetToken / __ OverridesToken / __ InlineToken / __ VirtualToken / __ MutatesToken / __ PublicToken)*)? __ FunctionToken __ fnname:FunctionName __ returns:ReturnsDeclarations __ body:FunctionBody
+  / modifier:((__ GetToken / __ OverridesToken / __ InlineToken / __ VirtualToken / __ MutatesToken / __ PublicToken)*)? __ FunctionToken __ fnname:FunctionName __ returns:ReturnsDeclarations? __ body:FunctionBody
     {
       return {
         type: "FunctionDeclaration",
@@ -1521,7 +1523,7 @@ FunctionDeclaration
         end: location().end.offset
       };
     }
-  / InitOfToken __ fnname:FunctionName __ returns:ReturnsDeclarations __ body:FunctionBody
+  / InitOfToken __ fnname:FunctionName __ returns:ReturnsDeclarations? __ body:FunctionBody
     {
       return {
         type: "FunctionDeclaration",

src/prettier-plugin-tact/types/MappingExpression.ts

@@ -1,11 +1,11 @@
 const MappingExpression = {
-  print: ({ path, print }: any) => //JSON.stringify(path)
+  print: ({ node, path, print }: any) => //JSON.stringify(path)
   {
     return [
       'map<',
-      path.call(print, 'from'),
+      path.call(print, 'from') + (node.fromPrimitive != "" ? " as " + path.call(print, 'fromPrimitive'):""),
       ', ',
-      path.call(print, 'to'),
+      path.call(print, 'to') + (node.toPrimitive != "" ? " as " + path.call(print, 'toPrimitive'):""),
       '>'
     ];
   }

syntaxes/tact.json

@@ -775,7 +775,7 @@
         "declaration-function": {
             "patterns": [
                 {
-                    "begin": "\\b((?:(?:public|get|extends|overrides|inline|virtual|mutates)|\\s+)*)\\s+(fun|native)\\s+(\\w+)\\b",
+                    "begin": "\\b((?:(?:public|get|extends|override|inline|virtual|mutates)|\\s+)*)\\s+(fun|native)\\s+(\\w+)\\b",
                     "beginCaptures": {
                         "1": {
                             "name": "keyword.control.flow"