more strict typescript-eslint rules

client/src/client-log.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-base-to-string */
 import * as vscode from "vscode"
 
 let consoleLogChannel: vscode.OutputChannel | null = null

client/src/extension.ts

@@ -89,7 +89,7 @@ async function showReferencesImpl(
     client: LanguageClient | undefined,
     uri: string,
     position: Position,
-) {
+): Promise<void> {
     if (!client) return
     await vscode.commands.executeCommand(
         "editor.action.showReferences",
@@ -99,7 +99,7 @@ async function showReferencesImpl(
     )
 }
 
-function registerCommands(disposables: vscode.Disposable[]) {
+function registerCommands(disposables: vscode.Disposable[]): void {
     disposables.push(
         vscode.commands.registerCommand(
             "tact.showParent",

eslint.config.mjs

@@ -42,40 +42,39 @@ export default tseslint.config(
         },
 
         rules: {
-            // override stylisticTypeChecked
+            // override typescript-eslint
             "@typescript-eslint/no-empty-function": ["error", {allow: ["arrowFunctions"]}],
             "@typescript-eslint/no-inferrable-types": "off",
             "@typescript-eslint/typedef": [
                 "error",
                 {parameter: true, memberVariableDeclaration: true},
             ],
             "@typescript-eslint/consistent-generic-constructors": ["error", "type-annotation"],
+            "@typescript-eslint/no-unused-vars": [
+                "error",
+                {
+                    argsIgnorePattern: "^_",
+                    caughtErrorsIgnorePattern: "^_",
+                    varsIgnorePattern: "^_",
+                },
+            ],
+            "@typescript-eslint/explicit-function-return-type": [
+                "error",
+                {
+                    allowExpressions: true,
+                },
+            ],
             "@typescript-eslint/prefer-optional-chain": "off",
-
-            // override strictTypeChecked
-            "@typescript-eslint/no-unused-vars": "off",
-            "@typescript-eslint/no-base-to-string": "off",
-            "@typescript-eslint/unbound-method": "off",
-            "@typescript-eslint/no-misused-promises": "off",
             "@typescript-eslint/no-extraneous-class": "off",
-
-            "@typescript-eslint/prefer-readonly": "error",
-            "@typescript-eslint/switch-exhaustiveness-check": "error",
-
-            "@unused-imports/no-unused-imports": "error",
-            "no-duplicate-imports": "error",
-
             "@typescript-eslint/no-magic-numbers": "off",
             "@typescript-eslint/no-unsafe-type-assertion": "off",
             "@typescript-eslint/prefer-readonly-parameter-types": "off",
             "@typescript-eslint/member-ordering": "off",
-            "@typescript-eslint/explicit-function-return-type": "off",
             "@typescript-eslint/parameter-properties": "off",
             "@typescript-eslint/method-signature-style": "off",
             "@typescript-eslint/prefer-destructuring": "off",
             "@typescript-eslint/strict-boolean-expressions": "off",
             "@typescript-eslint/no-use-before-define": "off",
-
             "@typescript-eslint/class-methods-use-this": "off",
             "@typescript-eslint/no-shadow": "off",
             "@typescript-eslint/consistent-type-imports": "off",
@@ -84,6 +83,9 @@ export default tseslint.config(
             "@typescript-eslint/no-invalid-this": "off",
             "@typescript-eslint/init-declarations": "off",
 
+            "@unused-imports/no-unused-imports": "error",
+            "no-duplicate-imports": "error",
+
             // override unicorn
             "unicorn/no-null": "off",
             "unicorn/prevent-abbreviations": "off",

server/src/TypeInferer.ts

@@ -346,21 +346,21 @@ export class TypeInferer {
         return null
     }
 
-    private primitiveType(name: string) {
+    private primitiveType(name: string): PrimitiveTy | null {
         const node = index.elementByName(IndexKey.Primitives, name)
         if (!node) return null
         return new PrimitiveTy(name, node, null)
     }
 
-    private inferTypeMaybeOption(typeNode: SyntaxNode, resolved: Node) {
+    private inferTypeMaybeOption(typeNode: SyntaxNode, resolved: Node): Ty | null {
         const inferred = this.inferType(new Expression(typeNode, resolved.file))
         if (inferred && !(inferred instanceof OptionTy) && typeNode.nextSibling?.text === "?") {
             return new OptionTy(inferred)
         }
         return inferred
     }
 
-    private inferTypeMaybeTlB(typeNode: SyntaxNode, resolved: Node) {
+    private inferTypeMaybeTlB(typeNode: SyntaxNode, resolved: Node): Ty | null {
         const inferredType = this.inferTypeMaybeOption(typeNode, resolved)
         if (inferredType instanceof PrimitiveTy) {
             const tlb = resolved.node.childForFieldName("tlb")

server/src/completion/providers/PostfixCompletionProvider.ts

@@ -28,7 +28,7 @@ export class PostfixCompletionProvider implements CompletionProvider {
         description: string,
         snippet: string,
         result: CompletionResult,
-    ) {
+    ): void {
         const expr = ctx.element.node.parent
         if (expr?.type !== "field_access_expression") return
         const object = expr.childForFieldName("object")

server/src/documentation/documentation.ts

@@ -284,6 +284,6 @@ function extractCommentsDoc(node: NamedNode): string {
     return result.trimEnd()
 }
 
-function defaultResult(signature: string, documentation: string = "") {
+function defaultResult(signature: string, documentation: string = ""): string {
     return DOC_TMPL.replace("{signature}", signature).replace("{documentation}", documentation)
 }

server/src/documentation/receivers_documentation.ts

@@ -79,7 +79,7 @@ export function generateReceiverDoc(func: MessageFunction): string | null {
     return defaultResult(name, "", link)
 }
 
-function defaultResult(name: string, doc: string, link: string) {
+function defaultResult(name: string, doc: string, link: string): string {
     return (
         `${CODE_FENCE}tact\n${name} {}\n${CODE_FENCE}` +
         "\n" +

server/src/e2e/runTest.ts

@@ -1,7 +1,7 @@
 import * as path from "node:path"
 import {runTests} from "@vscode/test-electron"
 
-async function main() {
+async function main(): Promise<void> {
     try {
         const extensionDevelopmentPath = path.resolve(__dirname, "../../../")
         const extensionTestsPath = path.resolve(__dirname, "./out/suite/index.js")

server/src/e2e/suite/completion.test.ts

@@ -29,7 +29,7 @@ suite("Completion Test Suite", () => {
             )
         }
 
-        protected runTest(testFile: string, testCase: TestCase) {
+        protected runTest(testFile: string, testCase: TestCase): void {
             test(`Completion: ${testCase.name}`, async () => {
                 const completions = await this.getCompletions(testCase.input, ".")
 

server/src/e2e/suite/doc.test.ts

@@ -41,7 +41,7 @@ suite("Documentation Test Suite", () => {
             return (hover.contents as lsp.MarkupContent).value.trimEnd()
         }
 
-        protected runTest(testFile: string, testCase: TestCase) {
+        protected runTest(testFile: string, testCase: TestCase): void {
             test(`Documentation: ${testCase.name}`, async () => {
                 const hovers = await this.getHovers(testCase.input)
                 const actual = hovers

server/src/e2e/suite/inspection.test.ts

@@ -28,7 +28,7 @@ suite("Inspection Test Suite", () => {
                 .join("\n")
         }
 
-        protected runTest(testFile: string, testCase: TestCase) {
+        protected runTest(testFile: string, testCase: TestCase): void {
             test(`Inspection: ${testCase.name}`, async () => {
                 await this.replaceDocumentText(testCase.input)
 

server/src/e2e/suite/intentions.test.ts

@@ -39,7 +39,7 @@ suite("Intentions Test Suite", () => {
             )
         }
 
-        protected runTest(testFile: string, testCase: TestCase) {
+        protected runTest(testFile: string, testCase: TestCase): void {
             test(`Intention: ${testCase.name}`, async () => {
                 const actions = await this.getCodeActions(testCase.input)
 

server/src/e2e/suite/references.test.ts

@@ -65,7 +65,7 @@ suite("References Test Suite", () => {
                 .join("\n\n")
         }
 
-        protected runTest(testFile: string, testCase: TestCase) {
+        protected runTest(testFile: string, testCase: TestCase): void {
             test(`References: ${testCase.name}`, async () => {
                 const caretIndexes = this.findCaretPositions(testCase.input)
                 const positions = caretIndexes.map(index =>

server/src/e2e/suite/rename.test.ts

@@ -32,7 +32,7 @@ suite("Rename Test Suite", () => {
             return positions
         }
 
-        private async renameTo(position: vscode.Position, newName: string) {
+        private async renameTo(position: vscode.Position, newName: string): Promise<void> {
             const result = await vscode.commands.executeCommand<vscode.WorkspaceEdit | undefined>(
                 "vscode.executeDocumentRenameProvider",
                 this.document.uri,
@@ -45,7 +45,7 @@ suite("Rename Test Suite", () => {
             }
         }
 
-        protected runTest(testFile: string, testCase: TestCase) {
+        protected runTest(testFile: string, testCase: TestCase): void {
             test(`Rename: ${testCase.name}`, async () => {
                 const positions = this.findRenamePositions(testCase.input)
 

server/src/e2e/suite/resolve.test.ts

@@ -63,7 +63,7 @@ suite("Resolve Test Suite", () => {
                 .join("\n")
         }
 
-        protected runTest(testFile: string, testCase: TestCase) {
+        protected runTest(testFile: string, testCase: TestCase): void {
             test(`Resolve: ${testCase.name}`, async () => {
                 const caretIndexes = this.findCaretPositions(testCase.input)
                 const positions = caretIndexes.map(index =>

server/src/e2e/suite/types.test.ts

@@ -65,7 +65,7 @@ suite("Type Inference Test Suite", () => {
             return response.type ?? undefined
         }
 
-        protected runTest(testFile: string, testCase: TestCase) {
+        protected runTest(testFile: string, testCase: TestCase): void {
             test(`Types: ${testCase.name}`, async () => {
                 const positions = this.findTypePositions(testCase.input)
 

server/src/fift/foldings/collect.ts

@@ -1,7 +1,7 @@
 import {FoldingRange, FoldingRangeKind} from "vscode-languageserver-types"
 import {RecursiveVisitor} from "@server/psi/visitor"
 import type {File} from "@server/psi/File"
-import {Point} from "web-tree-sitter"
+import type {Point} from "web-tree-sitter"
 import type * as lsp from "vscode-languageserver"
 
 export function collectFift(file: File): FoldingRange[] {

server/src/fift/semantic_tokens/collect.ts

@@ -19,7 +19,7 @@ export function collectFift(
 
     const builder = new SemanticTokensBuilder()
 
-    function pushToken(n: SyntaxNode, tokenType: lsp.SemanticTokenTypes) {
+    function pushToken(n: SyntaxNode, tokenType: lsp.SemanticTokenTypes): void {
         builder.push(
             n.startPosition.row,
             n.startPosition.column,

server/src/inspections/MissedFieldInContractInspection.ts

@@ -14,7 +14,7 @@ export class MissedFieldInContractInspection extends UnusedInspection implements
         })
     }
 
-    private inspectContract(contract: Contract, diagnostics: lsp.Diagnostic[]) {
+    private inspectContract(contract: Contract, diagnostics: lsp.Diagnostic[]): void {
         const inheritedTraits = contract.inheritTraits()
         if (inheritedTraits.length === 0) return // nothing to check
 

server/src/inspections/StructInitializationInspection.ts

@@ -22,7 +22,7 @@ export class StructInitializationInspection implements Inspection {
         return diagnostics
     }
 
-    private checkStructLiteral(node: SyntaxNode, diagnostics: lsp.Diagnostic[]) {
+    private checkStructLiteral(node: SyntaxNode, diagnostics: lsp.Diagnostic[]): void {
         const structName = node.childForFieldName("name")
         if (!structName) return
         const args = node.childForFieldName("arguments")

server/src/inspections/UnusedContractMembersInspection.ts

@@ -14,7 +14,7 @@ export class UnusedContractMembersInspection extends UnusedInspection implements
         })
     }
 
-    private inspectContract(contract: Contract, diagnostics: lsp.Diagnostic[]) {
+    private inspectContract(contract: Contract, diagnostics: lsp.Diagnostic[]): void {
         contract.ownFields().forEach(field => {
             const nameIdent = field.nameIdentifier()
             if (!nameIdent) return

server/src/inspections/UnusedParameterInspection.ts

@@ -25,7 +25,7 @@ export class UnusedParameterInspection extends UnusedInspection implements Inspe
         })
     }
 
-    private inspectFunction(fun: Fun, diagnostics: lsp.Diagnostic[]) {
+    private inspectFunction(fun: Fun, diagnostics: lsp.Diagnostic[]): void {
         if (!fun.hasBody()) return
         const parameters = fun.parameters()
 

server/src/intentions/AddExplicitType.ts

@@ -5,6 +5,7 @@ import {asLspPosition, asParserPoint} from "@server/utils/position"
 import type {Position} from "vscode-languageclient"
 import {VarDeclaration} from "@server/psi/Node"
 import {FileDiff} from "@server/utils/FileDiff"
+import type {Node as SyntaxNode} from "web-tree-sitter"
 
 export class AddExplicitType implements Intention {
     public readonly id: string = "tact.add-explicit-type"
@@ -42,7 +43,7 @@ export class AddExplicitType implements Intention {
     }
 }
 
-function nodeAtPosition(pos: Position, file: File) {
+function nodeAtPosition(pos: Position, file: File): SyntaxNode | null {
     const cursorPosition = asParserPoint(pos)
     return file.rootNode.descendantForPosition(cursorPosition)
 }

server/src/intentions/AddFieldInitialization.ts

@@ -7,6 +7,7 @@ import {FileDiff} from "@server/utils/FileDiff"
 import {Field, StorageMembersOwner} from "@server/psi/Decls"
 import type {Ty} from "@server/types/BaseTy"
 import {RecursiveVisitor} from "@server/psi/RecursiveVisitor"
+import type {Node as SyntaxNode} from "web-tree-sitter"
 
 export class AddFieldInitialization implements Intention {
     public readonly id: string = "tact.add-field-to-init"
@@ -125,7 +126,7 @@ export class AddFieldInitialization implements Intention {
         resolved: Field,
         type: Ty,
         owner: StorageMembersOwner,
-    ) {
+    ): WorkspaceEdit {
         const initFunctionTemplate = `
     init($name: $type) {
         self.$name = $name;
@@ -162,7 +163,7 @@ export class AddFieldInitialization implements Intention {
     }
 }
 
-function nodeAtPosition(pos: Position, file: File) {
+function nodeAtPosition(pos: Position, file: File): SyntaxNode | null {
     const cursorPosition = asParserPoint(pos)
     return file.rootNode.descendantForPosition(cursorPosition)
 }

server/src/intentions/AddImport.ts

@@ -7,6 +7,7 @@ import {NamedNode} from "@server/psi/Node"
 import {FileDiff} from "@server/utils/FileDiff"
 import {Reference} from "@server/psi/Reference"
 import {Contract, Primitive} from "@server/psi/Decls"
+import type {Node as SyntaxNode} from "web-tree-sitter"
 
 export class AddImport implements Intention {
     public readonly id: string = "tact.add-import"
@@ -49,7 +50,7 @@ export class AddImport implements Intention {
     }
 }
 
-function nodeAtPosition(pos: Position, file: File) {
+function nodeAtPosition(pos: Position, file: File): SyntaxNode | null {
     const cursorPosition = asParserPoint(pos)
     return file.rootNode.descendantForPosition(cursorPosition)
 }

server/src/intentions/FillAllStructInit.ts

@@ -44,7 +44,10 @@ export class FillStructInitBase implements Intention {
         return args.length === 0
     }
 
-    private static findBraces(instance: SyntaxNode) {
+    private static findBraces(instance: SyntaxNode): {
+        openBrace: SyntaxNode
+        closeBrace: SyntaxNode
+    } | null {
         const args = instance.childForFieldName("arguments")
         if (!args) return null
 
@@ -54,7 +57,7 @@ export class FillStructInitBase implements Intention {
         return {openBrace, closeBrace}
     }
 
-    private static findIndent(ctx: IntentionContext, instance: SyntaxNode) {
+    private static findIndent(ctx: IntentionContext, instance: SyntaxNode): number {
         const lines = ctx.file.content.split(/\r?\n/)
         const line = lines[instance.startPosition.row]
         const lineTrim = line.trimStart()
@@ -201,7 +204,7 @@ export class FillRequiredStructInit extends FillStructInitBase {
     }
 }
 
-function nodeAtPosition(pos: Position, file: File) {
+function nodeAtPosition(pos: Position, file: File): SyntaxNode | null {
     const cursorPosition = asParserPoint(pos)
     return file.rootNode.descendantForPosition(cursorPosition)
 }

server/src/intentions/WrapSelected.ts

@@ -74,7 +74,7 @@ export class WrapSelected implements Intention {
         return this.findStatements(ctx).length > 0
     }
 
-    private static findIndent(ctx: IntentionContext, node: SyntaxNode) {
+    private static findIndent(ctx: IntentionContext, node: SyntaxNode): number {
         const lines = ctx.file.content.split(/\r?\n/)
         const line = lines[node.startPosition.row]
         const lineTrim = line.trimStart()