refactor: move more features from server.ts (#727)

Author: i582

client/src/extension.ts

@@ -14,15 +14,15 @@ import {
 import {consoleError, createClientLog} from "./client-log"
 import {getClientConfiguration} from "./client-config"
 import {
-    GetDocumentationAtPositionRequest,
-    GetTypeAtPositionParams,
-    GetTypeAtPositionRequest,
-    GetTypeAtPositionResponse,
+    DocumentationAtPositionRequest,
+    TypeAtPositionParams,
+    TypeAtPositionRequest,
+    TypeAtPositionResponse,
     SetToolchainVersionNotification,
     SetToolchainVersionParams,
-    GetGasConsumptionForSelectionRequest,
-    GetGasConsumptionForSelectionParams,
-    GetGasConsumptionForSelectionResponse,
+    GasConsumptionForSelectionRequest,
+    GasConsumptionForSelectionParams,
+    GasConsumptionForSelectionResponse,
     SearchByTypeRequest,
     SearchByTypeParams,
     SearchByTypeResponse,
@@ -376,8 +376,8 @@ Node.js: ${info.environment.nodeVersion ?? "Unknown"}`
             },
         ),
         vscode.commands.registerCommand(
-            GetTypeAtPositionRequest,
-            async (params: GetTypeAtPositionParams | undefined) => {
+            TypeAtPositionRequest,
+            async (params: TypeAtPositionParams | undefined) => {
                 if (!client) {
                     return null
                 }
@@ -400,8 +400,8 @@ Node.js: ${info.environment.nodeVersion ?? "Unknown"}`
                     }
                 }
 
-                const result = await client.sendRequest<GetTypeAtPositionResponse>(
-                    GetTypeAtPositionRequest,
+                const result = await client.sendRequest<TypeAtPositionResponse>(
+                    TypeAtPositionRequest,
                     params,
                 )
 
@@ -424,14 +424,14 @@ Node.js: ${info.environment.nodeVersion ?? "Unknown"}`
             },
         ),
         vscode.commands.registerCommand(
-            GetDocumentationAtPositionRequest,
-            async (params: GetTypeAtPositionParams | undefined) => {
+            DocumentationAtPositionRequest,
+            async (params: TypeAtPositionParams | undefined) => {
                 if (!client || !params) {
                     return null
                 }
 
-                return client.sendRequest<GetTypeAtPositionResponse>(
-                    GetDocumentationAtPositionRequest,
+                return client.sendRequest<TypeAtPositionResponse>(
+                    DocumentationAtPositionRequest,
                     params,
                 )
             },
@@ -992,7 +992,7 @@ async function updateGasStatusBar(editor: vscode.TextEditor): Promise<void> {
     }
 
     try {
-        const params: GetGasConsumptionForSelectionParams = {
+        const params: GasConsumptionForSelectionParams = {
             textDocument: {
                 uri: editor.document.uri.toString(),
             },
@@ -1008,8 +1008,8 @@ async function updateGasStatusBar(editor: vscode.TextEditor): Promise<void> {
             },
         }
 
-        const result = await client.sendRequest<GetGasConsumptionForSelectionResponse>(
-            GetGasConsumptionForSelectionRequest,
+        const result = await client.sendRequest<GasConsumptionForSelectionResponse>(
+            GasConsumptionForSelectionRequest,
             params,
         )
 

server/src/languages/fift/foldings/collect.ts

@@ -6,7 +6,7 @@ import type {Point} from "web-tree-sitter"
 import type * as lsp from "vscode-languageserver"
 import {FiftFile} from "@server/languages/fift/psi/FiftFile"
 
-export function collectFift(file: FiftFile): FoldingRange[] {
+export function provideFiftFoldingRanges(file: FiftFile): FoldingRange[] {
     const result: FoldingRange[] = []
 
     const genericFolding = (start: Point, end: Point): lsp.FoldingRange => {

server/src/languages/fift/references/index.ts

@@ -0,0 +1,17 @@
+import type {Node as SyntaxNode} from "web-tree-sitter"
+import {FiftFile} from "@server/languages/fift/psi/FiftFile"
+import * as lsp from "vscode-languageserver"
+import {FiftReferent} from "@server/languages/fift/psi/FiftReferent"
+import {asLspRange} from "@server/utils/position"
+
+export function provideFiftReferences(node: SyntaxNode, file: FiftFile): lsp.Location[] | null {
+    if (node.type !== "identifier") return []
+
+    const result = new FiftReferent(node, file).findReferences(false)
+    if (result.length === 0) return null
+
+    return result.map(n => ({
+        uri: n.file.uri,
+        range: asLspRange(n.node),
+    }))
+}

server/src/languages/fift/semantic_tokens/collect.ts renamed to server/src/languages/fift/semantic-tokens/index.ts

@@ -9,7 +9,7 @@ import * as lsp from "vscode-languageserver"
 import {FiftReference} from "@server/languages/fift/psi/FiftReference"
 import {FiftFile} from "@server/languages/fift/psi/FiftFile"
 
-export function collectFift(
+export function provideFiftSemanticTokens(
     file: FiftFile,
     settings: {
         enabled: boolean

server/src/languages/tact/TypeInferer.ts

@@ -18,7 +18,7 @@ import {Reference} from "@server/languages/tact/psi/Reference"
 import {Struct, Message, Fun, Primitive, Contract, Trait} from "@server/languages/tact/psi/Decls"
 import {isTypeOwnerNode} from "@server/languages/tact/psi/utils"
 import type {Node as SyntaxNode} from "web-tree-sitter"
-import {CACHE} from "../../cache"
+import {CACHE} from "./cache"
 import {index, IndexKey} from "@server/languages/tact/indexes"
 
 export class TypeInferer {

server/src/cache.ts renamed to server/src/languages/tact/cache.ts

@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //  Copyright © 2025 TON Studio
-import {ResolveState, ScopeProcessor} from "@server/languages/tact/psi/Reference"
+import {ScopeProcessor} from "@server/languages/tact/psi/Reference"
 import {NamedNode, TactNode} from "@server/languages/tact/psi/TactNode"
 import {
     Constant,
@@ -24,6 +24,7 @@ import {MessageTy, StructTy} from "@server/languages/tact/types/BaseTy"
 import {tactCodeBlock} from "@server/languages/tact/documentation/documentation"
 import {trimPrefix} from "@server/utils/strings"
 import {TactFile} from "@server/languages/tact/psi/TactFile"
+import {ResolveState} from "@server/psi/ResolveState"
 
 export interface CompletionItemAdditionalInformation {
     readonly name: string | undefined

server/src/languages/tact/completion/ReferenceCompletionProcessor.ts

@@ -2,11 +2,12 @@
 //  Copyright © 2025 TON Studio
 import type {CompletionProvider} from "@server/languages/tact/completion/CompletionProvider"
 import type {CompletionContext} from "@server/languages/tact/completion/CompletionContext"
-import {Reference, ResolveState, ScopeProcessor} from "@server/languages/tact/psi/Reference"
+import {Reference, ScopeProcessor} from "@server/languages/tact/psi/Reference"
 import {ReferenceCompletionProcessor} from "@server/languages/tact/completion/ReferenceCompletionProcessor"
 import {NamedNode, TactNode} from "@server/languages/tact/psi/TactNode"
 import {FieldsOwner} from "@server/languages/tact/psi/Decls"
 import type {CompletionResult} from "@server/languages/tact/completion/WeightedCompletionItem"
+import {ResolveState} from "@server/psi/ResolveState"
 
 enum CompletionKind {
     ONLY_FIELDS = "ONLY_FIELDS",

server/src/languages/tact/completion/providers/ReferenceCompletionProvider.ts

@@ -1,8 +1,8 @@
 //  SPDX-License-Identifier: MIT
 //  Copyright © 2025 TON Studio
 import {
-    GetGasConsumptionForSelectionParams,
-    GetGasConsumptionForSelectionResponse,
+    GasConsumptionForSelectionParams,
+    GasConsumptionForSelectionResponse,
 } from "@shared/shared-msgtypes"
 import {asParserPoint} from "@server/utils/position"
 import type {Node as SyntaxNode, Point} from "web-tree-sitter"
@@ -13,9 +13,9 @@ import {computeGasConsumption} from "@server/languages/tact/asm/gas"
 import {TactFile} from "@server/languages/tact/psi/TactFile"
 import {findTactFile} from "@server/files"
 
-export async function selectionGasConsumption(
-    params: GetGasConsumptionForSelectionParams,
-): Promise<GetGasConsumptionForSelectionResponse> {
+export async function provideSelectionGasConsumption(
+    params: GasConsumptionForSelectionParams,
+): Promise<GasConsumptionForSelectionResponse> {
     try {
         const uri = params.textDocument.uri
         const file = findTactFile(uri)

server/src/languages/tact/selection-gas-consumption.ts renamed to server/src/languages/tact/custom/selection-gas-consumption.ts

@@ -0,0 +1,58 @@
+import type {Node as SyntaxNode} from "web-tree-sitter"
+import {TactFile} from "@server/languages/tact/psi/TactFile"
+import {Ty} from "@server/languages/tact/types/BaseTy"
+import {TypeInferer} from "@server/languages/tact/TypeInferer"
+import {Expression} from "@server/languages/tact/psi/TactNode"
+import {TypeAtPositionParams, TypeAtPositionResponse} from "@shared/shared-msgtypes"
+import {asLspRange, asParserPoint} from "@server/utils/position"
+
+export function provideTactTypeAtPosition(
+    params: TypeAtPositionParams,
+    file: TactFile,
+): TypeAtPositionResponse {
+    const cursorPosition = asParserPoint(params.position)
+    const node = file.rootNode.descendantForPosition(cursorPosition)
+    if (!node) return {type: null, range: null}
+
+    const adjustedNode = getAdjustedNodeForType(node)
+
+    const res = findTypeForNode(adjustedNode, file)
+    if (!res) {
+        return {
+            type: "void or unknown",
+            range: asLspRange(node),
+        }
+    }
+
+    const {ty, node: actualNode} = res
+
+    return {
+        type: ty.qualifiedName(),
+        range: asLspRange(actualNode),
+    }
+}
+
+function getAdjustedNodeForType(node: SyntaxNode): SyntaxNode {
+    const parent = node.parent
+    if (
+        parent?.type === "method_call_expression" ||
+        parent?.type === "static_call_expression" ||
+        parent?.type === "instance_expression"
+    ) {
+        return parent
+    }
+
+    return node
+}
+
+function findTypeForNode(node: SyntaxNode, file: TactFile): {ty: Ty; node: SyntaxNode} | null {
+    let nodeForType: SyntaxNode | null = node
+    while (nodeForType) {
+        const ty = TypeInferer.inferType(new Expression(nodeForType, file))
+        if (ty) return {ty, node: nodeForType}
+        nodeForType = nodeForType.parent
+        if (nodeForType?.type.includes("statement")) break
+    }
+
+    return null
+}