Skip to content

fix(tolk/completion): show the correct type for variable in completion #106

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

Merged
i582 merged 1 commit into from
Aug 5, 2025
Merged

fix(tolk/completion): show the correct type for variable in completion #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions server/src/languages/tolk/completion/ReferenceCompletionProcessor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {CompletionWeight, WeightedCompletionItem} from "@server/completion/Weigh
import {ResolveState} from "@server/psi/ResolveState"
import {TypeInferer} from "@server/languages/tolk/TypeInferer"
import {CompletionItemAdditionalInformation} from "@server/completion/CompletionItemAdditionalInformation"
import {typeOf} from "@server/languages/tolk/type-inference"

export class ReferenceCompletionProcessor implements ScopeProcessor {
public constructor(private readonly ctx: CompletionContext) {}
Expand Down Expand Up @@ -225,7 +226,7 @@ export class ReferenceCompletionProcessor implements ScopeProcessor {
if (!parent) return true

if (parent.type === "catch_clause") {
const typeName = "any"
const typeName = typeOf(node.node, node.file)?.name() ?? "unknown"

this.addItem({
label: name,
Expand All @@ -240,7 +241,7 @@ export class ReferenceCompletionProcessor implements ScopeProcessor {
})
}
} else if (node.node.type === "var_declaration") {
const typeName = TypeInferer.inferType(node)?.name() ?? "unknown"
const typeName = typeOf(node.node, node.file)?.name() ?? "unknown"

const comma = this.ctx.inMultilineStructInit ? "," : ""
const suffix = this.ctx.inNameOfFieldInit ? `${comma}$0` : ""
Expand Down
Loading