microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 08:11:30 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Respect @BaselineFile in fourslash tests and tidy up quickInfoDisplayPartsVarShims (#48506)

Browse Source
This commit is contained in:
Andrew Casey 2022-04-01 09:24:14 -07:00 committed by GitHub
parent acb927e8a5
commit 8020072281
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/harness/fourslashImpl.ts
View File

@ -2120,7 +2120,8 @@ namespace FourSlash {
}
private getBaselineFileNameForContainingTestFile(ext = ".baseline") {
return ts.getBaseFileName(this.originalInputFileName).replace(ts.Extension.Ts, ext);
return this.testData.globalOptions[MetadataOptionNames.baselineFile] ||
ts.getBaseFileName(this.originalInputFileName).replace(ts.Extension.Ts, ext);
}
private getSignatureHelp({ triggerReason }: FourSlashInterface.VerifySignatureHelpOptions): ts.SignatureHelpItems | undefined {

28
tests/baselines/reference/quickInfoDisplayPartsVarShimspp.baseline → tests/baselines/reference/quickInfoDisplayPartsVar.shims-pp.baseline
View File

@ -1,7 +1,7 @@
[
{
"marker": {
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
"position": 4,
"name": "1"
},
@ -43,7 +43,7 @@
},
{
"marker": {
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
"position": 37,
"name": "2"
},
@ -93,7 +93,7 @@
},
{
"marker": {
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
"position": 41,
"name": "3"
},
@ -135,7 +135,7 @@
},
{
"marker": {
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
"position": 65,
"name": "4"
},
@ -177,7 +177,7 @@
},
{
"marker": {
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
"position": 88,
"name": "5"
},
@ -227,7 +227,7 @@
},
{
"marker": {
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
"position": 102,
"name": "6"
},
@ -289,7 +289,7 @@
},
{
"marker": {
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
"position": 123,
"name": "7"
},
@ -351,7 +351,7 @@
},
{
"marker": {
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
"position": 127,
"name": "8"
},
@ -413,7 +413,7 @@
},
{
"marker": {
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
"position": 130,
"name": "9"
},
@ -475,7 +475,7 @@
},
{
"marker": {
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
"position": 139,
"name": "10"
},
@ -621,7 +621,7 @@
},
{
"marker": {
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
"position": 193,
"name": "11"
},
@ -767,7 +767,7 @@
},
{
"marker": {
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
"position": 197,
"name": "12"
},
@ -913,7 +913,7 @@
},
{
"marker": {
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
"position": 200,
"name": "13"
},
@ -1019,7 +1019,7 @@
},
{
"marker": {
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts",
"fileName": "/tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts",
"position": 207,
"name": "14"
},

0
tests/baselines/reference/quickInfoDisplayPartsVarShims.baseline → tests/baselines/reference/quickInfoDisplayPartsVar.shims.baseline
View File

0
tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShimspp.ts → tests/cases/fourslash/shims-pp/quickInfoDisplayPartsVarShims.ts
View File