diff --git a/internal/fourslash/_scripts/failingTests.txt b/internal/fourslash/_scripts/failingTests.txt index 14401cec42..a704de7162 100644 --- a/internal/fourslash/_scripts/failingTests.txt +++ b/internal/fourslash/_scripts/failingTests.txt @@ -167,7 +167,6 @@ TestEditJsdocType TestExportDefaultClass TestExportDefaultFunction TestFindAllReferencesDynamicImport1 -TestFindAllReferencesTripleSlash TestFindAllReferencesUmdModuleAsGlobalConst TestFindAllRefsCommonJsRequire TestFindAllRefsCommonJsRequire2 @@ -175,7 +174,6 @@ TestFindAllRefsCommonJsRequire3 TestFindAllRefsExportEquals TestFindAllRefsForDefaultExport03 TestFindAllRefsModuleDotExports -TestFindAllRefsReExport_broken TestFindAllRefs_importType_typeofImport TestFindReferencesAfterEdit TestFindReferencesBindingPatternInJsdocNoCrash1 diff --git a/internal/fourslash/tests/gen/findAllReferencesTripleSlash_test.go b/internal/fourslash/tests/gen/findAllReferencesTripleSlash_test.go index 6c418d4bb6..eec32bef82 100644 --- a/internal/fourslash/tests/gen/findAllReferencesTripleSlash_test.go +++ b/internal/fourslash/tests/gen/findAllReferencesTripleSlash_test.go @@ -9,7 +9,7 @@ import ( func TestFindAllReferencesTripleSlash(t *testing.T) { t.Parallel() - t.Skip() + defer testutil.RecoverAndFail(t, "Panic on fourslash test") const content = `// @checkJs: true // @Filename: /node_modules/@types/globals/index.d.ts diff --git a/internal/fourslash/tests/gen/findAllRefsReExport_broken_test.go b/internal/fourslash/tests/gen/findAllRefsReExport_broken_test.go index a864f48650..8584434558 100644 --- a/internal/fourslash/tests/gen/findAllRefsReExport_broken_test.go +++ b/internal/fourslash/tests/gen/findAllRefsReExport_broken_test.go @@ -9,7 +9,7 @@ import ( func TestFindAllRefsReExport_broken(t *testing.T) { t.Parallel() - t.Skip() + defer testutil.RecoverAndFail(t, "Panic on fourslash test") const content = `// @Filename: /a.ts /*1*/export { /*2*/x };` diff --git a/internal/ls/utilities.go b/internal/ls/utilities.go index 566352b0bb..d92bb5b03f 100644 --- a/internal/ls/utilities.go +++ b/internal/ls/utilities.go @@ -28,7 +28,7 @@ func ComparePositions(pos, other lsproto.Position) int { if lineComp := cmp.Compare(pos.Line, other.Line); lineComp != 0 { return lineComp } - return cmp.Compare(pos.Line, other.Line) + return cmp.Compare(pos.Character, other.Character) } // Implements a cmp.Compare like function for two *lsproto.Range diff --git a/testdata/baselines/reference/fourslash/findAllRef/AutoImportProvider_referencesCrash.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/AutoImportProvider_referencesCrash.baseline.jsonc index fa07b16bfd..74063b82c8 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/AutoImportProvider_referencesCrash.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/AutoImportProvider_referencesCrash.baseline.jsonc @@ -9,4 +9,4 @@ // === /home/src/workspaces/project/b/b.ts === // /// -// new A/*FIND ALL REFS*/[|A|](); +// new [|A|]/*FIND ALL REFS*/(); diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesImportMeta.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesImportMeta.baseline.jsonc index 42c49a22d3..a79adfcfcc 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesImportMeta.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesImportMeta.baseline.jsonc @@ -3,4 +3,4 @@ // // Haha that's so meta! // -// let x = import.meta/*FIND ALL REFS*/[|meta|]; +// let x = import.[|meta|]/*FIND ALL REFS*/; diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsOverloadedFunctionParameter.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsOverloadedFunctionParameter.baseline.jsonc index 868da34a9c..643bfe6613 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsOverloadedFunctionParameter.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsOverloadedFunctionParameter.baseline.jsonc @@ -5,6 +5,6 @@ // * @param {unknown} x // * @returns {unknown} // */ -// function foo(x/*FIND ALL REFS*/[|x|]) { +// function foo([|x|]/*FIND ALL REFS*/) { // return [|x|]; // } diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag1.baseline.jsonc index 8ea93a9256..42069eeb85 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag1.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag1.baseline.jsonc @@ -2,7 +2,7 @@ // === /findAllReferencesLinkTag1.ts === // class C { -// m/*FIND ALL REFS*/[|m|]() { } +// [|m|]/*FIND ALL REFS*/() { } // n = 1 // static s() { } // /** @@ -26,7 +26,7 @@ // class C { // m() { } -// n/*FIND ALL REFS*/[|n|] = 1 +// [|n|]/*FIND ALL REFS*/ = 1 // static s() { } // /** // * {@link m} @@ -52,7 +52,7 @@ // class C { // m() { } // n = 1 -// static s/*FIND ALL REFS*/[|s|]() { } +// static [|s|]/*FIND ALL REFS*/() { } // /** // * {@link m} // * @see {m} @@ -79,7 +79,7 @@ // } // // interface I { -// a/*FIND ALL REFS*/[|a|]() +// [|a|]/*FIND ALL REFS*/() // b: 1 // /** // * {@link a} @@ -95,7 +95,7 @@ // // interface I { // a() -// b/*FIND ALL REFS*/[|b|]: 1 +// [|b|]/*FIND ALL REFS*/: 1 // /** // * {@link a} // * @see {a} @@ -115,7 +115,7 @@ // function ref() { } // /** @see {r2} */ // function d3() { } -// function r2/*FIND ALL REFS*/[|r2|]() { } +// function [|r2|]/*FIND ALL REFS*/() { } // } @@ -124,7 +124,7 @@ // === findAllReferences === // === /findAllReferencesLinkTag1.ts === -// class C/*FIND ALL REFS*/[|C|] { +// class [|C|]/*FIND ALL REFS*/ { // m() { } // n = 1 // static s() { } @@ -169,7 +169,7 @@ // r() { } // } // -// interface I/*FIND ALL REFS*/[|I|] { +// interface [|I|]/*FIND ALL REFS*/ { // a() // b: 1 // /** diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag2.baseline.jsonc index ea6869acf9..f0d369461d 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag2.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag2.baseline.jsonc @@ -6,7 +6,7 @@ // This = class { // show() { } // } -// m/*FIND ALL REFS*/[|m|]() { } +// [|m|]/*FIND ALL REFS*/() { } // } // /** // * @see {Consider.prototype.m} @@ -21,7 +21,7 @@ // namespace NPR { // export class Consider { // This = class { -// show/*FIND ALL REFS*/[|show|]() { } +// [|show|]/*FIND ALL REFS*/() { } // } // m() { } // } @@ -35,7 +35,7 @@ // namespace NPR { // export class Consider { -// This/*FIND ALL REFS*/[|This|] = class { +// [|This|]/*FIND ALL REFS*/ = class { // show() { } // } // m() { } @@ -48,7 +48,7 @@ // === /findAllReferencesLinkTag2.ts === // namespace NPR { -// export class Consider/*FIND ALL REFS*/[|Consider|] { +// export class [|Consider|]/*FIND ALL REFS*/ { // This = class { // show() { } // } @@ -80,7 +80,7 @@ // === findAllReferences === // === /findAllReferencesLinkTag2.ts === -// namespace NPR/*FIND ALL REFS*/[|NPR|] { +// namespace [|NPR|]/*FIND ALL REFS*/ { // export class Consider { // This = class { // show() { } diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag3.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag3.baseline.jsonc index 16b0623ff3..705765b241 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag3.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag3.baseline.jsonc @@ -6,7 +6,7 @@ // This = class { // show() { } // } -// m/*FIND ALL REFS*/[|m|]() { } +// [|m|]/*FIND ALL REFS*/() { } // } // /** // * {@linkcode Consider.prototype.[|m|]} @@ -24,7 +24,7 @@ // namespace NPR { // export class Consider { // This = class { -// show/*FIND ALL REFS*/[|show|]() { } +// [|show|]/*FIND ALL REFS*/() { } // } // m() { } // } @@ -38,7 +38,7 @@ // namespace NPR { // export class Consider { -// This/*FIND ALL REFS*/[|This|] = class { +// [|This|]/*FIND ALL REFS*/ = class { // show() { } // } // m() { } @@ -51,7 +51,7 @@ // === /findAllReferencesLinkTag3.ts === // namespace NPR { -// export class Consider/*FIND ALL REFS*/[|Consider|] { +// export class [|Consider|]/*FIND ALL REFS*/ { // This = class { // show() { } // } @@ -83,7 +83,7 @@ // === findAllReferences === // === /findAllReferencesLinkTag3.ts === -// namespace NPR/*FIND ALL REFS*/[|NPR|] { +// namespace [|NPR|]/*FIND ALL REFS*/ { // export class Consider { // This = class { // show() { } diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesNonExistentExportBinding.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesNonExistentExportBinding.baseline.jsonc index 6f44ed40d7..39199dbee6 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesNonExistentExportBinding.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesNonExistentExportBinding.baseline.jsonc @@ -1,4 +1,4 @@ // === findAllReferences === // === /bar.ts === -// import { Foo/*FIND ALL REFS*/[|Foo|] } from "./foo"; +// import { [|Foo|]/*FIND ALL REFS*/ } from "./foo"; diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesTripleSlash.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesTripleSlash.baseline.jsonc new file mode 100644 index 0000000000..ff21e68ef0 --- /dev/null +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesTripleSlash.baseline.jsonc @@ -0,0 +1,14 @@ +// === findAllReferences === +// === /a.ts === + +// /// +// /// + + + + +// === findAllReferences === +// === /a.ts === + +// /// +// /// diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsEnumMember.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsEnumMember.baseline.jsonc index fce503b58b..37857947e8 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsEnumMember.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsEnumMember.baseline.jsonc @@ -20,4 +20,4 @@ // === /findAllRefsEnumMember.ts === // enum E { [|A|], B } -// const e: E.A = E./*FIND ALL REFS*/[|A|] = E.[|A|]; +// const e: E.[|A|] = E./*FIND ALL REFS*/[|A|]; diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForFunctionExpression01.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForFunctionExpression01.baseline.jsonc index 5420705574..b87a54edce 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForFunctionExpression01.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForFunctionExpression01.baseline.jsonc @@ -21,7 +21,7 @@ // === findAllReferences === // === /file1.ts === -// var foo = function foo(a = /*FIND ALL REFS*/[|foo|](a = [|foo|](), b = () => [|foo|]) { +// var foo = function [|foo|](a = /*FIND ALL REFS*/[|foo|](), b = () => [|foo|]) { // [|foo|]([|foo|], [|foo|]); // } @@ -31,7 +31,7 @@ // === findAllReferences === // === /file1.ts === -// var foo = function foo(a = foo(), b = () => /*FIND ALL REFS*/[|foo|](a = [|foo|](), b = () => [|foo|]) { +// var foo = function [|foo|](a = [|foo|](), b = () => /*FIND ALL REFS*/[|foo|]) { // [|foo|]([|foo|], [|foo|]); // } @@ -52,7 +52,7 @@ // === /file1.ts === // var foo = function [|foo|](a = [|foo|](), b = () => [|foo|]) { -// foo(/*FIND ALL REFS*/[|foo|]([|foo|], [|foo|]); +// [|foo|](/*FIND ALL REFS*/[|foo|], [|foo|]); // } @@ -62,5 +62,5 @@ // === /file1.ts === // var foo = function [|foo|](a = [|foo|](), b = () => [|foo|]) { -// foo(foo, /*FIND ALL REFS*/[|foo|]([|foo|], [|foo|]); +// [|foo|]([|foo|], /*FIND ALL REFS*/[|foo|]); // } diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCall.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCall.baseline.jsonc index 373d783fab..eeaa45f0e4 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCall.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCall.baseline.jsonc @@ -1,7 +1,7 @@ // === findAllReferences === // === /app.ts === -// export function he/*FIND ALL REFS*/[|hello|]() {}; +// export function [|he/*FIND ALL REFS*/llo|]() {}; // === /direct-use.ts === diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCallType.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCallType.baseline.jsonc index 736676b75a..3b134b8e89 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCallType.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCallType.baseline.jsonc @@ -1,7 +1,7 @@ // === findAllReferences === // === /app.ts === -// export function he/*FIND ALL REFS*/[|hello|]() {}; +// export function [|he/*FIND ALL REFS*/llo|]() {}; // === /indirect-use.ts === diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates1.baseline.jsonc index 66422cec63..41a93f2506 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates1.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates1.baseline.jsonc @@ -29,4 +29,4 @@ // === /findAllRefsInsideTemplates1.ts === // var [|x|] = 10; -// var y = `${ x } ${ /*FIND ALL REFS*/[|x|] } ${ [|x|] }` +// var y = `${ [|x|] } ${ /*FIND ALL REFS*/[|x|] }` diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates2.baseline.jsonc index 2f308122c1..846f0a7c87 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates2.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates2.baseline.jsonc @@ -29,7 +29,7 @@ // === /findAllRefsInsideTemplates2.ts === // function [|f|](...rest: any[]) { } -// f `${ /*FIND ALL REFS*/[|f|] `${ [|f|] } ${ [|f|] }` +// [|f|] `${ /*FIND ALL REFS*/[|f|] } ${ [|f|] }` @@ -38,4 +38,4 @@ // === /findAllRefsInsideTemplates2.ts === // function [|f|](...rest: any[]) { } -// f `${ f } ${ /*FIND ALL REFS*/[|f|] `${ [|f|] } ${ [|f|] }` +// [|f|] `${ [|f|] } ${ /*FIND ALL REFS*/[|f|] }` diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideWithBlock.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideWithBlock.baseline.jsonc index d35e86b4d2..5d7c031f52 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideWithBlock.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideWithBlock.baseline.jsonc @@ -50,4 +50,4 @@ // y++; // also reference for y should be ignored // } // -// x = /*FIND ALL REFS*/[|x|] = [|x|] + 1; +// [|x|] = /*FIND ALL REFS*/[|x|] + 1; diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsIsDefinition.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsIsDefinition.baseline.jsonc index 640e9faa8d..35488ee0eb 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsIsDefinition.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsIsDefinition.baseline.jsonc @@ -3,7 +3,7 @@ // declare function [|foo|](a: number): number; // declare function [|foo|](a: string): string; -// declare function foo/*FIND ALL REFS*/[|foo|](a: string | number): string | number; +// declare function [|foo|]/*FIND ALL REFS*/(a: string | number): string | number; // // function foon(a: number): number; // function foon(a: string): string; @@ -29,7 +29,7 @@ // // function [|foon|](a: number): number; // function [|foon|](a: string): string; -// function foon/*FIND ALL REFS*/[|foon|](a: string | number): string | number { +// function [|foon|]/*FIND ALL REFS*/(a: string | number): string | number { // return a // } // @@ -49,7 +49,7 @@ // // foo; foon; // -// export const bar/*FIND ALL REFS*/[|bar|] = 123; +// export const [|bar|]/*FIND ALL REFS*/ = 123; // console.log({ [|bar|] }); // // interface IFoo { @@ -66,7 +66,7 @@ // console.log({ bar }); // // interface IFoo { -// foo/*FIND ALL REFS*/[|foo|](): void; +// [|foo|]/*FIND ALL REFS*/(): void; // } // class Foo implements IFoo { // constructor(n: number) @@ -110,6 +110,6 @@ // constructor(n: number) // constructor() // constructor(n: number?) { } -// foo/*FIND ALL REFS*/[|foo|](): void { } +// [|foo|]/*FIND ALL REFS*/(): void { } // static init() { return new this() } // } diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag.baseline.jsonc index 194115ed98..d2337a4dcc 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag.baseline.jsonc @@ -6,6 +6,6 @@ // */ // // /** -// * @param { A/*FIND ALL REFS*/[|A|] } a +// * @param { [|A|]/*FIND ALL REFS*/ } a // */ // function f(a) {} diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag2.baseline.jsonc index a2ec533fb8..31938d9d3c 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag2.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag2.baseline.jsonc @@ -13,7 +13,7 @@ // import [|Component|] from './component.js'; // // /** -// * @extends Component/*FIND ALL REFS*/[|Component|] +// * @extends [|Component|]/*FIND ALL REFS*/ // */ // export class Player extends [|Component|] {} diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag3.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag3.baseline.jsonc index 7ad3975207..10771f398c 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag3.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag3.baseline.jsonc @@ -13,7 +13,7 @@ // import { [|Component|] } from './component.js'; // // /** -// * @extends Component/*FIND ALL REFS*/[|Component|] +// * @extends [|Component|]/*FIND ALL REFS*/ // */ // export class Player extends [|Component|] {} diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag4.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag4.baseline.jsonc index b5667df472..00dad63ffb 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag4.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag4.baseline.jsonc @@ -4,6 +4,6 @@ // import * as [|C|] from './component.js'; // // /** -// * @extends C/*FIND ALL REFS*/[|C|].Component +// * @extends [|C|]/*FIND ALL REFS*/.Component // */ // export class Player extends Component {} diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsMissingModulesOverlappingSpecifiers.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsMissingModulesOverlappingSpecifiers.baseline.jsonc index 3084b91d0c..f7cf770d52 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsMissingModulesOverlappingSpecifiers.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsMissingModulesOverlappingSpecifiers.baseline.jsonc @@ -13,4 +13,4 @@ // // https://github.com/microsoft/TypeScript/issues/5551 // import { resolve as resolveUrl } from "idontcare"; -// import { resolve/*FIND ALL REFS*/[|resolve|] } from "whatever"; +// import { [|resolve|]/*FIND ALL REFS*/ } from "whatever"; diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName03.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName03.baseline.jsonc index 693b834f7f..58c28b0f61 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName03.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName03.baseline.jsonc @@ -21,4 +21,4 @@ // } // // var foo: I; -// var [ { property1: prop1 }, { /*FIND ALL REFS*/[|property1|]: prop1 }, { [|property1|], property2 } ] = [foo, foo]; +// var [ { [|property1|]: prop1 }, { /*FIND ALL REFS*/[|property1|], property2 } ] = [foo, foo]; diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName10.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName10.baseline.jsonc index 8e72d7afce..e31ad68b38 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName10.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName10.baseline.jsonc @@ -48,5 +48,5 @@ // value: any; // } // -// function f ({ next: { /*FIND ALL REFS*/[|next|]: { [|next|]: x} }: Recursive) { +// function f ({ [|next|]: { /*FIND ALL REFS*/[|next|]: x} }: Recursive) { // } diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDecorators.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDecorators.baseline.jsonc index 0ed9171424..8c02da7df4 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDecorators.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDecorators.baseline.jsonc @@ -80,7 +80,7 @@ // === /b.ts === -// @decorator @/*FIND ALL REFS*/[|decorator|] @[|decorator|]("again") +// @[|decorator|] @/*FIND ALL REFS*/[|decorator|]("again") // class C { // @[|decorator|] // method() {} diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrimitiveJsDoc.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrimitiveJsDoc.baseline.jsonc index a4a258ac83..3996cc5d59 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrimitiveJsDoc.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrimitiveJsDoc.baseline.jsonc @@ -41,4 +41,4 @@ // * @param {[|number|]} n // * @returns {[|number|]} // */ -// function f(n: number): /*FIND ALL REFS*/[|number|]): [|number|] {} +// function f(n: [|number|]): /*FIND ALL REFS*/[|number|] {} diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsReExport_broken.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsReExport_broken.baseline.jsonc new file mode 100644 index 0000000000..3f5ad70a2c --- /dev/null +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsReExport_broken.baseline.jsonc @@ -0,0 +1,12 @@ +// === findAllReferences === +// === /a.ts === + +// /*FIND ALL REFS*/export { x }; + + + + +// === findAllReferences === +// === /a.ts === + +// export { /*FIND ALL REFS*/x }; diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsThisKeyword.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsThisKeyword.baseline.jsonc index 85287fafda..7b2b4938eb 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsThisKeyword.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsThisKeyword.baseline.jsonc @@ -59,7 +59,7 @@ // this; // function f(this) { // return this; -// function g(this) { return /*FIND ALL REFS*/[|this|]) { return [|this|]; } +// function g([|this|]) { return /*FIND ALL REFS*/[|this|]; } // } // class C { // static x() { diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsThisKeywordMultipleFiles.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsThisKeywordMultipleFiles.baseline.jsonc index 84f2d2a7eb..26a96ba35a 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsThisKeywordMultipleFiles.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsThisKeywordMultipleFiles.baseline.jsonc @@ -9,7 +9,7 @@ // === findAllReferences === // === /file1.ts === -// this; /*FIND ALL REFS*/[|this|]; [|this|]; +// [|this|]; /*FIND ALL REFS*/[|this|]; @@ -45,7 +45,7 @@ // === findAllReferences === // === /file3.ts === -// ((x = this, y) => /*FIND ALL REFS*/[|this|], y) => [|this|])([|this|], [|this|]); +// ((x = [|this|], y) => /*FIND ALL REFS*/[|this|])([|this|], [|this|]); // // different 'this' // function f(this) { return this; } @@ -55,7 +55,7 @@ // === findAllReferences === // === /file3.ts === -// ((x = this, y) => this)(/*FIND ALL REFS*/[|this|], y) => [|this|])([|this|], [|this|]); +// ((x = [|this|], y) => [|this|])(/*FIND ALL REFS*/[|this|], [|this|]); // // different 'this' // function f(this) { return this; } @@ -65,6 +65,6 @@ // === findAllReferences === // === /file3.ts === -// ((x = this, y) => this)(this, /*FIND ALL REFS*/[|this|], y) => [|this|])([|this|], [|this|]); +// ((x = [|this|], y) => [|this|])([|this|], /*FIND ALL REFS*/[|this|]); // // different 'this' // function f(this) { return this; } diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsTypeParameterInMergedInterface.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsTypeParameterInMergedInterface.baseline.jsonc index db5de047a8..5297bb58fe 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsTypeParameterInMergedInterface.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsTypeParameterInMergedInterface.baseline.jsonc @@ -10,7 +10,7 @@ // === findAllReferences === // === /findAllRefsTypeParameterInMergedInterface.ts === -// interface I { a: /*FIND ALL REFS*/[|T|]> { a: [|T|] } +// interface I<[|T|]> { a: /*FIND ALL REFS*/[|T|] } // interface I<[|T|]> { b: [|T|] } @@ -29,4 +29,4 @@ // === /findAllRefsTypeParameterInMergedInterface.ts === // interface I<[|T|]> { a: [|T|] } -// interface I { b: /*FIND ALL REFS*/[|T|]> { b: [|T|] } +// interface I<[|T|]> { b: /*FIND ALL REFS*/[|T|] } diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesDefinitionDisplayParts.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesDefinitionDisplayParts.baseline.jsonc index 7f74b72a6d..172064d933 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesDefinitionDisplayParts.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesDefinitionDisplayParts.baseline.jsonc @@ -1,7 +1,7 @@ // === findAllReferences === // === /findReferencesDefinitionDisplayParts.ts === -// class Gre/*FIND ALL REFS*/[|Greeter|] { +// class [|Gre/*FIND ALL REFS*/eter|] { // someFunction() { this; } // } // @@ -14,7 +14,7 @@ // === /findReferencesDefinitionDisplayParts.ts === // class Greeter { -// someFunction() { th/*FIND ALL REFS*/[|this|]; } +// someFunction() { [|th/*FIND ALL REFS*/is|]; } // } // // type Options = "option 1" | "option 2"; @@ -46,5 +46,5 @@ // type Options = "option 1" | "option 2"; // let myOption: Options = "option 1"; // -// some/*FIND ALL REFS*/[|someLabel|]: +// [|some/*FIND ALL REFS*/Label|]: // break [|someLabel|]; diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesSeeTagInTs.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesSeeTagInTs.baseline.jsonc index 6659580478..e5279dd8e3 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesSeeTagInTs.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesSeeTagInTs.baseline.jsonc @@ -1,7 +1,7 @@ // === findAllReferences === // === /findReferencesSeeTagInTs.ts === -// function doStuffWithStuff/*FIND ALL REFS*/[|doStuffWithStuff|](stuff: { quantity: number }) {} +// function [|doStuffWithStuff|]/*FIND ALL REFS*/(stuff: { quantity: number }) {} // // declare const stuff: { quantity: number }; // /** @see {doStuffWithStuff} */ diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfBindingPattern.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfBindingPattern.baseline.jsonc index 25461975f6..c7b8e2bd4f 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfBindingPattern.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfBindingPattern.baseline.jsonc @@ -10,7 +10,7 @@ // === findAllReferences === // === /getOccurrencesIsDefinitionOfBindingPattern.ts === -// const { x, y } = { /*FIND ALL REFS*/[|x|], y } = { [|x|]: 1, y: 2 }; +// const { [|x|], y } = { /*FIND ALL REFS*/[|x|]: 1, y: 2 }; // const z = x; diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfInterfaceClassMerge.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfInterfaceClassMerge.baseline.jsonc index e28de949ad..a71eb71d6e 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfInterfaceClassMerge.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfInterfaceClassMerge.baseline.jsonc @@ -135,5 +135,5 @@ // return this.p + this.m + n; // } // } -// let i: Numbers = new /*FIND ALL REFS*/[|Numbers|] = new [|Numbers|](); +// let i: [|Numbers|] = new /*FIND ALL REFS*/[|Numbers|](); // let x = i.f(i.p + i.m); diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfVariable.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfVariable.baseline.jsonc index 9d0216986b..35e18bfa6b 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfVariable.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfVariable.baseline.jsonc @@ -138,7 +138,7 @@ // var assignmentRightHandSide2 = 1 + [|x|]; // // [|x|] = 1; -// x = /*FIND ALL REFS*/[|x|] = [|x|] + [|x|]; +// [|x|] = /*FIND ALL REFS*/[|x|] + [|x|]; // // [|x|] == 1; // [|x|] <= 1; @@ -162,7 +162,7 @@ // var assignmentRightHandSide2 = 1 + [|x|]; // // [|x|] = 1; -// x = x + /*FIND ALL REFS*/[|x|] = [|x|] + [|x|]; +// [|x|] = [|x|] + /*FIND ALL REFS*/[|x|]; // // [|x|] == 1; // [|x|] <= 1; diff --git a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionShorthandProperty.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionShorthandProperty.baseline.jsonc index 3bbe7e857d..6569db3419 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionShorthandProperty.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionShorthandProperty.baseline.jsonc @@ -20,4 +20,4 @@ // === /isDefinitionShorthandProperty.ts === // const [|x|] = 1; -// const y: { x: number } = { /*FIND ALL REFS*/[|x|]: number } = { [|x|] }; +// const y: { [|x|]: number } = { /*FIND ALL REFS*/[|x|] }; diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedUnionProperties.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedUnionProperties.baseline.jsonc index 65e37f9a5f..00561940b6 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedUnionProperties.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedUnionProperties.baseline.jsonc @@ -300,7 +300,7 @@ // var c = { [|common|]: 0, b: 0 }; // // // Array literal -// var ar: Array = [{ a: 0, common: "" }, { b: 0, /*FIND ALL REFS*/[|common|]: "" }, { b: 0, [|common|]: 0 }]; +// var ar: Array = [{ a: 0, [|common|]: "" }, { b: 0, /*FIND ALL REFS*/[|common|]: 0 }]; // // // Nested object literal // var ob: { aorb: A|B } = { aorb: { b: 0, [|common|]: 0 } }; diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel6.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel6.baseline.jsonc index c2cc04b2ae..5b42b3469d 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel6.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel6.baseline.jsonc @@ -35,6 +35,6 @@ // === /referencesForLabel6.ts === // labela: while (true) { -// labelb: while (false) { break /*FIND ALL REFS*/[|labelb|]: while (false) { break [|labelb|]; } +// [|labelb|]: while (false) { break /*FIND ALL REFS*/[|labelb|]; } // break labelc; // } diff --git a/testdata/baselines/reference/fourslash/findAllRef/RemoteGetReferences.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/RemoteGetReferences.baseline.jsonc index a9c778558f..c8cc669747 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/RemoteGetReferences.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/RemoteGetReferences.baseline.jsonc @@ -536,7 +536,7 @@ // //Increments // remotefooCls.remoteclsSVar++; // remotemodTest.remotemodVar++; -// remoteglobalVar = /*FIND ALL REFS*/[|remoteglobalVar|] = [|remoteglobalVar|] + [|remoteglobalVar|]; +// [|remoteglobalVar|] = /*FIND ALL REFS*/[|remoteglobalVar|] + [|remoteglobalVar|]; // // //ETC - Other cases // [|remoteglobalVar|] = 3; @@ -612,7 +612,7 @@ // //Increments // remotefooCls.remoteclsSVar++; // remotemodTest.remotemodVar++; -// remoteglobalVar = remoteglobalVar + /*FIND ALL REFS*/[|remoteglobalVar|] = [|remoteglobalVar|] + [|remoteglobalVar|]; +// [|remoteglobalVar|] = [|remoteglobalVar|] + /*FIND ALL REFS*/[|remoteglobalVar|]; // // //ETC - Other cases // [|remoteglobalVar|] = 3; diff --git a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences4.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences4.baseline.jsonc index 41588be2b5..7ecfaf83ee 100644 --- a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences4.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences4.baseline.jsonc @@ -78,4 +78,4 @@ // } // // -// var x = ; +// var x = <[|MyClass|] name='hello'>; diff --git a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionDynamicImport3.baseline.jsonc b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionDynamicImport3.baseline.jsonc index 1c3067b56d..f9336d9e62 100644 --- a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionDynamicImport3.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionDynamicImport3.baseline.jsonc @@ -2,4 +2,4 @@ // === /foo.ts === // export function bar() { return "bar"; } -// import('./foo').then(({ ba/*GO TO DEFINITION*/[|bar|] }) => undefined); +// import('./foo').then(({ [|ba/*GO TO DEFINITION*/r|] }) => undefined); diff --git a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionDynamicImport4.baseline.jsonc b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionDynamicImport4.baseline.jsonc index 1c3067b56d..f9336d9e62 100644 --- a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionDynamicImport4.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionDynamicImport4.baseline.jsonc @@ -2,4 +2,4 @@ // === /foo.ts === // export function bar() { return "bar"; } -// import('./foo').then(({ ba/*GO TO DEFINITION*/[|bar|] }) => undefined); +// import('./foo').then(({ [|ba/*GO TO DEFINITION*/r|] }) => undefined); diff --git a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionExternalModuleName5.baseline.jsonc b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionExternalModuleName5.baseline.jsonc index d8b35efe1a..b9caefd3b2 100644 --- a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionExternalModuleName5.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionExternalModuleName5.baseline.jsonc @@ -1,6 +1,6 @@ // === goToDefinition === // === /a.ts === -// declare module "external/*GO TO DEFINITION*/[|"external"|] { +// declare module [|"external/*GO TO DEFINITION*/"|] { // class Foo { } // } diff --git a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionMember.baseline.jsonc b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionMember.baseline.jsonc index 2e1b2688af..ae021631ab 100644 --- a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionMember.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionMember.baseline.jsonc @@ -2,5 +2,5 @@ // === /a.ts === // class A { -// private z/*GO TO DEFINITION*/[|z|]: string; +// private [|z|]/*GO TO DEFINITION*/: string; // } diff --git a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionMetaProperty.baseline.jsonc b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionMetaProperty.baseline.jsonc index 64438cdf2f..f9420cf118 100644 --- a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionMetaProperty.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionMetaProperty.baseline.jsonc @@ -29,7 +29,7 @@ // === /a.ts === // import.meta; -// function f() { new.t/*GO TO DEFINITION*/[|f|]() { new.target; } +// function [|f|]() { new.t/*GO TO DEFINITION*/arget; } @@ -56,4 +56,4 @@ // === /b.ts === // import.m; -// class c { constructor() { new.t/*GO TO DEFINITION*/[|c|] { constructor() { new.target; } } +// class [|c|] { constructor() { new.t/*GO TO DEFINITION*/arget; } } diff --git a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionModifiers.baseline.jsonc b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionModifiers.baseline.jsonc index 44c9df60f1..53a4fd0a57 100644 --- a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionModifiers.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionModifiers.baseline.jsonc @@ -13,7 +13,7 @@ // === goToDefinition === // === /a.ts === -// export class A/*GO TO DEFINITION*/[|A|] { +// export class [|A|]/*GO TO DEFINITION*/ { // // private z: string; // @@ -41,7 +41,7 @@ // export class A { // -// private z/*GO TO DEFINITION*/[|z|]: string; +// private [|z|]/*GO TO DEFINITION*/: string; // // readonly x: string; // @@ -73,7 +73,7 @@ // // private z: string; // -// readonly x/*GO TO DEFINITION*/[|x|]: string; +// readonly [|x|]/*GO TO DEFINITION*/: string; // // async a() { } // @@ -105,7 +105,7 @@ // // readonly x: string; // -// async a/*GO TO DEFINITION*/[|a|]() { } +// async [|a|]/*GO TO DEFINITION*/() { } // // override b() {} // @@ -138,7 +138,7 @@ // // async a() { } // -// override b/*GO TO DEFINITION*/[|b|]() {} +// override [|b|]/*GO TO DEFINITION*/() {} // // public async c() { } // } @@ -200,7 +200,7 @@ // // override b() {} // -// public async c/*GO TO DEFINITION*/[|c|]() { } +// public async [|c|]/*GO TO DEFINITION*/() { } // } // // export function foo() { } @@ -227,4 +227,4 @@ // public async c() { } // } // -// export function foo/*GO TO DEFINITION*/[|foo|]() { } +// export function [|foo|]/*GO TO DEFINITION*/() { } diff --git a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionSignatureAlias_require.baseline.jsonc b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionSignatureAlias_require.baseline.jsonc index b25869586f..c578da7514 100644 --- a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionSignatureAlias_require.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionSignatureAlias_require.baseline.jsonc @@ -1,7 +1,7 @@ // === goToDefinition === // === /a.js === -// [|module.exports = function f() {}|][|f|]() {} +// [|module.exports = function [|f|]() {}|] // === /b.js === @@ -15,7 +15,7 @@ // === goToDefinition === // === /a.js === -// [|module.exports = function f() {}|][|f|]() {} +// [|module.exports = function [|f|]() {}|] // === /bar.ts === diff --git a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionThis.baseline.jsonc b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionThis.baseline.jsonc index 777b49ba3f..d0f6ad2f1e 100644 --- a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionThis.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionThis.baseline.jsonc @@ -34,5 +34,5 @@ // } // class C { // constructor() { return this; } -// get self(this: number) { return /*GO TO DEFINITION*/[|this|]: number) { return this; } +// get self([|this|]: number) { return /*GO TO DEFINITION*/this; } // } diff --git a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionTypePredicate.baseline.jsonc b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionTypePredicate.baseline.jsonc index 435ad196c3..06030ad664 100644 --- a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionTypePredicate.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionTypePredicate.baseline.jsonc @@ -2,7 +2,7 @@ // === /goToDefinitionTypePredicate.ts === // class A {} -// function f(parameter: any): /*GO TO DEFINITION*/[|parameter|]: any): parameter is A { +// function f([|parameter|]: any): /*GO TO DEFINITION*/parameter is A { // return typeof parameter === "string"; // } diff --git a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionTypeofThis.baseline.jsonc b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionTypeofThis.baseline.jsonc index 727f6f5880..03a7182e97 100644 --- a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionTypeofThis.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionTypeofThis.baseline.jsonc @@ -34,5 +34,5 @@ // } // class C { // constructor() { type X = typeof this; } -// get self(this: number) { type X = typeof /*GO TO DEFINITION*/[|this|]: number) { type X = typeof this; } +// get self([|this|]: number) { type X = typeof /*GO TO DEFINITION*/this; } // } diff --git a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionYield4.baseline.jsonc b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionYield4.baseline.jsonc index 895b2cff68..624d2127a2 100644 --- a/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionYield4.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/goToDef/GoToDefinitionYield4.baseline.jsonc @@ -2,5 +2,5 @@ // === /goToDefinitionYield4.ts === // function* gen() { -// class C { [/*GO TO DEFINITION*/[|[yield 10]|]() {} } +// class C { [|[/*GO TO DEFINITION*/yield 10]|]() {} } // } diff --git a/testdata/baselines/reference/fourslash/goToDef/GotoDefinitionInObjectBindingPattern1.baseline.jsonc b/testdata/baselines/reference/fourslash/goToDef/GotoDefinitionInObjectBindingPattern1.baseline.jsonc index 7d088998b8..0421bd3223 100644 --- a/testdata/baselines/reference/fourslash/goToDef/GotoDefinitionInObjectBindingPattern1.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/goToDef/GotoDefinitionInObjectBindingPattern1.baseline.jsonc @@ -5,4 +5,4 @@ // interface Test { // prop2: number // } -// bar(({pr/*GO TO DEFINITION*/[|prop2|]})=>{}); +// bar(({[|pr/*GO TO DEFINITION*/op2|]})=>{}); diff --git a/testdata/baselines/reference/fourslash/goToDef/GotoDefinitionInObjectBindingPattern2.baseline.jsonc b/testdata/baselines/reference/fourslash/goToDef/GotoDefinitionInObjectBindingPattern2.baseline.jsonc index 7eff2010c1..f39402524e 100644 --- a/testdata/baselines/reference/fourslash/goToDef/GotoDefinitionInObjectBindingPattern2.baseline.jsonc +++ b/testdata/baselines/reference/fourslash/goToDef/GotoDefinitionInObjectBindingPattern2.baseline.jsonc @@ -1,7 +1,7 @@ // === goToDefinition === // === /gotoDefinitionInObjectBindingPattern2.ts === -// var p0 = ({a/*GO TO DEFINITION*/[|aa|]}) => {console.log(aa)}; +// var p0 = ({[|a/*GO TO DEFINITION*/a|]}) => {console.log(aa)}; // function f2({ a1, b1 }: { a1: number, b1: number } = { a1: 0, b1: 0 }) {} @@ -11,7 +11,7 @@ // === /gotoDefinitionInObjectBindingPattern2.ts === // var p0 = ({aa}) => {console.log(aa)}; -// function f2({ a/*GO TO DEFINITION*/[|a1|], b1 }: { a1: number, b1: number } = { a1: 0, b1: 0 }) {} +// function f2({ [|a/*GO TO DEFINITION*/1|], b1 }: { a1: number, b1: number } = { a1: 0, b1: 0 }) {} @@ -20,4 +20,4 @@ // === /gotoDefinitionInObjectBindingPattern2.ts === // var p0 = ({aa}) => {console.log(aa)}; -// function f2({ a1, b/*GO TO DEFINITION*/[|b1|] }: { a1: number, b1: number } = { a1: 0, b1: 0 }) {} +// function f2({ a1, [|b/*GO TO DEFINITION*/1|] }: { a1: number, b1: number } = { a1: 0, b1: 0 }) {}