refactor: move more files to tact/ folder (#712)

i582 · web-flow · commit 297ab8a22279 · 2025-05-28T13:28:02.000+04:00
diff --git a/server/src/languages/tact/TypeInferer.ts b/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 {
diff --git a/server/src/languages/tact/compiler/MistiAnalyzer.ts b/server/src/languages/tact/compiler/MistiAnalyzer.ts
@@ -2,7 +2,7 @@
 //  Copyright © 2025 TON Studio
 import * as cp from "node:child_process"
 import {CompilerError, Severity, TactCompiler} from "@server/languages/tact/compiler/TactCompiler"
-import {TactSettings} from "@server/utils/settings"
+import {TactSettings} from "@server/settings/settings"
 
 export interface MistiJsonOutput {
     readonly kind: "warnings"
diff --git a/server/src/languages/tact/compiler/tlb/compiler-tlb.ts b/server/src/languages/tact/compiler/tlb/compiler-tlb.ts
@@ -10,7 +10,7 @@ import {
     Ty,
 } from "@server/languages/tact/types/BaseTy"
 import {Field} from "@server/languages/tact/psi/Decls"
-import {TypeInferer} from "@server/TypeInferer"
+import {TypeInferer} from "@server/languages/tact/TypeInferer"
 import {highest32ofSha256, sha256} from "@server/languages/tact/compiler/sha256"
 
 export function messageOpcode(message: MessageTy): undefined | bigint {
diff --git a/server/src/languages/tact/compiler/tlb/tlb.ts b/server/src/languages/tact/compiler/tlb/tlb.ts
@@ -11,7 +11,7 @@ import {
     Ty,
 } from "@server/languages/tact/types/BaseTy"
 import {Field} from "@server/languages/tact/psi/Decls"
-import {TypeInferer} from "@server/TypeInferer"
+import {TypeInferer} from "@server/languages/tact/TypeInferer"
 
 export function generateTlb(ty: Ty, forField: boolean = false): string {
     if (ty instanceof PrimitiveTy) {
diff --git a/server/src/languages/tact/completion/CompletionContext.ts b/server/src/languages/tact/completion/CompletionContext.ts
@@ -4,8 +4,8 @@ import {Expression, Node} from "@server/languages/tact/psi/Node"
 import type * as lsp from "vscode-languageserver/node"
 import {parentOfType} from "@server/languages/tact/psi/utils"
 import {MapTy, NullTy, OptionTy, Ty} from "@server/languages/tact/types/BaseTy"
-import {TypeInferer} from "@server/TypeInferer"
-import type {TactSettings} from "@server/utils/settings"
+import {TypeInferer} from "@server/languages/tact/TypeInferer"
+import type {TactSettings} from "@server/settings/settings"
 
 export class CompletionContext {
     public element: Node
diff --git a/server/src/languages/tact/completion/ReferenceCompletionProcessor.ts b/server/src/languages/tact/completion/ReferenceCompletionProcessor.ts
@@ -13,7 +13,7 @@ import {
     Trait,
 } from "@server/languages/tact/psi/Decls"
 import {CompletionItem, InsertTextFormat, CompletionItemKind} from "vscode-languageserver-types"
-import {TypeInferer} from "@server/TypeInferer"
+import {TypeInferer} from "@server/languages/tact/TypeInferer"
 import {CompletionContext} from "./CompletionContext"
 import {
     CompletionWeight,
diff --git a/server/src/languages/tact/completion/providers/ReturnCompletionProvider.ts b/server/src/languages/tact/completion/providers/ReturnCompletionProvider.ts
@@ -6,7 +6,7 @@ import type {CompletionContext} from "@server/languages/tact/completion/Completi
 import {funNodesTypes, parentOfType} from "@server/languages/tact/psi/utils"
 import {Fun} from "@server/languages/tact/psi/Decls"
 import {OptionTy, PrimitiveTy} from "@server/languages/tact/types/BaseTy"
-import {TypeInferer} from "@server/TypeInferer"
+import {TypeInferer} from "@server/languages/tact/TypeInferer"
 import {
     CompletionResult,
     CompletionWeight,
diff --git a/server/src/languages/tact/documentation/documentation.ts b/server/src/languages/tact/documentation/documentation.ts
@@ -1,7 +1,7 @@
 //  SPDX-License-Identifier: MIT
 //  Copyright © 2025 TON Studio
 import {NamedNode, Node} from "@server/languages/tact/psi/Node"
-import {TypeInferer} from "@server/TypeInferer"
+import {TypeInferer} from "@server/languages/tact/TypeInferer"
 import {
     Constant,
     Contract,
@@ -17,7 +17,7 @@ import {
 import type {Node as SyntaxNode} from "web-tree-sitter"
 import {trimPrefix} from "@server/utils/strings"
 import * as compiler from "@server/languages/tact/compiler/utils"
-import {getDocumentSettings, TactSettings} from "@server/utils/settings"
+import {getDocumentSettings, TactSettings} from "@server/settings/settings"
 import {File} from "@server/languages/tact/psi/File"
 import {
     ContractTy,
diff --git a/server/src/languages/tact/file-renaming.ts b/server/src/languages/tact/file-renaming.ts
diff --git a/server/src/languages/tact/inlays/collect.ts b/server/src/languages/tact/inlays/collect.ts
@@ -3,7 +3,7 @@
 import {InlayHint, InlayHintKind} from "vscode-languageserver-types"
 import {RecursiveVisitor} from "@server/languages/tact/psi/visitor"
 import type {File} from "@server/languages/tact/psi/File"
-import {TypeInferer} from "@server/TypeInferer"
+import {TypeInferer} from "@server/languages/tact/TypeInferer"
 import {Reference} from "@server/languages/tact/psi/Reference"
 import {Field, Fun, InitFunction, Message, MessageFunction} from "@server/languages/tact/psi/Decls"
 import {
diff --git a/server/src/languages/tact/inspections/MistInspection.ts b/server/src/languages/tact/inspections/MistInspection.ts
@@ -9,7 +9,7 @@ import {Inspection, InspectionIds} from "@server/languages/tact/inspections/Insp
 import * as path from "node:path"
 import {workspaceRoot} from "@server/toolchain"
 import {existsSync} from "node:fs"
-import {getDocumentSettings} from "@server/utils/settings"
+import {getDocumentSettings} from "@server/settings/settings"
 
 export class MistiInspection implements Inspection {
     public readonly id: "misti" = InspectionIds.MISTI
diff --git a/server/src/languages/tact/intentions/AddFieldInitialization.ts b/server/src/languages/tact/intentions/AddFieldInitialization.ts
@@ -10,7 +10,7 @@ import {Field, InitFunction, StorageMembersOwner} from "@server/languages/tact/p
 import {PrimitiveTy, StructTy, Ty} from "@server/languages/tact/types/BaseTy"
 import {RecursiveVisitor} from "@server/languages/tact/psi/RecursiveVisitor"
 import type {Node as SyntaxNode} from "web-tree-sitter"
-import {TypeInferer} from "@server/TypeInferer"
+import {TypeInferer} from "@server/languages/tact/TypeInferer"
 import {NamedNode} from "@server/languages/tact/psi/Node"
 
 export class AddFieldInitialization implements Intention {
diff --git a/server/src/languages/tact/intentions/FillFieldsStructInit.ts b/server/src/languages/tact/intentions/FillFieldsStructInit.ts
@@ -9,7 +9,7 @@ import {FileDiff} from "@server/utils/FileDiff"
 import {parentOfType} from "@server/languages/tact/psi/utils"
 import type {Node as SyntaxNode} from "web-tree-sitter"
 import {NamedNode} from "@server/languages/tact/psi/Node"
-import {TypeInferer} from "@server/TypeInferer"
+import {TypeInferer} from "@server/languages/tact/TypeInferer"
 import {
     FieldsOwnerTy,
     MapTy,
diff --git a/server/src/languages/tact/psi/Node.ts b/server/src/languages/tact/psi/Node.ts
@@ -3,7 +3,7 @@
 import type {Node as SyntaxNode} from "web-tree-sitter"
 import {File} from "./File"
 import {Ty} from "@server/languages/tact/types/BaseTy"
-import {TypeInferer} from "@server/TypeInferer"
+import {TypeInferer} from "@server/languages/tact/TypeInferer"
 import {Range} from "vscode-languageserver-textdocument"
 import {AsmInstruction, findInstruction} from "@server/languages/tact/completion/data/types"
 import {Position} from "vscode-languageclient"
diff --git a/server/src/languages/tact/psi/Reference.ts b/server/src/languages/tact/psi/Reference.ts
@@ -19,7 +19,7 @@ import type {File} from "./File"
 import {Contract, Field, FieldsOwner, Fun, Message, Struct, Trait} from "./Decls"
 import {isFunNode, parentOfType} from "./utils"
 import {CACHE} from "@server/cache"
-import {TypeInferer} from "@server/TypeInferer"
+import {TypeInferer} from "@server/languages/tact/TypeInferer"
 import {filePathToUri} from "@server/indexing-root"
 import {ImportResolver} from "@server/languages/tact/psi/ImportResolver"
 
diff --git a/server/src/languages/tact/selection-gas-consumption.ts b/server/src/languages/tact/selection-gas-consumption.ts
@@ -9,7 +9,7 @@ import {asParserPoint} from "@server/utils/position"
 import type {Node as SyntaxNode, Point} from "web-tree-sitter"
 import {RecursiveVisitor} from "@server/languages/tact/psi/RecursiveVisitor"
 import {AsmInstr} from "@server/languages/tact/psi/Node"
-import {getDocumentSettings} from "@server/utils/settings"
+import {getDocumentSettings} from "@server/settings/settings"
 import {computeGasConsumption} from "@server/languages/tact/asm/gas"
 import {File} from "@server/languages/tact/psi/File"
 
diff --git a/server/src/languages/tact/types/BaseTy.ts b/server/src/languages/tact/types/BaseTy.ts
@@ -15,7 +15,7 @@ import type {
 } from "@server/languages/tact/psi/Decls"
 import {NamedNode} from "@server/languages/tact/psi/Node"
 import {trimPrefix} from "@server/utils/strings"
-import {TypeInferer} from "@server/TypeInferer"
+import {TypeInferer} from "@server/languages/tact/TypeInferer"
 
 export interface Ty {
     name(): string
diff --git a/server/src/server.ts b/server/src/server.ts
@@ -4,7 +4,7 @@ import {connection} from "./connection"
 import {DocumentStore, getOffsetFromPosition} from "./document-store"
 import {createTactParser, initParser} from "./parser"
 import {asLspRange, asNullableLspRange, asParserPoint} from "@server/utils/position"
-import {TypeInferer} from "./TypeInferer"
+import {TypeInferer} from "./languages/tact/TypeInferer"
 import {LocalSearchScope, Referent} from "@server/languages/tact/psi/Referent"
 import {index, IndexKey, IndexRoot} from "@server/languages/tact/indexes"
 import {AsmInstr, CallLike, Expression, NamedNode, Node} from "@server/languages/tact/psi/Node"
@@ -88,7 +88,7 @@ import {
 import {StructInitializationInspection} from "@server/languages/tact/inspections/StructInitializationInspection"
 import {AsmInstructionCompletionProvider} from "@server/languages/tact/completion/providers/AsmInstructionCompletionProvider"
 import {generateAsmDoc} from "@server/languages/tact/documentation/asm_documentation"
-import {clearDocumentSettings, getDocumentSettings, TactSettings} from "@server/utils/settings"
+import {clearDocumentSettings, getDocumentSettings, TactSettings} from "@server/settings/settings"
 import {ContractDeclCompletionProvider} from "@server/languages/tact/completion/providers/ContractDeclCompletionProvider"
 import {collectFift} from "@server/languages/fift/foldings/collect"
 import {collectFift as collectFiftSemanticTokens} from "@server/languages/fift/semantic_tokens/collect"
@@ -167,10 +167,10 @@ import {MissedMembersInContractInspection} from "@server/languages/tact/inspecti
 import {DeprecatedSymbolUsageInspection} from "@server/languages/tact/inspections/DeprecatedSymbolUsageInspection"
 import {CanBeInlineInspection} from "@server/languages/tact/inspections/CanBeInlineInspection"
 import {OptimalMathFunctionsInspection} from "@server/languages/tact/inspections/OptimalMathFunctionsInspection"
-import {onFileRenamed, processFileRenaming} from "@server/file-renaming"
+import {onFileRenamed, processFileRenaming} from "@server/languages/tact/file-renaming"
 import {ExtractToFile} from "@server/languages/tact/intentions/ExtractToFile"
 import {NamingConventionInspection} from "@server/languages/tact/inspections/NamingConventionInspection"
-import {selectionGasConsumption} from "@server/selection-gas-consumption"
+import {selectionGasConsumption} from "@server/languages/tact/selection-gas-consumption"
 
 /**
  * Whenever LS is initialized.
diff --git a/server/src/settings/settings.ts b/server/src/settings/settings.ts
