Skip to content

Commit 8f381b0

Browse files
committed
Reaplce goToDefinitionName with baselineGetDefinitionAtPosition
1 parent 4238173 commit 8f381b0

File tree

5 files changed

+22
-15
lines changed

5 files changed

+22
-15
lines changed

src/harness/fourslashImpl.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2830,14 +2830,6 @@ export class TestState {
28302830
this.goToPosition(pos);
28312831
}
28322832

2833-
public verifyGoToDefinitionName(expectedName: string, expectedContainerName: string) {
2834-
const definitions = this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
2835-
const actualDefinitionName = definitions && definitions.length ? definitions[0].name : "";
2836-
const actualDefinitionContainerName = definitions && definitions.length ? definitions[0].containerName : "";
2837-
assert.equal(actualDefinitionName, expectedName, this.messageAtLastKnownMarker("Definition Info Name"));
2838-
assert.equal(actualDefinitionContainerName, expectedContainerName, this.messageAtLastKnownMarker("Definition Info Container Name"));
2839-
}
2840-
28412833
public getMarkers(): Marker[] {
28422834
// Return a copy of the list
28432835
return this.testData.markers.slice(0);

src/harness/fourslashInterfaceImpl.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,6 @@ export class Verify extends VerifyNegatable {
310310
this.state.verifyGoToDefinitionIs(endMarkers);
311311
}
312312

313-
public goToDefinitionName(name: string, containerName: string) {
314-
this.state.verifyGoToDefinitionName(name, containerName);
315-
}
316-
317313
public verifyGetEmitOutputForCurrentFile(expected: string): void {
318314
this.state.verifyGetEmitOutputForCurrentFile(expected);
319315
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// === getDefinitionAtPosition ===
2+
// === /tests/cases/fourslash/definitionNameOnEnumMember.ts ===
3+
// enum e {
4+
// firstMember,
5+
// secondMember,
6+
// [|thirdMember|]
7+
// }
8+
// var enumMember = e./*GOTO DEF POS*/thirdMember;
9+
10+
// === Details ===
11+
[
12+
{
13+
"kind": "enum member",
14+
"name": "thirdMember",
15+
"containerName": "e",
16+
"isLocal": true,
17+
"isAmbient": false,
18+
"unverified": false,
19+
"failedAliasResolution": false
20+
}
21+
]

tests/cases/fourslash/definitionNameOnEnumMember.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77
////}
88
////var enumMember = e.[|/*1*/thirdMember|];
99

10-
goTo.marker("1");
11-
verify.goToDefinitionName("thirdMember", "e");
10+
verify.baselineGetDefinitionAtPosition("1");

tests/cases/fourslash/fourslash.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@ declare namespace FourSlashInterface {
312312
formatDocumentChangesNothing(): void;
313313
/** Verifies that goToDefinition at the current position would take you to `endMarker`. */
314314
goToDefinitionIs(endMarkers: ArrayOrSingle<string>): void;
315-
goToDefinitionName(name: string, containerName: string): void;
316315
verifyGetEmitOutputForCurrentFile(expected: string): void;
317316
verifyGetEmitOutputContentsForCurrentFile(expected: ts.OutputFile[]): void;
318317
baselineCommands(...commands: BaselineCommand[]): void;

0 commit comments

Comments
 (0)