Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: patch 1.5.3 #30

Merged
merged 3 commits into from
Jan 27, 2025
Merged

fix: patch 1.5.3 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cc27a4
fix: patch highlighting of serialization formats and removal of inval…
novusnota Jan 27, 2025
a7cb092
feat: highlight `asm` as a keyword
novusnota Jan 27, 2025
c6bd57a
feat: update links to documentation pages for entities introduced in …
novusnota Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 44 additions & 30 deletions package/Tact.sublime-completions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
{
"trigger": "asm\tasm with optional arrangement (...)",
"contents": "asm $0",
"kind": ["function", "a", "Attribute"]
"kind": ["function", "a", "Attribute"],
"details": "<a href=\"https://docs.tact-lang.org/book/assembly-functions\">Tact Docs</a>"
},

// Literals, Base trait and constants
Expand Down Expand Up @@ -108,7 +109,8 @@
{
"trigger": "SendOnlyEstimateFee\tequal to 1024",
"contents": "SendOnlyEstimateFee",
"kind": ["variable", "c", "Constant"]
"kind": ["variable", "c", "Constant"],
"details": "<a href=\"https://docs.tact-lang.org/book/message-mode#base-modes\">Tact Docs</a>"
},
{
"trigger": "ReserveExact\tequal to 0",
Expand Down Expand Up @@ -163,12 +165,14 @@
{
"trigger": "StdAddress",
"contents": "StdAddress",
"kind": ["variable", "s", "Struct"]
"kind": ["variable", "s", "Struct"],
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced/#parsestdaddress\">Tact Docs</a>"
},
{
"trigger": "VarAddress",
"contents": "VarAddress",
"kind": ["variable", "s", "Struct"]
"kind": ["variable", "s", "Struct"],
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced/#parsevaraddress\">Tact Docs</a>"
},

// Built-in types and serialization options
Expand Down Expand Up @@ -630,22 +634,26 @@
{
"trigger": "slice\tSlice from a BoC String at compile-time",
"contents": "slice(${1:bocBase64String})",
"kind": "function"
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-comptime#slice\">Tact Docs</a>"
},
{
"trigger": "rawSlice\tSlice from a String at compile-time",
"contents": "rawSlice(${1:someString})",
"kind": "function"
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-comptime#rawslice\">Tact Docs</a>"
},
{
"trigger": "ascii\tInt sum of ASCII values at compile-time",
"trigger": "ascii\tInt of hex of ASCII characters at compile-time",
"contents": "aslii(${1:asciiString})",
"kind": "function"
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-comptime#ascii\">Tact Docs</a>"
},
{
"trigger": "crc32\tCRC32 of a String at compile-time",
"contents": "crc32(${1:someString})",
"kind": "function"
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-comptime#crc32\">Tact Docs</a>"
},

// Core library: Debug
Expand Down Expand Up @@ -694,12 +702,14 @@
{
"trigger": "parseStdAddress\tparse StdAddress from a Slice",
"contents": "parseStdAddress(${1:slice_Slice})",
"kind": "function"
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced/#parsestdaddress\">Tact Docs</a>"
},
{
"trigger": "parseVarAddress\tparse VarAddress from a Slice",
"contents": "parseVarAddress(${1:slice_Slice})",
"kind": "function"
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced/#parsevaraddress\">Tact Docs</a>"
},

// Core library: Random
Expand Down Expand Up @@ -868,66 +878,70 @@
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced#nativerandominterval\">Tact Docs</a>"
},
{
"trigger": "nativeSendMessage\tsend message Cell with mode Int",
"contents": "nativeSendMessage(${1:cell}, ${2:mode_Int})",
"trigger": "nativeSendMessage\tsend msg Cell with mode Int",
"contents": "nativeSendMessage(${1:msg_Cell}, ${2:mode_Int})",
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced#nativesendmessage\">Tact Docs</a>"
},
{
"trigger": "nativeSendMessageReturnForwardFee\tsend message Cell with mode Int and get fees",
"contents": "nativeSendMessageReturnForwardFee(${1:cell}, ${2:mode_Int})",
"kind": "function"
"trigger": "nativeSendMessageReturnForwardFee\tsend msg Cell with mode Int and get fees",
"contents": "nativeSendMessageReturnForwardFee(${1:msg_Cell}, ${2:mode_Int})",
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced#nativesendmessagereturnforwardfee\">Tact Docs</a>"
},
{
"trigger": "nativeReserve\treserve nanoToncoin amount Int with mode Int",
"contents": "nativeReserve(${1:amount_Int}, ${2:mode_Int})",
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced#nativereserve\">Tact Docs</a>"
},
{
"trigger": "nativeReserve\treserve nanoToncoin amount Int with mode Int",
"contents": "nativeReserve(${1:amount_Int}, ${2:mode_Int})",
"kind": "function"
},
{
"trigger": "gasConsumed\tget gas consumed so far",
"contents": "gasConsumed()",
"kind": "function"
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced/#gasconsumed\">Tact Docs</a>"
},
{
"trigger": "getComputeFee\tcalc compute cost in nanoToncoins",
"contents": "getComputeFee(${1:gas_used_Int, ${2:is_masterchain_Bool})",
"kind": "function"
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced/#getcomputefee\">Tact Docs</a>"
},
{
"trigger": "getStorageFee\tcalc storage fees in nanoToncoins",
"contents": "getStorageFee(${1:cells_Int, ${2:bits_Int}, ${3:seconds_Int}, ${4:is_masterchain_Bool})",
"kind": "function"
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced/#getstoragefee\">Tact Docs</a>"
},
{
"trigger": "getForwardFee\tcalc forward fees in nanoToncoins",
"contents": "getForwardFee(${1:cells_Int, ${2:bits_Int}, ${3:is_masterchain_Bool})",
"kind": "function"
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced/#getforwardfee\">Tact Docs</a>"
},
{
"trigger": "getSimpleComputeFee\tcalc extra compute cost in nanoToncoins",
"contents": "getSimpleComputeFee(${1:gas_used_Int, ${2:is_masterchain_Bool})",
"kind": "function"
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced/#getsimplecomputefee\">Tact Docs</a>"
},
{
"trigger": "getSimpleForwardFee\tcalc extra forward fees in nanoToncoins",
"contents": "getSimpleForwardFee(${1:cells_Int, ${2:bits_Int}, ${3:is_masterchain_Bool})",
"kind": "function"
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced/#getsimpleforwardfee\">Tact Docs</a>"
},
{
"trigger": "getOriginalFwdFee\tcalc original fwd_fee in nanoToncoins",
"contents": "getOriginalFwdFee(${1:fwd_fee_Int, ${2:is_masterchain_Bool})",
"kind": "function"
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced/#getoriginalfwdfee\">Tact Docs</a>"
},
{
"trigger": "myStorageDue\tstorage fee debt in nanoToncoins",
"contents": "myStorageDue(${1:fwd_fee_Int, ${2:is_masterchain_Bool})",
"kind": "function"
"contents": "myStorageDue()",
"kind": "function",
"details": "<a href=\"https://docs.tact-lang.org/ref/core-advanced/#mystoragedue\">Tact Docs</a>"
},
]
}
24 changes: 13 additions & 11 deletions package/Tact.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,12 @@
<dict>
<key>name</key>
<string>Tact</string>
<key>displayName</key>
<string>Tact</string>
<key>scopeName</key>
<string>source.tact</string>
<key>fileTypes</key>
<array>
<string>tact</string>
</array>
<key>foldingStartMarker</key>
<string>\{\s*$</string>
<key>foldingStopMarker</key>
<string>^\s*\}</string>
<key>patterns</key>
<array>
<dict>
Expand Down Expand Up @@ -128,7 +122,7 @@
<key>todo</key>
<dict>
<key>match</key>
<string>(?i)\b(FIXME|TODO|CHANGED|XXX|IDEA|HACK|NOTE|REVIEW|NB|BUG)\b(?-i)</string>
<string>\b(FIXME|TODO|CHANGED|XXX|IDEA|HACK|NOTE|REVIEW|NB|BUG)\b</string>
<key>name</key>
<string>keyword.comment.todo.tact</string>
</dict>
Expand Down Expand Up @@ -222,7 +216,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>entity.other.attribute-name.tact</string>
<string>keyword.other.asm.tact</string>
</dict>
<key>2</key>
<dict>
Expand Down Expand Up @@ -274,10 +268,18 @@
<key>comment</key>
<string>Fallback match</string>
<key>match</key>
<string>(?&lt;!\.)\b(@name|@interface|asm)\b</string>
<string>(?&lt;!\.)\b(@name|@interface)\b</string>
<key>name</key>
<string>entity.other.attribute-name.tact</string>
</dict>
<dict>
<key>comment</key>
<string>Fallback match</string>
<key>match</key>
<string>(?&lt;!\.)\b(asm)\b</string>
<key>name</key>
<string>keyword.other.asm.tact</string>
</dict>
</array>
</dict>
<key>literal</key>
Expand Down Expand Up @@ -617,7 +619,7 @@
<array>
<dict>
<key>match</key>
<string>(?&lt;!\.)\b(as)\s+(coins|remaining|bytes32|bytes64|int257|u?int(?:2[0-5][0-6]|1[0-9][0-9]|[1-9][0-9]?))\b</string>
<string>(?&lt;!\.)\b(as)\s+(coins|remaining|bytes(?:32|64)|int257|u?int(?:25[0-6]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?))\b</string>
<key>captures</key>
<dict>
<key>1</key>
Expand Down Expand Up @@ -929,4 +931,4 @@
</dict>
</dict>
</dict>
</plist>
</plist>
16 changes: 9 additions & 7 deletions package/Tact.tmLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
{
"name": "Tact",
"displayName": "Tact",
"scopeName": "source.tact",
"fileTypes": [
"tact"
],
"foldingStartMarker": "\\{\\s*$",
"foldingStopMarker": "^\\s*\\}",
"patterns": [
{
"include": "#comment"
Expand Down Expand Up @@ -84,7 +81,7 @@
},

"todo": {
"match": "(?i)\\b(FIXME|TODO|CHANGED|XXX|IDEA|HACK|NOTE|REVIEW|NB|BUG)\\b(?-i)",
"match": "\\b(FIXME|TODO|CHANGED|XXX|IDEA|HACK|NOTE|REVIEW|NB|BUG)\\b",
"name": "keyword.comment.todo.tact"
},

Expand Down Expand Up @@ -143,7 +140,7 @@
"begin": "(?<!\\.)(asm)\\s*(\\()",
"beginCaptures": {
"1": {
"name": "entity.other.attribute-name.tact"
"name": "keyword.other.asm.tact"
},
"2": {
"name": "punctuation.brackets.round.tact"
Expand Down Expand Up @@ -177,8 +174,13 @@
},
{
"comment": "Fallback match",
"match": "(?<!\\.)\\b(@name|@interface|asm)\\b",
"match": "(?<!\\.)\\b(@name|@interface)\\b",
"name": "entity.other.attribute-name.tact"
},
{
"comment": "Fallback match",
"match": "(?<!\\.)\\b(asm)\\b",
"name": "keyword.other.asm.tact"
}
]
},
Expand Down Expand Up @@ -402,7 +404,7 @@
"comment": "Serialization",
"patterns": [
{
"match": "(?<!\\.)\\b(as)\\s+(coins|remaining|bytes32|bytes64|int257|u?int(?:2[0-5][0-6]|1[0-9][0-9]|[1-9][0-9]?))\\b",
"match": "(?<!\\.)\\b(as)\\s+(coins|remaining|bytes(?:32|64)|int257|u?int(?:25[0-6]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?))\\b",
"captures": {
"1": {
"name": "keyword.other.as.tact storage.modifier.tact"
Expand Down
2 changes: 1 addition & 1 deletion tests/syntax_test_import.tact
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "@stdlib/deploy";
// ^ string.quoted.double.tact punctuation.definition.string.end.tact
// ^ punctuation.semi.tact

// comment
// NOTE: comment
// <- comment.line.double-slash.tact punctuation.definition.comment.line.double-slash.tact

/* multi-line comment/doc-string */
Expand Down
2 changes: 1 addition & 1 deletion tests/syntax_test_struct.tact
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ struct Serialization {
// ^^^^^^ entity.name.type.tact
f7: Int as uint200;
// ^^^^^^^ entity.name.type.tact
f8: Int as int200;
f8: Int as int249;
// ^^^^^^ entity.name.type.tact
f9: Int as uint256;
// ^^^^^^^ entity.name.type.tact
Expand Down
Loading