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
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@
},
{
"command": "tolk.getUnresolvedIdentifiers",
"title": "Tolk: Get Unresolved Identifiers"
"title": "Tolk: Get Unresolved Identifiers",
"category": "Tolk"
},
{
"command": "ton.debug",
Expand Down
2 changes: 0 additions & 2 deletions server/src/e2e/tolk/compiler-tests.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ suite("Compiler Tests Suite", () => {
)
const tolkFiles = glob.sync(testCasesPath, {windowsPathsNoEscape: true})

console.log("tolkFiles", tolkFiles.length)

for (const tolkFile of tolkFiles) {
const testName = path.basename(tolkFile, ".tolk")

Expand Down
3 changes: 2 additions & 1 deletion server/src/languages/tolk/type-inference.ts
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@ class InferenceWalker {
public inferReturnType(): Ty {
const returnTypes = this.ctx.returnTypes
if (returnTypes.length === 0) return VoidTy.VOID
if (returnTypes.length === 1) return returnTypes[0]

let joined: Ty | null = null

Expand Down Expand Up @@ -697,7 +698,7 @@ class InferenceWalker {
}

private processReturnStatement(node: SyntaxNode, flow: FlowContext): FlowContext {
const expression = node.child(1)
const expression = node.childForFieldName("body")
if (expression) {
flow = this.inferExpression(
expression,
Expand Down
Loading