Skip to content
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
16 changes: 16 additions & 0 deletions server/src/e2e/tolk/testcases/references/basic.test
Original file line number Diff line number Diff line change
Expand Up @@ -458,3 +458,19 @@ fun name() {
------------------------------------------------------------------------
References: [3:15]
Scope: GlobalSearchScope{test.tolk}

========================================================================
Struct with methods
========================================================================
struct <caret>Storage {}

fun Storage.load() {
return Storage.fromCell(contract.getData());
}

fun Storage.save(self) {
contract.setData(self.toCell());
}
------------------------------------------------------------------------
References: [2:4, 3:11, 6:4]
Scope: GlobalSearchScope{test.tolk}
25 changes: 25 additions & 0 deletions server/src/e2e/tolk/testcases/rename/basic.test
Original file line number Diff line number Diff line change
Expand Up @@ -527,3 +527,28 @@ fun test(): int {
`match`();
//! ^ match
}

========================================================================
Rename struct name with methods
========================================================================
struct Storage {}
//! ^ MyStorage

fun Storage.load() {
return Storage.fromCell(contract.getData());
}

fun Storage.save(self) {
contract.setData(self.toCell());
}
------------------------------------------------------------------------
struct MyStorage {}
//! ^ MyStorage

fun MyStorage.load() {
return MyStorage.fromCell(contract.getData());
}

fun MyStorage.save(self) {
contract.setData(self.toCell());
}
7 changes: 5 additions & 2 deletions server/src/languages/tolk/psi/Referent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,19 @@ export class Referent extends BaseReferent<NamedNode> {
}
}

const resolvedNode = Reference.multiResolve(new NamedNode(node, file))

if (
node.type === "type_identifier" &&
parent.type === "method_receiver" &&
parent.childForFieldName("receiver_type")?.equals(node)
parent.childForFieldName("receiver_type")?.equals(node) &&
resolvedNode.length === 1 && // resolved only to itself
resolvedNode[0].node.equals(node)
) {
// T in `fun T.bar() {}`
return true
}

const resolvedNode = Reference.multiResolve(new NamedNode(node, file))
for (const target of resolvedNode) {
const identifier = target.nameIdentifier()
if (!identifier) return true
Expand Down
Loading