Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

feat(completion): add bounced<> to completion #112

Merged
merged 1 commit into from
Feb 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions server/src/completion/CompletionContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export class CompletionContext {
inTraitList: boolean = false
inParameter: boolean = false
isMessageContext: boolean = false
isBouncedMessage: boolean = false
isInitOfName: boolean = false

contextTy: Ty | null = null
Expand Down Expand Up @@ -120,6 +121,13 @@ export class CompletionContext {
this.isMessageContext = true
}

if (parent.type === "parameter") {
const grand = parent.parent
if (grand?.type === "bounced_function") {
this.isBouncedMessage = true
}
}

if (parent.type === "parameter") {
const grand = parent.parent
if (grand?.type === "receive_function") {
Expand Down
20 changes: 20 additions & 0 deletions server/src/completion/providers/BouncedTypeCompletionProvider.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import {CompletionProvider} from "@server/completion/CompletionProvider"
import {CompletionItemKind, InsertTextFormat} from "vscode-languageserver-types"
import {CompletionContext} from "@server/completion/CompletionContext"
import {CompletionResult, CompletionWeight} from "@server/completion/WeightedCompletionItem"

export class BouncedTypeCompletionProvider implements CompletionProvider {
isAvailable(ctx: CompletionContext): boolean {
return ctx.isType && ctx.isBouncedMessage
}

addCompletion(_ctx: CompletionContext, result: CompletionResult): void {
result.add({
label: "bounced<Type>",
kind: CompletionItemKind.Keyword,
insertText: "bounced<$1>$0",
insertTextFormat: InsertTextFormat.Snippet,
weight: CompletionWeight.KEYWORD,
})
}
}
24 changes: 24 additions & 0 deletions server/src/e2e/suite/testcases/completion/messages.test
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,27 @@ contract Foo {
}
------------------------------------------------------------------------
21 Bar

========================================================================
Completion in bounced function 2
========================================================================
primitive Int;
primitive Address;
primitive String;

struct Foo {}
message Bar {}
trait Var {}

contract Foo {
bounced(msg: <caret>) {}
}
------------------------------------------------------------------------
13 bounced<Type>
13 map<K, V>
9 Address
9 Int
9 String
21 Bar
21 Foo
24 Var
2 changes: 2 additions & 0 deletions server/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ import {MissedFieldInContractInspection} from "@server/inspections/MissedFieldIn
import {Node as SyntaxNode} from "web-tree-sitter"
import {TraitOrContractConstantsCompletionProvider} from "@server/completion/providers/TraitOrContractConstantsCompletionProvider"
import {generateTlBTypeDoc} from "@server/documentation/tlb_type_documentation"
import {BouncedTypeCompletionProvider} from "@server/completion/providers/BouncedTypeCompletionProvider"

/**
* Whenever LS is initialized.
Expand Down Expand Up @@ -622,6 +623,7 @@ connection.onInitialize(async (params: lsp.InitializeParams): Promise<lsp.Initia
new SnippetsCompletionProvider(),
new KeywordsCompletionProvider(),
new MapTypeCompletionProvider(),
new BouncedTypeCompletionProvider(),
new ContractDeclCompletionProvider(),
new TopLevelFunctionCompletionProvider(),
new MemberFunctionCompletionProvider(),
Expand Down