feat(tolk/inspections): don't require ; in grammar and give an error later (#126)

Fixes #125

Author: i582

package.json

@@ -435,7 +435,8 @@
                                 "unused-import",
                                 "struct-initialization",
                                 "cannot-reassign",
-                                "need-not-null-unwrapping"
+                                "need-not-null-unwrapping",
+                                "missed-semicolon"
                             ]
                         },
                         "default": [

server/src/e2e/tolk/testcases/inspections/MissedSemicolonInspection.test

@@ -0,0 +1,50 @@
+========================================================================
+Missed ; after variable declaration
+========================================================================
+fun main() {
+    var a = 100
+    a = 100;
+}
+------------------------------------------------------------------------
+0 1:15 to 1:15 Missed `;` at end of statement (tolk)
+
+========================================================================
+Missed ; after assignment
+========================================================================
+fun main() {
+    var a = 100;
+    a = 100
+    return a
+}
+------------------------------------------------------------------------
+0 2:11 to 2:11 Missed `;` at end of statement (tolk)
+
+========================================================================
+Missed ; after expression in if
+========================================================================
+fun main() {
+    var a = 100;
+    if (a == 200) {
+        200
+        a = 200
+    }
+    return a
+}
+------------------------------------------------------------------------
+0 3:11 to 3:11 Missed `;` at end of statement (tolk)
+
+========================================================================
+Missed ; after do-while
+========================================================================
+fun main() {
+    var a = 100;
+    if (a == 200) {
+        do {
+            a -= 1
+        } while (a > 10)
+        a = 200
+    }
+    return a
+}
+------------------------------------------------------------------------
+0 5:24 to 5:24 Missed `;` at end of statement (tolk)

server/src/languages/tolk/inspections/Inspection.ts

@@ -13,6 +13,7 @@ export const InspectionIds = {
     STRUCT_INITIALIZATION: "struct-initialization",
     TYPE_COMPATIBILITY: "type-compatibility",
     CANNOT_REASSIGN: "cannot-reassign",
+    MISSED_SEMICOLON: "missed-semicolon",
     NEED_NOT_NULL_UNWRAPPING: "need-not-null-unwrapping",
 } as const
 

server/src/languages/tolk/inspections/MissedSemicolonInspection.ts

@@ -0,0 +1,63 @@
+//  SPDX-License-Identifier: MIT
+//  Copyright © 2025 TON Core
+import * as lsp from "vscode-languageserver"
+import type {TolkFile} from "@server/languages/tolk/psi/TolkFile"
+import {Inspection, InspectionIds} from "./Inspection"
+import {RecursiveVisitor} from "@server/visitor/visitor"
+import {asLspRange} from "@server/utils/position"
+
+export class MissedSemicolonInspection implements Inspection {
+    public readonly id: "missed-semicolon" = InspectionIds.MISSED_SEMICOLON
+
+    public inspect(file: TolkFile): lsp.Diagnostic[] {
+        if (file.fromStdlib) return []
+        const diagnostics: lsp.Diagnostic[] = []
+        this.checkFile(file, diagnostics)
+        return diagnostics
+    }
+
+    protected checkFile(file: TolkFile, diagnostics: lsp.Diagnostic[]): void {
+        RecursiveVisitor.visit(file.rootNode, (node): boolean => {
+            if (node.type === "block_statement") {
+                const statements = node.namedChildren.filter(it => it?.type !== "comment")
+                for (const [index, stmt] of statements.entries()) {
+                    if (!stmt) break
+                    const stmtType = stmt.type
+
+                    if (
+                        stmtType === "local_vars_declaration" ||
+                        stmtType === "return_statement" ||
+                        stmtType === "do_while_statement" ||
+                        stmtType === "break_statement" ||
+                        stmtType === "continue_statement" ||
+                        stmtType === "throw_statement" ||
+                        stmtType === "assert_statement" ||
+                        stmtType === "expression_statement"
+                    ) {
+                        const nextSibling = stmt.nextSibling
+                        if (nextSibling?.text !== ";" && index !== statements.length - 1) {
+                            const stmtRange = asLspRange(stmt)
+                            diagnostics.push({
+                                severity: lsp.DiagnosticSeverity.Error,
+                                range: {
+                                    start: {
+                                        line: stmtRange.end.line,
+                                        character: stmtRange.end.character,
+                                    },
+                                    end: {
+                                        line: stmtRange.end.line,
+                                        character: stmtRange.end.character,
+                                    },
+                                },
+                                message: `Missed \`;\` at end of statement`,
+                                source: "tolk",
+                                code: "parser",
+                            })
+                        }
+                    }
+                }
+            }
+            return true
+        })
+    }
+}

server/src/languages/tolk/inspections/index.ts

@@ -12,6 +12,7 @@ import {CannotReassignInspection} from "@server/languages/tolk/inspections/Canno
 import {UnusedTopLevelDeclarationInspection} from "@server/languages/tolk/inspections/UnusedTopLevelDeclarationInspection"
 import {UnusedTypeParameterInspection} from "@server/languages/tolk/inspections/UnusedTypeParameterInspection"
 import {NeedNotNullUnwrappingInspection} from "@server/languages/tolk/inspections/NeedNotNullUnwrappingInspection"
+import {MissedSemicolonInspection} from "@server/languages/tolk/inspections/MissedSemicolonInspection"
 
 export async function runTolkInspections(
     uri: string,
@@ -29,6 +30,7 @@ export async function runTolkInspections(
         new TypeCompatibilityInspection(),
         new CannotReassignInspection(),
         new NeedNotNullUnwrappingInspection(),
+        new MissedSemicolonInspection(),
     ]
 
     const settings = await getDocumentSettings(uri)

server/src/languages/tolk/tree-sitter-tolk/grammar.js

@@ -218,12 +218,12 @@ const TOLK_GRAMMAR = {
             $.continue_statement,
             $.throw_statement,
             $.assert_statement,
+            $.expression_statement,
         ),
     _statement: $ =>
         choice(
             $._statement_ending_with_brace,
-            seq($._statement_require_semicolon_unless_last, ";"),
-            prec.right(seq($.expression_statement, optional(";"))),
+            prec.right(seq($._statement_require_semicolon_unless_last, optional(";"))),
         ),
 
     local_vars_declaration: $ =>