Skip to content

Fix goto assertions #387

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
satyakigh merged 1 commit into from
Jan 7, 2026
+29 −34
Merged

Fix goto assertions #387

Show file tree
Hide file tree
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
42 changes: 21 additions & 21 deletions tst/integration/goto/Goto.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ Outputs:
position: { line: 51, character: 27 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('EnvironmentName')
.expectDefinitionPosition({ line: 4, character: 5 })
.expectDefinitionPosition({ line: 4, character: 4 })
.build(),
},
},
Expand All @@ -709,7 +709,7 @@ Outputs:
position: { line: 57, character: 30 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('IsProduction')
.expectDefinitionPosition({ line: 49, character: 5 })
.expectDefinitionPosition({ line: 49, character: 4 })
.build(),
},
},
Expand All @@ -722,7 +722,7 @@ Outputs:
position: { line: 62, character: 30 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('IsProduction')
.expectDefinitionPosition({ line: 49, character: 5 })
.expectDefinitionPosition({ line: 49, character: 4 })
.build(),
},
},
Expand All @@ -735,7 +735,7 @@ Outputs:
position: { line: 76, character: 35 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('IsNotProduction')
.expectDefinitionPosition({ line: 55, character: 5 })
.expectDefinitionPosition({ line: 55, character: 4 })
.build(),
},
},
Expand All @@ -754,7 +754,7 @@ Outputs:
position: { line: 85, character: 30 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('VpcCidr')
.expectDefinitionPosition({ line: 8, character: 5 })
.expectDefinitionPosition({ line: 8, character: 4 })
.build(),
},
},
Expand Down Expand Up @@ -789,7 +789,7 @@ Outputs:
position: { line: 96, character: 46 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('EnvironmentName')
.expectDefinitionPosition({ line: 4, character: 2 })
.expectDefinitionPosition({ line: 4, character: 4 })
.build(),
},
},
Expand All @@ -802,7 +802,7 @@ Outputs:
position: { line: 104, character: 37 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('environmentname')
.expectDefinitionPosition({ line: 23, character: 5 })
.expectDefinitionPosition({ line: 23, character: 4 })
.build(),
},
},
Expand Down Expand Up @@ -854,7 +854,7 @@ Outputs:
position: { line: 111, character: 22 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('VPC')
.expectDefinitionPosition({ line: 89, character: 5 })
.expectDefinitionPosition({ line: 89, character: 4 })
.build(),
},
},
Expand All @@ -867,7 +867,7 @@ Outputs:
position: { line: 118, character: 27 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('SubnetCidrs')
.expectDefinitionPosition({ line: 12, character: 5 })
.expectDefinitionPosition({ line: 12, character: 4 })
.build(),
},
},
Expand All @@ -880,7 +880,7 @@ Outputs:
position: { line: 138, character: 40 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('AvailabilityZones')
.expectDefinitionPosition({ line: 20, character: 5 })
.expectDefinitionPosition({ line: 20, character: 4 })
.build(),
},
},
Expand Down Expand Up @@ -919,7 +919,7 @@ Outputs:
position: { line: 157, character: 54 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('BastionSecurityGroup')
.expectDefinitionPosition({ line: 168, character: 5 })
.expectDefinitionPosition({ line: 168, character: 4 })
.build(),
},
},
Expand All @@ -941,7 +941,7 @@ Outputs:
position: { line: 179, character: 47 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('RegionMap')
.expectDefinitionPosition({ line: 29, character: 5 })
.expectDefinitionPosition({ line: 29, character: 4 })
.build(),
},
},
Expand All @@ -956,7 +956,7 @@ Outputs:
position: { line: 181, character: 47 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('WebSecurityGroup')
.expectDefinitionPosition({ line: 148, character: 5 })
.expectDefinitionPosition({ line: 148, character: 4 })
.build(),
},
},
Expand Down Expand Up @@ -1025,7 +1025,7 @@ Outputs:
position: { line: 223, character: 30 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('DatabaseSecurityGroup')
.expectDefinitionPosition({ line: 227, character: 5 })
.expectDefinitionPosition({ line: 227, character: 4 })
.build(),
},
},
Expand Down Expand Up @@ -1145,7 +1145,7 @@ Outputs:
position: { line: 310, character: 35 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('Database')
.expectDefinitionPosition({ line: 204, character: 5 })
.expectDefinitionPosition({ line: 204, character: 4 })
.build(),
},
},
Expand All @@ -1158,7 +1158,7 @@ Outputs:
position: { line: 313, character: 40 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('SNSTopic')
.expectDefinitionPosition({ line: 316, character: 5 })
.expectDefinitionPosition({ line: 316, character: 4 })
.build(),
},
},
Expand All @@ -1181,7 +1181,7 @@ Outputs:
position: { line: 305, character: 25 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('IsProduction')
.expectDefinitionPosition({ line: 49, character: 5 })
.expectDefinitionPosition({ line: 49, character: 4 })
.build(),
},
},
Expand Down Expand Up @@ -1220,7 +1220,7 @@ Outputs:
position: { line: 333, character: 38 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('EnvironmentName')
.expectDefinitionPosition({ line: 4, character: 2 })
.expectDefinitionPosition({ line: 4, character: 4 })
.build(),
},
},
Expand Down Expand Up @@ -1248,7 +1248,7 @@ Outputs:
position: { line: 341, character: 27 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('VPC')
.expectDefinitionPosition({ line: 89, character: 5 })
.expectDefinitionPosition({ line: 89, character: 4 })
.build(),
},
},
Expand All @@ -1261,7 +1261,7 @@ Outputs:
position: { line: 350, character: 26 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('IsProductionOrStaging')
.expectDefinitionPosition({ line: 60, character: 5 })
.expectDefinitionPosition({ line: 60, character: 4 })
.build(),
},
},
Expand Down Expand Up @@ -1310,7 +1310,7 @@ Outputs:
position: { line: 370, character: 16 },
expectation: GotoExpectationBuilder.create()
.expectDefinition('IsProduction')
.expectDefinitionPosition({ line: 49, character: 5 })
.expectDefinitionPosition({ line: 49, character: 4 })
.build(),
},
},
Expand Down
21 changes: 8 additions & 13 deletions tst/utils/TemplateBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,19 +432,7 @@ export class TemplateBuilder {

const actualLabels = completions.items.map((item) => item.label);
if (expected.items) {
// Check if all expected items are present
for (const expectedItem of expected.items) {
if (!actualLabels.includes(expectedItem)) {
throw new Error(
`Completion items mismatch${desc} at ${position.line}:${position.character}: missing expected item ${JSON.stringify(expectedItem)} and got ${JSON.stringify(actualLabels)}`,
);
}
}
expectAt(
actualLabels.length,
position,
`Completion items count mismatch${desc}: got ${JSON.stringify(actualLabels)}`,
).toBe(expected.items.length);
expectAt(actualLabels.sort(), position, `Completion items mismatch${desc}`).toEqual(expected.items.sort());
}

if (expected.minItems !== undefined) {
Expand Down Expand Up @@ -691,6 +679,13 @@ export class TemplateBuilder {
);
}
}

if (expected.targetPosition !== undefined) {
const firstDef = definitionArray[0];
expectAt(firstDef.range.start, position, `Target position mismatch${desc}`).toEqual(
expected.targetPosition,
);
}
}
}
}
Expand Down
Loading