From ab2312df604f0a1767647ecd2a8c99f631030865 Mon Sep 17 00:00:00 2001
From: Oleksandr Tarasiuk <oleksandr.tarasiuk@outlook.com>
Date: Thu, 3 Jul 2025 17:11:39 +0300
Subject: [PATCH 1/2] fix(1342): adjust node ranges to ignore trivia

---
 internal/ls/findallreferences.go            |  2 +-
 internal/ls/findallreferences_test.go       | 13 +++++++++++++
 internal/ls/findallreferencesexport_test.go |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/internal/ls/findallreferences.go b/internal/ls/findallreferences.go
index ff48544ba1..4b21242a80 100644
--- a/internal/ls/findallreferences.go
+++ b/internal/ls/findallreferences.go
@@ -419,7 +419,7 @@ func (l *LanguageService) convertSymbolAndEntryToLocation(s *SymbolAndEntries) [
 	for _, ref := range s.references {
 		if ref.textRange == nil {
 			sourceFile := ast.GetSourceFileOfNode(ref.node)
-			ref.textRange = l.createLspRangeFromNode(ref.node, ast.GetSourceFileOfNode(ref.node))
+			ref.textRange = l.getRangeOfNode(ref.node, sourceFile, nil /*endNode*/)
 			ref.fileName = sourceFile.FileName()
 		}
 		locations = append(locations, &lsproto.Location{
diff --git a/internal/ls/findallreferences_test.go b/internal/ls/findallreferences_test.go
index 2041c65636..8220e6263c 100644
--- a/internal/ls/findallreferences_test.go
+++ b/internal/ls/findallreferences_test.go
@@ -241,6 +241,19 @@ class C extends [|/*3*/Base|] { }`,
 				"3": collections.NewSetFromItems("2", "3"),
 			},
 		},
+		{
+			title: "findAllRefsTrivia",
+			input: `export interface A {
+    /** Comment */
+    [|/*m1*/method|](): string;
+    /** Comment */
+    [|/*m2*/method|](format: string): string;
+}`,
+			expectedLocations: map[string]*collections.Set[string]{
+				"m1": collections.NewSetFromItems("m1", "m2"),
+				"m2": collections.NewSetFromItems("m1", "m2"),
+			},
+		},
 	}
 
 	for _, testCase := range testCases {
diff --git a/internal/ls/findallreferencesexport_test.go b/internal/ls/findallreferencesexport_test.go
index 0077a3d7a6..9fe040197c 100644
--- a/internal/ls/findallreferencesexport_test.go
+++ b/internal/ls/findallreferencesexport_test.go
@@ -13,7 +13,7 @@ func (l *LanguageService) GetExpectedReferenceFromMarker(fileName string, pos in
 	node := astnav.GetTouchingPropertyName(sourceFile, pos)
 	return &lsproto.Location{
 		Uri:   FileNameToDocumentURI(fileName),
-		Range: *l.createLspRangeFromNode(node, sourceFile),
+		Range: *l.getRangeOfNode(node, sourceFile, nil /*endNode*/),
 	}
 }
 

From a79f21a2cd814df342bbcd38f777d28714fd80b7 Mon Sep 17 00:00:00 2001
From: Oleksandr Tarasiuk <oleksandr.tarasiuk@outlook.com>
Date: Fri, 11 Jul 2025 21:03:38 +0300
Subject: [PATCH 2/2] update baseline

---
 ...ortProvider_referencesCrash.baseline.jsonc |   4 +-
 ...nstructorFindAllReferences3.baseline.jsonc |   4 +-
 ...uleInteropFindAllReferences.baseline.jsonc |   4 +-
 ...leInteropFindAllReferences2.baseline.jsonc |   4 +-
 ...FilteringMappedTypeProperty.baseline.jsonc |   6 +-
 ...rencesFromLinkTagReference1.baseline.jsonc |   4 +-
 ...rencesFromLinkTagReference2.baseline.jsonc |   4 +-
 ...rencesFromLinkTagReference3.baseline.jsonc |   4 +-
 ...rencesFromLinkTagReference4.baseline.jsonc |   4 +-
 ...rencesFromLinkTagReference5.baseline.jsonc |   4 +-
 ...ReferencesJSDocFunctionThis.baseline.jsonc |   2 +-
 ...OverloadedFunctionParameter.baseline.jsonc |   2 +-
 ...encesJsRequireDestructuring.baseline.jsonc |   6 +-
 ...ncesJsRequireDestructuring1.baseline.jsonc |   4 +-
 .../FindAllReferencesLinkTag1.baseline.jsonc  |  30 +-
 .../FindAllReferencesLinkTag2.baseline.jsonc  |  16 +-
 .../FindAllReferencesLinkTag3.baseline.jsonc  |  16 +-
 ...cesNonExistentExportBinding.baseline.jsonc |   2 +-
 ...dAllReferencesOfConstructor.baseline.jsonc |  18 +-
 ...esOfConstructor_badOverload.baseline.jsonc |   4 +-
 ...ndAllReferencesOfJsonModule.baseline.jsonc |   8 +-
 .../FindAllReferencesUndefined.baseline.jsonc |   2 +-
 .../FindAllRefsBadImport.baseline.jsonc       |   2 +-
 .../FindAllRefsCatchClause.baseline.jsonc     |   8 +-
 ...FindAllRefsClassExpression0.baseline.jsonc |  16 +-
 ...FindAllRefsClassExpression1.baseline.jsonc |  10 +-
 ...FindAllRefsClassExpression2.baseline.jsonc |   8 +-
 ...indAllRefsClassStaticBlocks.baseline.jsonc |  16 +-
 ...AllRefsConstructorFunctions.baseline.jsonc |   8 +-
 .../FindAllRefsDeclareClass.baseline.jsonc    |   2 +-
 .../FindAllRefsDefaultImport.baseline.jsonc   |   4 +-
 .../FindAllRefsDefinition.baseline.jsonc      |   8 +-
 ...ndAllRefsDestructureGeneric.baseline.jsonc |  12 +-
 ...indAllRefsDestructureGetter.baseline.jsonc |  28 +-
 .../FindAllRefsEnumAsNamespace.baseline.jsonc |   8 +-
 .../FindAllRefsEnumMember.baseline.jsonc      |   6 +-
 ...RefsExportConstEqualToClass.baseline.jsonc |   4 +-
 ...dAllRefsExportNotAtTopLevel.baseline.jsonc |   8 +-
 ...llRefsForComputedProperties.baseline.jsonc |  10 +-
 ...lRefsForComputedProperties2.baseline.jsonc |   2 +-
 ...ndAllRefsForDefaultExport01.baseline.jsonc |  18 +-
 ...ndAllRefsForDefaultExport02.baseline.jsonc |  34 +-
 ...ndAllRefsForDefaultExport04.baseline.jsonc |  16 +-
 ...ndAllRefsForDefaultExport09.baseline.jsonc |  16 +-
 ...fsForDefaultExport_reExport.baseline.jsonc |  10 +-
 ...indAllRefsForDefaultKeyword.baseline.jsonc |   7 +-
 ...RefsForFunctionExpression01.baseline.jsonc |  24 +-
 .../FindAllRefsForImportCall.baseline.jsonc   |   2 +-
 ...indAllRefsForImportCallType.baseline.jsonc |   2 +-
 .../FindAllRefsForMappedType.baseline.jsonc   |   2 +-
 ...sForObjectLiteralProperties.baseline.jsonc |  12 +-
 .../FindAllRefsForObjectSpread.baseline.jsonc |  10 +-
 .../FindAllRefsForRest.baseline.jsonc         |   8 +-
 ...icInstanceMethodInheritance.baseline.jsonc |  20 +-
 ...InstancePropertyInheritance.baseline.jsonc |  48 +-
 ...ndAllRefsForUMDModuleAlias1.baseline.jsonc |   8 +-
 ...orVariableInExtendsClause01.baseline.jsonc |   8 +-
 ...orVariableInExtendsClause02.baseline.jsonc |   8 +-
 .../FindAllRefsImportType.baseline.jsonc      |   2 +-
 ...indAllRefsInClassExpression.baseline.jsonc |  12 +-
 ...ndAllRefsIndexedAccessTypes.baseline.jsonc |  20 +-
 ...AllRefsInheritedProperties1.baseline.jsonc |  16 +-
 ...AllRefsInheritedProperties2.baseline.jsonc |  16 +-
 ...AllRefsInheritedProperties3.baseline.jsonc |  84 ++--
 ...AllRefsInheritedProperties4.baseline.jsonc |  28 +-
 ...AllRefsInheritedProperties5.baseline.jsonc |  24 +-
 ...FindAllRefsInsideTemplates1.baseline.jsonc |  12 +-
 ...FindAllRefsInsideTemplates2.baseline.jsonc |  16 +-
 .../FindAllRefsInsideWithBlock.baseline.jsonc |  18 +-
 .../FindAllRefsIsDefinition.baseline.jsonc    |  46 +-
 .../FindAllRefsJsDocImportTag2.baseline.jsonc |   4 +-
 .../FindAllRefsJsDocImportTag3.baseline.jsonc |   4 +-
 .../FindAllRefsJsDocImportTag4.baseline.jsonc |   2 +-
 .../FindAllRefsJsDocImportTag5.baseline.jsonc |   2 +-
 ...efsJsThisPropertyAssignment.baseline.jsonc |   2 +-
 ...fsJsThisPropertyAssignment2.baseline.jsonc |   4 +-
 .../FindAllRefsMappedType.baseline.jsonc      |   6 +-
 ...odulesOverlappingSpecifiers.baseline.jsonc |   2 +-
 .../FindAllRefsNoImportClause.baseline.jsonc  |   2 +-
 ...indingElementPropertyName01.baseline.jsonc |  12 +-
 ...indingElementPropertyName02.baseline.jsonc |  12 +-
 ...indingElementPropertyName03.baseline.jsonc |  12 +-
 ...indingElementPropertyName04.baseline.jsonc |  30 +-
 ...indingElementPropertyName06.baseline.jsonc |  42 +-
 ...indingElementPropertyName07.baseline.jsonc |   2 +-
 ...indingElementPropertyName10.baseline.jsonc |  18 +-
 ...sOfConstructor_withModifier.baseline.jsonc |   4 +-
 .../FindAllRefsOnDecorators.baseline.jsonc    |  30 +-
 .../FindAllRefsOnDefinition.baseline.jsonc    |   4 +-
 .../FindAllRefsOnDefinition2.baseline.jsonc   |   4 +-
 .../FindAllRefsOnImportAliases.baseline.jsonc |  10 +-
 ...OnPrivateParameterProperty1.baseline.jsonc |   4 +-
 ...rameterPropertyDeclaration1.baseline.jsonc |   4 +-
 ...rameterPropertyDeclaration2.baseline.jsonc |  12 +-
 ...rameterPropertyDeclaration3.baseline.jsonc |  12 +-
 ...ertyDeclaration_inheritance.baseline.jsonc |  22 +-
 .../FindAllRefsPrimitiveJsDoc.baseline.jsonc  |   8 +-
 ...AllRefsPrivateNameAccessors.baseline.jsonc |  24 +-
 ...ndAllRefsPrivateNameMethods.baseline.jsonc |  22 +-
 ...llRefsPrivateNameProperties.baseline.jsonc |  38 +-
 ...textuallyTypedByTypeParam01.baseline.jsonc |   4 +-
 ...dPropertyInDerivedInterface.baseline.jsonc |  12 +-
 .../FindAllRefsRootSymbols.baseline.jsonc     |  12 +-
 .../FindAllRefsThisKeyword.baseline.jsonc     |  48 +-
 ...efsThisKeywordMultipleFiles.baseline.jsonc |  20 +-
 ...eParameterInMergedInterface.baseline.jsonc |  16 +-
 .../FindAllRefsTypeofImport.baseline.jsonc    |   4 +-
 .../FindAllRefsUnionProperty.baseline.jsonc   |  36 +-
 ...ndAllRefsUnresolvedSymbols1.baseline.jsonc |  36 +-
 ...ndAllRefsUnresolvedSymbols2.baseline.jsonc |  98 ++--
 ...ndAllRefsUnresolvedSymbols3.baseline.jsonc |  98 ++--
 ...WithLeadingUnderscoreNames1.baseline.jsonc |   4 +-
 ...WithLeadingUnderscoreNames2.baseline.jsonc |   4 +-
 ...WithLeadingUnderscoreNames3.baseline.jsonc |   4 +-
 ...WithLeadingUnderscoreNames4.baseline.jsonc |   4 +-
 ...WithLeadingUnderscoreNames5.baseline.jsonc |   4 +-
 ...WithLeadingUnderscoreNames6.baseline.jsonc |   4 +-
 ...WithLeadingUnderscoreNames7.baseline.jsonc |   8 +-
 ...WithLeadingUnderscoreNames8.baseline.jsonc |   8 +-
 ...WithLeadingUnderscoreNames9.baseline.jsonc |   8 +-
 ...ShorthandPropertyAssignment.baseline.jsonc |  12 +-
 ...horthandPropertyAssignment2.baseline.jsonc |  10 +-
 .../FindAllRefsWriteAccess.baseline.jsonc     |  10 +-
 ...mportType_meaningAtLocation.baseline.jsonc |   8 +-
 ...indAllRefs_importType_named.baseline.jsonc |   8 +-
 .../FindAllRefs_jsEnum.baseline.jsonc         |  18 +-
 ...encesAcrossMultipleProjects.baseline.jsonc |  18 +-
 ...ndingPatternInJsdocNoCrash1.baseline.jsonc |   2 +-
 ...ndingPatternInJsdocNoCrash2.baseline.jsonc |   2 +-
 ...encesDefinitionDisplayParts.baseline.jsonc |  15 +-
 .../FindReferencesJSXTagName.baseline.jsonc   |   4 +-
 .../FindReferencesJSXTagName2.baseline.jsonc  |   4 +-
 .../FindReferencesSeeTagInTs.baseline.jsonc   |   2 +-
 ...IsDefinitionOfArrowFunction.baseline.jsonc |   8 +-
 ...sDefinitionOfBindingPattern.baseline.jsonc |  10 +-
 ...urrencesIsDefinitionOfClass.baseline.jsonc |   8 +-
 ...efinitionOfComputedProperty.baseline.jsonc |  12 +-
 ...currencesIsDefinitionOfEnum.baseline.jsonc |   8 +-
 ...rrencesIsDefinitionOfExport.baseline.jsonc |   6 +-
 ...encesIsDefinitionOfFunction.baseline.jsonc |  12 +-
 ...ncesIsDefinitionOfInterface.baseline.jsonc |   8 +-
 ...nitionOfInterfaceClassMerge.baseline.jsonc |  40 +-
 ...ncesIsDefinitionOfNamespace.baseline.jsonc |   8 +-
 ...nitionOfNumberNamedProperty.baseline.jsonc |   4 +-
 ...ncesIsDefinitionOfParameter.baseline.jsonc |   4 +-
 ...nitionOfStringNamedProperty.baseline.jsonc |   6 +-
 ...ncesIsDefinitionOfTypeAlias.baseline.jsonc |   8 +-
 ...encesIsDefinitionOfVariable.baseline.jsonc | 330 ++++++-------
 ...initionAcrossGlobalProjects.baseline.jsonc |  33 +-
 ...initionAcrossModuleProjects.baseline.jsonc |  50 +-
 ...tionInterfaceImplementation.baseline.jsonc |  16 +-
 .../IsDefinitionOverloads.baseline.jsonc      |  30 +-
 ...DefinitionShorthandProperty.baseline.jsonc |   8 +-
 .../IsDefinitionSingleImport.baseline.jsonc   |   4 +-
 ...IsDefinitionSingleReference.baseline.jsonc |   8 +-
 ...ThrowsTag_findAllReferences.baseline.jsonc |   2 +-
 ...cTypedefTagSemanticMeaning0.baseline.jsonc |   8 +-
 ...cTypedefTagSemanticMeaning1.baseline.jsonc |   8 +-
 ...arameterPropertyDeclaration.baseline.jsonc |  12 +-
 .../ReferenceToClass.baseline.jsonc           |  62 +--
 .../findAllRef/References01.baseline.jsonc    |   4 +-
 .../ReferencesBloomFilters.baseline.jsonc     |   2 +-
 .../ReferencesBloomFilters2.baseline.jsonc    |   2 +-
 .../ReferencesBloomFilters3.baseline.jsonc    |   6 +-
 .../ReferencesForAmbients.baseline.jsonc      |  32 +-
 .../ReferencesForClassLocal.baseline.jsonc    |   6 +-
 .../ReferencesForClassMembers.baseline.jsonc  |  48 +-
 ...mbersExtendingAbstractClass.baseline.jsonc |  36 +-
 ...embersExtendingGenericClass.baseline.jsonc |  48 +-
 ...ReferencesForClassParameter.baseline.jsonc |   6 +-
 ...ypedObjectLiteralProperties.baseline.jsonc |   2 +-
 ...xtuallyTypedUnionProperties.baseline.jsonc |  27 +-
 ...tuallyTypedUnionProperties2.baseline.jsonc |   8 +-
 .../ReferencesForEnums.baseline.jsonc         |  50 +-
 ...rencesForExpressionKeywords.baseline.jsonc |  24 +-
 ...encesForExternalModuleNames.baseline.jsonc |   6 +-
 ...erencesForFunctionOverloads.baseline.jsonc |  18 +-
 ...erencesForFunctionParameter.baseline.jsonc |  18 +-
 .../ReferencesForGlobals.baseline.jsonc       |  26 +-
 .../ReferencesForGlobals2.baseline.jsonc      |   6 +-
 .../ReferencesForGlobals3.baseline.jsonc      |   6 +-
 .../ReferencesForGlobals4.baseline.jsonc      |   6 +-
 .../ReferencesForGlobals5.baseline.jsonc      |   6 +-
 ...sForGlobalsInExternalModule.baseline.jsonc |  32 +-
 ...erencesForIllegalAssignment.baseline.jsonc |   4 +-
 .../ReferencesForImports.baseline.jsonc       |  10 +-
 .../ReferencesForIndexProperty.baseline.jsonc |  24 +-
 ...ReferencesForIndexProperty3.baseline.jsonc |  18 +-
 ...encesForInheritedProperties.baseline.jsonc |  48 +-
 ...ncesForInheritedProperties2.baseline.jsonc |  12 +-
 ...ncesForInheritedProperties3.baseline.jsonc |  16 +-
 ...ncesForInheritedProperties4.baseline.jsonc |  16 +-
 ...ncesForInheritedProperties5.baseline.jsonc |  16 +-
 ...ncesForInheritedProperties6.baseline.jsonc |   8 +-
 ...ncesForInheritedProperties7.baseline.jsonc |  60 ++-
 ...ncesForInheritedProperties8.baseline.jsonc |  12 +-
 ...ncesForInheritedProperties9.baseline.jsonc |  12 +-
 .../ReferencesForLabel.baseline.jsonc         |  16 +-
 .../ReferencesForLabel4.baseline.jsonc        |   4 +-
 .../ReferencesForLabel5.baseline.jsonc        |  24 +-
 .../ReferencesForLabel6.baseline.jsonc        |   8 +-
 ...rencesForMergedDeclarations.baseline.jsonc |  28 +-
 ...encesForMergedDeclarations2.baseline.jsonc |  18 +-
 ...encesForMergedDeclarations3.baseline.jsonc |  18 +-
 ...encesForMergedDeclarations4.baseline.jsonc | 162 +++----
 ...encesForMergedDeclarations5.baseline.jsonc |  12 +-
 ...encesForMergedDeclarations6.baseline.jsonc |   8 +-
 ...encesForMergedDeclarations7.baseline.jsonc |   8 +-
 ...encesForMergedDeclarations8.baseline.jsonc |   8 +-
 ...NumericLiteralPropertyNames.baseline.jsonc |   2 +-
 ...sForObjectLiteralProperties.baseline.jsonc |  16 +-
 .../ReferencesForOverrides.baseline.jsonc     |  59 ++-
 ...sForPropertiesOfGenericType.baseline.jsonc |  12 +-
 .../ReferencesForStatic.baseline.jsonc        |  16 +-
 ...ticsAndMembersWithSameNames.baseline.jsonc |  20 +-
 ...rStringLiteralPropertyNames.baseline.jsonc |   4 +-
 ...StringLiteralPropertyNames2.baseline.jsonc |  12 +-
 ...StringLiteralPropertyNames3.baseline.jsonc |  12 +-
 ...StringLiteralPropertyNames4.baseline.jsonc |   8 +-
 ...StringLiteralPropertyNames5.baseline.jsonc |   8 +-
 ...StringLiteralPropertyNames6.baseline.jsonc |   4 +-
 ...StringLiteralPropertyNames7.baseline.jsonc |   8 +-
 .../ReferencesForTypeKeywords.baseline.jsonc  |   8 +-
 ...eferencesForUnionProperties.baseline.jsonc |  20 +-
 ...ferencesInConfiguredProject.baseline.jsonc |   4 +-
 .../RemoteGetReferences.baseline.jsonc        | 450 ++++++++----------
 .../RenameJsExports02.baseline.jsonc          |   4 +-
 .../RenameJsExports03.baseline.jsonc          |  16 +-
 .../TsxFindAllReferences1.baseline.jsonc      |   8 +-
 .../TsxFindAllReferences10.baseline.jsonc     |   7 +-
 .../TsxFindAllReferences11.baseline.jsonc     |   2 +-
 .../TsxFindAllReferences2.baseline.jsonc      |   4 +-
 .../TsxFindAllReferences3.baseline.jsonc      |   7 +-
 .../TsxFindAllReferences4.baseline.jsonc      |   6 +-
 .../TsxFindAllReferences5.baseline.jsonc      |  12 +-
 .../TsxFindAllReferences6.baseline.jsonc      |   2 +-
 .../TsxFindAllReferences7.baseline.jsonc      |   7 +-
 .../TsxFindAllReferences8.baseline.jsonc      |  54 +--
 .../TsxFindAllReferences9.baseline.jsonc      |   7 +-
 ...ReferencesUnionElementType1.baseline.jsonc |   4 +-
 ...ReferencesUnionElementType2.baseline.jsonc |   4 +-
 241 files changed, 2101 insertions(+), 2172 deletions(-)

diff --git a/testdata/baselines/reference/fourslash/findAllRef/AutoImportProvider_referencesCrash.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/AutoImportProvider_referencesCrash.baseline.jsonc
index 982ae704a7..fa07b16bfd 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/AutoImportProvider_referencesCrash.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/AutoImportProvider_referencesCrash.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /home/src/workspaces/project/a/index.d.ts ===
 
-// declare class[| A|] {
+// declare class [|A|] {
 // }
 // //# sourceMappingURL=index.d.ts.map
 
@@ -9,4 +9,4 @@
 // === /home/src/workspaces/project/b/b.ts ===
 
 // /// <reference path="../a/index.d.ts" />
-// new A/*FIND ALL REFS*/[| A|]();
+// new A/*FIND ALL REFS*/[|A|]();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ConstructorFindAllReferences3.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ConstructorFindAllReferences3.baseline.jsonc
index b8678d9946..eafd38c140 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ConstructorFindAllReferences3.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ConstructorFindAllReferences3.baseline.jsonc
@@ -1,9 +1,9 @@
 // === findAllReferences ===
 // === /constructorFindAllReferences3.ts ===
 
-// export class[| C|] {
+// export class [|C|] {
 //     /*FIND ALL REFS*/constructor() { }
 //     public foo() { }
 // }
 // 
-// new[| C|]().foo();
+// new [|C|]().foo();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/EsModuleInteropFindAllReferences.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/EsModuleInteropFindAllReferences.baseline.jsonc
index dd4a0a5fb8..f46199f9b7 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/EsModuleInteropFindAllReferences.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/EsModuleInteropFindAllReferences.baseline.jsonc
@@ -7,7 +7,7 @@
 // === /abc.d.ts ===
 
 // declare module "a" {
-//     export const /*FIND ALL REFS*/[| x|]: number;
+//     export const /*FIND ALL REFS*/[|x|]: number;
 // }
 
 
@@ -17,5 +17,5 @@
 // === /abc.d.ts ===
 
 // declare module "a" {
-//     export const[| x|]: number;
+//     export const [|x|]: number;
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/EsModuleInteropFindAllReferences2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/EsModuleInteropFindAllReferences2.baseline.jsonc
index 3995e0e898..7bf0a3bd72 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/EsModuleInteropFindAllReferences2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/EsModuleInteropFindAllReferences2.baseline.jsonc
@@ -7,7 +7,7 @@
 // === /a.d.ts ===
 
 // export as namespace abc;
-// export const /*FIND ALL REFS*/[| x|]: number;
+// export const /*FIND ALL REFS*/[|x|]: number;
 
 
 
@@ -16,7 +16,7 @@
 // === /a.d.ts ===
 
 // export as namespace abc;
-// export const[| x|]: number;
+// export const [|x|]: number;
 
 
 // === /b.ts ===
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFilteringMappedTypeProperty.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFilteringMappedTypeProperty.baseline.jsonc
index 76a2e0a8ed..ee3d6ebd22 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFilteringMappedTypeProperty.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFilteringMappedTypeProperty.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllReferencesFilteringMappedTypeProperty.ts ===
 
-// const obj = { /*FIND ALL REFS*/[| a|]: 1, b: 2 };
+// const obj = { /*FIND ALL REFS*/[|a|]: 1, b: 2 };
 // const filtered: { [P in keyof typeof obj as P extends 'b' ? never : P]: 0; } = { a: 0 };
 // filtered.[|a|];
 
@@ -12,7 +12,7 @@
 // === /findAllReferencesFilteringMappedTypeProperty.ts ===
 
 // const obj = { a: 1, b: 2 };
-// const filtered: { [P in keyof typeof obj as P extends 'b' ? never : P]: 0; } = { /*FIND ALL REFS*/[| a|]: 0 };
+// const filtered: { [P in keyof typeof obj as P extends 'b' ? never : P]: 0; } = { /*FIND ALL REFS*/[|a|]: 0 };
 // filtered.a;
 
 
@@ -21,6 +21,6 @@
 // === findAllReferences ===
 // === /findAllReferencesFilteringMappedTypeProperty.ts ===
 
-// const obj = {[| a|]: 1, b: 2 };
+// const obj = { [|a|]: 1, b: 2 };
 // const filtered: { [P in keyof typeof obj as P extends 'b' ? never : P]: 0; } = { a: 0 };
 // filtered./*FIND ALL REFS*/[|a|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference1.baseline.jsonc
index f60874c300..50d5750dba 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference1.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference1.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllReferencesFromLinkTagReference1.ts ===
 
-// enum E {[|
+// enum E {
 //     /** {@link /*FIND ALL REFS*/[|A|]} */
-//     A|]
+//     [|A|]
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference2.baseline.jsonc
index 0da7a34eae..695b9e0156 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference2.baseline.jsonc
@@ -1,9 +1,9 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// enum E {[|
+// enum E {
 //     /** {@link /*FIND ALL REFS*/[|Foo|]} */
-//     Foo|]
+//     [|Foo|]
 // }
 // interface Foo {
 //     foo: E.[|Foo|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference3.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference3.baseline.jsonc
index d28991d065..6a32db2c98 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference3.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference3.baseline.jsonc
@@ -8,7 +8,7 @@
 
 // === /b.ts ===
 
-// enum E {[|
+// enum E {
 //     /** {@link /*FIND ALL REFS*/[|Foo|]} */
-//     Foo|]
+//     [|Foo|]
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference4.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference4.baseline.jsonc
index 57eea27c7d..d23437b30e 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference4.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference4.baseline.jsonc
@@ -3,6 +3,6 @@
 
 // enum E {
 //     /** {@link /*FIND ALL REFS*/[|B|]} */
-//     A,[|
-//     B|]
+//     A,
+//     [|B|]
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference5.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference5.baseline.jsonc
index 79ce00e00f..d403a9f723 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference5.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesFromLinkTagReference5.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllReferencesFromLinkTagReference5.ts ===
 
-// enum E {[|
+// enum E {
 //     /** {@link E./*FIND ALL REFS*/[|A|]} */
-//     A|]
+//     [|A|]
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJSDocFunctionThis.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJSDocFunctionThis.baseline.jsonc
index fb3b9fe424..fea3b8ffff 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJSDocFunctionThis.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJSDocFunctionThis.baseline.jsonc
@@ -2,4 +2,4 @@
 // === /Foo.js ===
 
 // /** @type {function (this: string, string): string} */
-// var f = function (s) { return /*FIND ALL REFS*/[| this|] + s; }
+// var f = function (s) { return /*FIND ALL REFS*/[|this|] + s; }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsOverloadedFunctionParameter.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsOverloadedFunctionParameter.baseline.jsonc
index cdad8e08f2..868da34a9c 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsOverloadedFunctionParameter.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsOverloadedFunctionParameter.baseline.jsonc
@@ -6,5 +6,5 @@
 //  * @returns {unknown} 
 //  */
 // function foo(x/*FIND ALL REFS*/[|x|]) {
-//   return[| x|];
+//   return [|x|];
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsRequireDestructuring.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsRequireDestructuring.baseline.jsonc
index 955a942afc..e56d91f46d 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsRequireDestructuring.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsRequireDestructuring.baseline.jsonc
@@ -1,11 +1,11 @@
 // === findAllReferences ===
 // === /bar.js ===
 
-// const { /*FIND ALL REFS*/[| foo|]: bar } = require('./foo');
+// const { /*FIND ALL REFS*/[|foo|]: bar } = require('./foo');
 
 
 // === /foo.js ===
 
-// module.exports = {[|
-//     foo|]: '1'
+// module.exports = {
+//     [|foo|]: '1'
 // };
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsRequireDestructuring1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsRequireDestructuring1.baseline.jsonc
index 30c9d17602..10edd78b3e 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsRequireDestructuring1.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesJsRequireDestructuring1.baseline.jsonc
@@ -1,9 +1,9 @@
 // === findAllReferences ===
 // === /X.js ===
 
-// module.exports = {[| x|]: 1 };
+// module.exports = { [|x|]: 1 };
 
 
 // === /Y.js ===
 
-// const { /*FIND ALL REFS*/[| x|]: { y } } = require("./X");
+// const { /*FIND ALL REFS*/[|x|]: { y } } = require("./X");
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag1.baseline.jsonc
index 54de00df9b..8ea93a9256 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag1.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag1.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /findAllReferencesLinkTag1.ts ===
 
-// class C {[|
-//     m|]/*FIND ALL REFS*/() { }
+// class C {
+//     m/*FIND ALL REFS*/[|m|]() { }
 //     n = 1
 //     static s() { }
 //     /**
@@ -25,8 +25,8 @@
 // === /findAllReferencesLinkTag1.ts ===
 
 // class C {
-//     m() { }[|
-//     n|]/*FIND ALL REFS*/ = 1
+//     m() { }
+//     n/*FIND ALL REFS*/[|n|] = 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*/[|s|]() { }
 //     /**
 //      * {@link m}
 //      * @see {m}
@@ -75,12 +75,11 @@
 // === findAllReferences ===
 // === /findAllReferencesLinkTag1.ts ===
 
-// --- (line: 32) skipped ---
-//     r() { }
+// --- (line: 33) skipped ---
 // }
 // 
-// interface I {[|
-//     a|]/*FIND ALL REFS*/()
+// interface I {
+//     a/*FIND ALL REFS*/[|a|]()
 //     b: 1
 //     /**
 //      * {@link a}
@@ -92,12 +91,11 @@
 // === findAllReferences ===
 // === /findAllReferencesLinkTag1.ts ===
 
-// --- (line: 33) skipped ---
-// }
+// --- (line: 34) skipped ---
 // 
 // interface I {
-//     a()[|
-//     b|]/*FIND ALL REFS*/: 1
+//     a()
+//     b/*FIND ALL REFS*/[|b|]: 1
 //     /**
 //      * {@link a}
 //      * @see {a}
@@ -117,7 +115,7 @@
 //     function ref() { }
 //     /** @see {r2} */
 //     function d3() { }
-//     function r2/*FIND ALL REFS*/[| r2|]() { }
+//     function r2/*FIND ALL REFS*/[|r2|]() { }
 // }
 
 
@@ -126,7 +124,7 @@
 // === findAllReferences ===
 // === /findAllReferencesLinkTag1.ts ===
 
-// class C/*FIND ALL REFS*/[| C|] {
+// class C/*FIND ALL REFS*/[|C|] {
 //     m() { }
 //     n = 1
 //     static s() { }
@@ -171,7 +169,7 @@
 //     r() { }
 // }
 // 
-// interface I/*FIND ALL REFS*/[| I|] {
+// interface I/*FIND ALL REFS*/[|I|] {
 //     a()
 //     b: 1
 //     /**
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag2.baseline.jsonc
index 199831b51f..ea6869acf9 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag2.baseline.jsonc
@@ -5,8 +5,8 @@
 //     export class Consider {
 //         This = class {
 //             show() { }
-//         }[|
-//         m|]/*FIND ALL REFS*/() { }
+//         }
+//         m/*FIND ALL REFS*/[|m|]() { }
 //     }
 //     /**
 //      * @see {Consider.prototype.m}
@@ -20,8 +20,8 @@
 
 // namespace NPR {
 //     export class Consider {
-//         This = class {[|
-//             show|]/*FIND ALL REFS*/() { }
+//         This = class {
+//             show/*FIND ALL REFS*/[|show|]() { }
 //         }
 //         m() { }
 //     }
@@ -34,8 +34,8 @@
 // === /findAllReferencesLinkTag2.ts ===
 
 // namespace NPR {
-//     export class Consider {[|
-//         This|]/*FIND ALL REFS*/ = class {
+//     export class Consider {
+//         This/*FIND ALL REFS*/[|This|] = class {
 //             show() { }
 //         }
 //         m() { }
@@ -48,7 +48,7 @@
 // === /findAllReferencesLinkTag2.ts ===
 
 // namespace NPR {
-//     export class Consider/*FIND ALL REFS*/[| Consider|] {
+//     export class Consider/*FIND ALL REFS*/[|Consider|] {
 //         This = class {
 //             show() { }
 //         }
@@ -80,7 +80,7 @@
 // === findAllReferences ===
 // === /findAllReferencesLinkTag2.ts ===
 
-// namespace NPR/*FIND ALL REFS*/[| NPR|] {
+// namespace NPR/*FIND ALL REFS*/[|NPR|] {
 //     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 5f8c3d6307..16b0623ff3 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag3.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesLinkTag3.baseline.jsonc
@@ -5,8 +5,8 @@
 //     export class Consider {
 //         This = class {
 //             show() { }
-//         }[|
-//         m|]/*FIND ALL REFS*/() { }
+//         }
+//         m/*FIND ALL REFS*/[|m|]() { }
 //     }
 //     /**
 //      * {@linkcode Consider.prototype.[|m|]}
@@ -23,8 +23,8 @@
 
 // namespace NPR {
 //     export class Consider {
-//         This = class {[|
-//             show|]/*FIND ALL REFS*/() { }
+//         This = class {
+//             show/*FIND ALL REFS*/[|show|]() { }
 //         }
 //         m() { }
 //     }
@@ -37,8 +37,8 @@
 // === /findAllReferencesLinkTag3.ts ===
 
 // namespace NPR {
-//     export class Consider {[|
-//         This|]/*FIND ALL REFS*/ = class {
+//     export class Consider {
+//         This/*FIND ALL REFS*/[|This|] = class {
 //             show() { }
 //         }
 //         m() { }
@@ -51,7 +51,7 @@
 // === /findAllReferencesLinkTag3.ts ===
 
 // namespace NPR {
-//     export class Consider/*FIND ALL REFS*/[| Consider|] {
+//     export class Consider/*FIND ALL REFS*/[|Consider|] {
 //         This = class {
 //             show() { }
 //         }
@@ -83,7 +83,7 @@
 // === findAllReferences ===
 // === /findAllReferencesLinkTag3.ts ===
 
-// namespace NPR/*FIND ALL REFS*/[| NPR|] {
+// namespace NPR/*FIND ALL REFS*/[|NPR|] {
 //     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 dd280b7f95..6f44ed40d7 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*/[|Foo|] } from "./foo";
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesOfConstructor.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesOfConstructor.baseline.jsonc
index e18ac3d5dd..333f9791ee 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesOfConstructor.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesOfConstructor.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// export class[| C|] {
+// export class [|C|] {
 //     /*FIND ALL REFS*/constructor(n: number);
 //     constructor();
 //     constructor(n?: number){}
@@ -10,8 +10,8 @@
 //         new this();
 //     }
 // }
-// new[| C|]();
-// const D =[| C|];
+// new [|C|]();
+// const D = [|C|];
 // new D();
 
 
@@ -20,7 +20,7 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// export class[| C|] {
+// export class [|C|] {
 //     constructor(n: number);
 //     /*FIND ALL REFS*/constructor();
 //     constructor(n?: number){}
@@ -29,8 +29,8 @@
 //         new this();
 //     }
 // }
-// new[| C|]();
-// const D =[| C|];
+// new [|C|]();
+// const D = [|C|];
 // new D();
 
 
@@ -39,7 +39,7 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// export class[| C|] {
+// export class [|C|] {
 //     constructor(n: number);
 //     constructor();
 //     /*FIND ALL REFS*/constructor(n?: number){}
@@ -48,6 +48,6 @@
 //         new this();
 //     }
 // }
-// new[| C|]();
-// const D =[| C|];
+// new [|C|]();
+// const D = [|C|];
 // new D();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesOfConstructor_badOverload.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesOfConstructor_badOverload.baseline.jsonc
index 8f764d409f..8e7048cb20 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesOfConstructor_badOverload.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesOfConstructor_badOverload.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllReferencesOfConstructor_badOverload.ts ===
 
-// class[| C|] {
+// class [|C|] {
 //     /*FIND ALL REFS*/constructor(n: number);
 //     constructor(){}
 // }
@@ -12,7 +12,7 @@
 // === findAllReferences ===
 // === /findAllReferencesOfConstructor_badOverload.ts ===
 
-// class[| C|] {
+// class [|C|] {
 //     constructor(n: number);
 //     /*FIND ALL REFS*/constructor(){}
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesOfJsonModule.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesOfJsonModule.baseline.jsonc
index 7b0e9c8a19..035170201d 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesOfJsonModule.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesOfJsonModule.baseline.jsonc
@@ -6,8 +6,8 @@
 // === findAllReferences ===
 // === /foo.ts ===
 
-// import /*FIND ALL REFS*/[| settings|] from "./settings.json";[|
-// settings|];
+// import /*FIND ALL REFS*/[|settings|] from "./settings.json";
+// [|settings|];
 
 
 
@@ -15,5 +15,5 @@
 // === findAllReferences ===
 // === /foo.ts ===
 
-// import[| settings|] from "./settings.json";[|
-// /*FIND ALL REFS*/settings|];
+// import [|settings|] from "./settings.json";
+// /*FIND ALL REFS*/[|settings|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesUndefined.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesUndefined.baseline.jsonc
index 8b4fe44dc0..af107ee51b 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesUndefined.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllReferencesUndefined.baseline.jsonc
@@ -3,4 +3,4 @@
 
 // /*FIND ALL REFS*/[|undefined|];
 // 
-// void[| undefined|];
+// void [|undefined|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsBadImport.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsBadImport.baseline.jsonc
index 39923a226d..0067cff3b0 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsBadImport.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsBadImport.baseline.jsonc
@@ -6,4 +6,4 @@
 // === findAllReferences ===
 // === /findAllRefsBadImport.ts ===
 
-// import { ab as /*FIND ALL REFS*/[| cd|] } from "doesNotExist";
+// import { ab as /*FIND ALL REFS*/[|cd|] } from "doesNotExist";
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsCatchClause.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsCatchClause.baseline.jsonc
index 7deff71f24..3be0bbd0d6 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsCatchClause.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsCatchClause.baseline.jsonc
@@ -2,8 +2,8 @@
 // === /findAllRefsCatchClause.ts ===
 
 // try { }
-// catch (/*FIND ALL REFS*/[|err|]) {[|
-//     err|];
+// catch (/*FIND ALL REFS*/[|err|]) {
+//     [|err|];
 // }
 
 
@@ -13,6 +13,6 @@
 // === /findAllRefsCatchClause.ts ===
 
 // try { }
-// catch ([|err|]) {[|
-//     /*FIND ALL REFS*/err|];
+// catch ([|err|]) {
+//     /*FIND ALL REFS*/[|err|];
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassExpression0.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassExpression0.baseline.jsonc
index e54d4fb96f..98c570f582 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassExpression0.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassExpression0.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// export = class /*FIND ALL REFS*/[| A|] {
-//     m() {[| A|]; }
+// export = class /*FIND ALL REFS*/[|A|] {
+//     m() { [|A|]; }
 // };
 
 
@@ -11,8 +11,8 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// export = class[| A|] {
-//     m() { /*FIND ALL REFS*/[| A|]; }
+// export = class [|A|] {
+//     m() { /*FIND ALL REFS*/[|A|]; }
 // };
 
 
@@ -21,8 +21,8 @@
 // === findAllReferences ===
 // === /b.ts ===
 
-// import /*FIND ALL REFS*/[| A|] = require("./a");[|
-// A|];
+// import /*FIND ALL REFS*/[|A|] = require("./a");
+// [|A|];
 
 
 
@@ -30,5 +30,5 @@
 // === findAllReferences ===
 // === /b.ts ===
 
-// import[| A|] = require("./a");[|
-// /*FIND ALL REFS*/A|];
+// import [|A|] = require("./a");
+// /*FIND ALL REFS*/[|A|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassExpression1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassExpression1.baseline.jsonc
index 6ea8c2dc56..6ce52f582b 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassExpression1.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassExpression1.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /a.js ===
 
-// module.exports = class /*FIND ALL REFS*/[| A|] {};
+// module.exports = class /*FIND ALL REFS*/[|A|] {};
 
 
 
@@ -9,8 +9,8 @@
 // === findAllReferences ===
 // === /b.js ===
 
-// import /*FIND ALL REFS*/[| A|] = require("./a");[|
-// A|];
+// import /*FIND ALL REFS*/[|A|] = require("./a");
+// [|A|];
 
 
 
@@ -18,5 +18,5 @@
 // === findAllReferences ===
 // === /b.js ===
 
-// import[| A|] = require("./a");[|
-// /*FIND ALL REFS*/A|];
+// import [|A|] = require("./a");
+// /*FIND ALL REFS*/[|A|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassExpression2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassExpression2.baseline.jsonc
index b2dbc68d29..44c8c0dacb 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassExpression2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassExpression2.baseline.jsonc
@@ -9,8 +9,8 @@
 // === findAllReferences ===
 // === /b.js ===
 
-// import { /*FIND ALL REFS*/[| A|] } from "./a";[|
-// A|];
+// import { /*FIND ALL REFS*/[|A|] } from "./a";
+// [|A|];
 
 
 
@@ -18,5 +18,5 @@
 // === findAllReferences ===
 // === /b.js ===
 
-// import {[| A|] } from "./a";[|
-// /*FIND ALL REFS*/A|];
+// import { [|A|] } from "./a";
+// /*FIND ALL REFS*/[|A|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassStaticBlocks.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassStaticBlocks.baseline.jsonc
index 2055edb717..2c3929d9fd 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassStaticBlocks.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsClassStaticBlocks.baseline.jsonc
@@ -2,8 +2,8 @@
 // === /findAllRefsClassStaticBlocks.ts ===
 
 // class ClassStaticBocks {
-//     static x;[|
-//     /*FIND ALL REFS*/static|] {}
+//     static x;
+//     /*FIND ALL REFS*/[|static|] {}
 //     static y;
 //     static {}
 //     static y;
@@ -19,8 +19,8 @@
 // class ClassStaticBocks {
 //     static x;
 //     static {}
-//     static y;[|
-//     /*FIND ALL REFS*/static|] {}
+//     static y;
+//     /*FIND ALL REFS*/[|static|] {}
 //     static y;
 //     static {}
 // }
@@ -31,11 +31,9 @@
 // === findAllReferences ===
 // === /findAllRefsClassStaticBlocks.ts ===
 
-// class ClassStaticBocks {
-//     static x;
-//     static {}
+// --- (line: 3) skipped ---
 //     static y;
 //     static {}
-//     static y;[|
-//     /*FIND ALL REFS*/static|] {}
+//     static y;
+//     /*FIND ALL REFS*/[|static|] {}
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsConstructorFunctions.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsConstructorFunctions.baseline.jsonc
index 5013f28c12..8574219149 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsConstructorFunctions.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsConstructorFunctions.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /a.js ===
 
-// function f() {[|
-//     /*FIND ALL REFS*/this|].x = 0;
+// function f() {
+//     /*FIND ALL REFS*/[|this|].x = 0;
 // }
 // f.prototype.setX = function() {
 //     this.x = 1;
@@ -23,8 +23,8 @@
 // function f() {
 //     this.x = 0;
 // }
-// f.prototype.setX = function() {[|
-//     /*FIND ALL REFS*/this|].x = 1;
+// f.prototype.setX = function() {
+//     /*FIND ALL REFS*/[|this|].x = 1;
 // }
 // f.prototype.useX = function() { this.x; }
 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDeclareClass.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDeclareClass.baseline.jsonc
index 478412ef18..49662c3d2f 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDeclareClass.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDeclareClass.baseline.jsonc
@@ -6,6 +6,6 @@
 // === findAllReferences ===
 // === /findAllRefsDeclareClass.ts ===
 
-// declare class /*FIND ALL REFS*/[| C|] {
+// declare class /*FIND ALL REFS*/[|C|] {
 //     static m(): void;
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDefaultImport.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDefaultImport.baseline.jsonc
index f09f9c4e49..a14e0b2b34 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDefaultImport.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDefaultImport.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// export default function /*FIND ALL REFS*/[| a|]() {}
+// export default function /*FIND ALL REFS*/[|a|]() {}
 
 
 
@@ -9,4 +9,4 @@
 // === findAllReferences ===
 // === /b.ts ===
 
-// import /*FIND ALL REFS*/[| a|], * as ns from "./a";
+// import /*FIND ALL REFS*/[|a|], * as ns from "./a";
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDefinition.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDefinition.baseline.jsonc
index 40d5f4b498..59afb275df 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDefinition.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDefinition.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /findAllRefsDefinition.ts ===
 
-// const /*FIND ALL REFS*/[| x|] = 0;[|
-// x|];
+// const /*FIND ALL REFS*/[|x|] = 0;
+// [|x|];
 
 
 
@@ -10,5 +10,5 @@
 // === findAllReferences ===
 // === /findAllRefsDefinition.ts ===
 
-// const[| x|] = 0;[|
-// /*FIND ALL REFS*/x|];
+// const [|x|] = 0;
+// /*FIND ALL REFS*/[|x|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDestructureGeneric.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDestructureGeneric.baseline.jsonc
index ae081854db..bc2d160244 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDestructureGeneric.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDestructureGeneric.baseline.jsonc
@@ -1,11 +1,11 @@
 // === findAllReferences ===
 // === /findAllRefsDestructureGeneric.ts ===
 
-// interface I<T> {[|
-//     /*FIND ALL REFS*/x|]: boolean;
+// interface I<T> {
+//     /*FIND ALL REFS*/[|x|]: boolean;
 // }
 // declare const i: I<number>;
-// const {[| x|] } = i;
+// const { [|x|] } = i;
 
 
 
@@ -13,8 +13,8 @@
 // === findAllReferences ===
 // === /findAllRefsDestructureGeneric.ts ===
 
-// interface I<T> {[|
-//     x|]: boolean;
+// interface I<T> {
+//     [|x|]: boolean;
 // }
 // declare const i: I<number>;
-// const { /*FIND ALL REFS*/[| x|] } = i;
+// const { /*FIND ALL REFS*/[|x|] } = i;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDestructureGetter.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDestructureGetter.baseline.jsonc
index c2db086387..17fdbff3f0 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDestructureGetter.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsDestructureGetter.baseline.jsonc
@@ -2,11 +2,11 @@
 // === /findAllRefsDestructureGetter.ts ===
 
 // class Test {
-//     get /*FIND ALL REFS*/[| x|]() { return 0; }
+//     get /*FIND ALL REFS*/[|x|]() { return 0; }
 // 
 //     set y(a: number) {}
 // }
-// const {[| x|], y } = new Test();
+// const { [|x|], y } = new Test();
 // x; y;
 
 
@@ -16,12 +16,12 @@
 // === /findAllRefsDestructureGetter.ts ===
 
 // class Test {
-//     get[| x|]() { return 0; }
+//     get [|x|]() { return 0; }
 // 
 //     set y(a: number) {}
 // }
-// const { /*FIND ALL REFS*/[| x|], y } = new Test();[|
-// x|]; y;
+// const { /*FIND ALL REFS*/[|x|], y } = new Test();
+// [|x|]; y;
 
 
 
@@ -34,8 +34,8 @@
 // 
 //     set y(a: number) {}
 // }
-// const {[| x|], y } = new Test();[|
-// /*FIND ALL REFS*/x|]; y;
+// const { [|x|], y } = new Test();
+// /*FIND ALL REFS*/[|x|]; y;
 
 
 
@@ -46,9 +46,9 @@
 // class Test {
 //     get x() { return 0; }
 // 
-//     set /*FIND ALL REFS*/[| y|](a: number) {}
+//     set /*FIND ALL REFS*/[|y|](a: number) {}
 // }
-// const { x,[| y|] } = new Test();
+// const { x, [|y|] } = new Test();
 // x; y;
 
 
@@ -60,10 +60,10 @@
 // class Test {
 //     get x() { return 0; }
 // 
-//     set[| y|](a: number) {}
+//     set [|y|](a: number) {}
 // }
-// const { x, /*FIND ALL REFS*/[| y|] } = new Test();
-// x;[| y|];
+// const { x, /*FIND ALL REFS*/[|y|] } = new Test();
+// x; [|y|];
 
 
 
@@ -76,5 +76,5 @@
 // 
 //     set y(a: number) {}
 // }
-// const { x,[| y|] } = new Test();
-// x; /*FIND ALL REFS*/[| y|];
+// const { x, [|y|] } = new Test();
+// x; /*FIND ALL REFS*/[|y|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsEnumAsNamespace.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsEnumAsNamespace.baseline.jsonc
index 2d3b02c21b..0b6019547c 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsEnumAsNamespace.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsEnumAsNamespace.baseline.jsonc
@@ -6,8 +6,8 @@
 // === findAllReferences ===
 // === /findAllRefsEnumAsNamespace.ts ===
 
-// enum /*FIND ALL REFS*/[| E|] { A }
-// let e:[| E|].A;
+// enum /*FIND ALL REFS*/[|E|] { A }
+// let e: [|E|].A;
 
 
 
@@ -15,5 +15,5 @@
 // === findAllReferences ===
 // === /findAllRefsEnumAsNamespace.ts ===
 
-// enum[| E|] { A }
-// let e: /*FIND ALL REFS*/[| E|].A;
+// enum [|E|] { A }
+// let e: /*FIND ALL REFS*/[|E|].A;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsEnumMember.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsEnumMember.baseline.jsonc
index ebfe4dbd2e..fce503b58b 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsEnumMember.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsEnumMember.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllRefsEnumMember.ts ===
 
-// enum E { /*FIND ALL REFS*/[| A|], B }
+// enum E { /*FIND ALL REFS*/[|A|], B }
 // const e: E.[|A|] = E.[|A|];
 
 
@@ -10,7 +10,7 @@
 // === findAllReferences ===
 // === /findAllRefsEnumMember.ts ===
 
-// enum E {[| A|], B }
+// enum E { [|A|], B }
 // const e: E./*FIND ALL REFS*/[|A|] = E.[|A|];
 
 
@@ -19,5 +19,5 @@
 // === findAllReferences ===
 // === /findAllRefsEnumMember.ts ===
 
-// enum E {[| A|], B }
+// enum E { [|A|], B }
 // const e: E.A = E./*FIND ALL REFS*/[|A|] = E.[|A|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsExportConstEqualToClass.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsExportConstEqualToClass.baseline.jsonc
index 070a9cbcc6..637ca0d766 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsExportConstEqualToClass.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsExportConstEqualToClass.baseline.jsonc
@@ -2,7 +2,7 @@
 // === /a.ts ===
 
 // class C {}
-// export const /*FIND ALL REFS*/[| D|] = C;
+// export const /*FIND ALL REFS*/[|D|] = C;
 
 
 
@@ -10,4 +10,4 @@
 // === findAllReferences ===
 // === /b.ts ===
 
-// import { /*FIND ALL REFS*/[| D|] } from "./a";
+// import { /*FIND ALL REFS*/[|D|] } from "./a";
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsExportNotAtTopLevel.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsExportNotAtTopLevel.baseline.jsonc
index 3aa05f1125..7fa4c6cfcd 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsExportNotAtTopLevel.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsExportNotAtTopLevel.baseline.jsonc
@@ -7,8 +7,8 @@
 // === /findAllRefsExportNotAtTopLevel.ts ===
 
 // {
-//     export const /*FIND ALL REFS*/[| x|] = 0;[|
-//     x|];
+//     export const /*FIND ALL REFS*/[|x|] = 0;
+//     [|x|];
 // }
 
 
@@ -18,6 +18,6 @@
 // === /findAllRefsExportNotAtTopLevel.ts ===
 
 // {
-//     export const[| x|] = 0;[|
-//     /*FIND ALL REFS*/x|];
+//     export const [|x|] = 0;
+//     /*FIND ALL REFS*/[|x|];
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForComputedProperties.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForComputedProperties.baseline.jsonc
index 823084f233..c4242d85ab 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForComputedProperties.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForComputedProperties.baseline.jsonc
@@ -2,11 +2,11 @@
 // === /findAllRefsForComputedProperties.ts ===
 
 // interface I {
-//     ["/*FIND ALL REFS*/[|"prop1"|]]: () => void;
+//     ["/*FIND ALL REFS*/[|prop1|]"]: () => void;
 // }
 // 
 // class C implements I {
-//     [[|"prop1"|]]: any;
+//     ["[|prop1|]"]: any;
 // }
 // 
 // var x: I = {
@@ -20,11 +20,11 @@
 // === /findAllRefsForComputedProperties.ts ===
 
 // interface I {
-//     [[|"prop1"|]]: () => void;
+//     ["[|prop1|]"]: () => void;
 // }
 // 
 // class C implements I {
-//     ["/*FIND ALL REFS*/[|"prop1"|]]: any;
+//     ["/*FIND ALL REFS*/[|prop1|]"]: any;
 // }
 // 
 // var x: I = {
@@ -41,5 +41,5 @@
 // }
 // 
 // var x: I = {
-//     ["/*FIND ALL REFS*/[|"prop1"|]]: function () { },
+//     ["/*FIND ALL REFS*/[|prop1|]"]: function () { },
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForComputedProperties2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForComputedProperties2.baseline.jsonc
index 5f379d5a98..7cd770e8ad 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForComputedProperties2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForComputedProperties2.baseline.jsonc
@@ -41,5 +41,5 @@
 // }
 // 
 // var x: I = {
-//     ["/*FIND ALL REFS*/[|"42"|]]: function () { }
+//     ["/*FIND ALL REFS*/[|42|]"]: function () { }
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport01.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport01.baseline.jsonc
index 5a6bf77c53..b7b2ac99c5 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport01.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport01.baseline.jsonc
@@ -6,12 +6,12 @@
 // === findAllReferences ===
 // === /findAllRefsForDefaultExport01.ts ===
 
-// export default class /*FIND ALL REFS*/[| DefaultExportedClass|] {
+// export default class /*FIND ALL REFS*/[|DefaultExportedClass|] {
 // }
 // 
-// var x:[| DefaultExportedClass|];
+// var x: [|DefaultExportedClass|];
 // 
-// var y = new[| DefaultExportedClass|];
+// var y = new [|DefaultExportedClass|];
 
 
 
@@ -19,12 +19,12 @@
 // === findAllReferences ===
 // === /findAllRefsForDefaultExport01.ts ===
 
-// export default class[| DefaultExportedClass|] {
+// export default class [|DefaultExportedClass|] {
 // }
 // 
-// var x: /*FIND ALL REFS*/[| DefaultExportedClass|];
+// var x: /*FIND ALL REFS*/[|DefaultExportedClass|];
 // 
-// var y = new[| DefaultExportedClass|];
+// var y = new [|DefaultExportedClass|];
 
 
 
@@ -32,9 +32,9 @@
 // === findAllReferences ===
 // === /findAllRefsForDefaultExport01.ts ===
 
-// export default class[| DefaultExportedClass|] {
+// export default class [|DefaultExportedClass|] {
 // }
 // 
-// var x:[| DefaultExportedClass|];
+// var x: [|DefaultExportedClass|];
 // 
-// var y = new /*FIND ALL REFS*/[| DefaultExportedClass|];
+// var y = new /*FIND ALL REFS*/[|DefaultExportedClass|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport02.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport02.baseline.jsonc
index 26e1edd768..8062c1cf8c 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport02.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport02.baseline.jsonc
@@ -6,13 +6,13 @@
 // === findAllReferences ===
 // === /findAllRefsForDefaultExport02.ts ===
 
-// export default function /*FIND ALL REFS*/[| DefaultExportedFunction|]() {
-//     return[| DefaultExportedFunction|];
+// export default function /*FIND ALL REFS*/[|DefaultExportedFunction|]() {
+//     return [|DefaultExportedFunction|];
 // }
 // 
-// var x: typeof[| DefaultExportedFunction|];
+// var x: typeof [|DefaultExportedFunction|];
 // 
-// var y =[| DefaultExportedFunction|]();
+// var y = [|DefaultExportedFunction|]();
 // 
 // namespace DefaultExportedFunction {
 // }
@@ -23,13 +23,13 @@
 // === findAllReferences ===
 // === /findAllRefsForDefaultExport02.ts ===
 
-// export default function[| DefaultExportedFunction|]() {
-//     return /*FIND ALL REFS*/[| DefaultExportedFunction|];
+// export default function [|DefaultExportedFunction|]() {
+//     return /*FIND ALL REFS*/[|DefaultExportedFunction|];
 // }
 // 
-// var x: typeof[| DefaultExportedFunction|];
+// var x: typeof [|DefaultExportedFunction|];
 // 
-// var y =[| DefaultExportedFunction|]();
+// var y = [|DefaultExportedFunction|]();
 // 
 // namespace DefaultExportedFunction {
 // }
@@ -40,13 +40,13 @@
 // === findAllReferences ===
 // === /findAllRefsForDefaultExport02.ts ===
 
-// export default function[| DefaultExportedFunction|]() {
-//     return[| DefaultExportedFunction|];
+// export default function [|DefaultExportedFunction|]() {
+//     return [|DefaultExportedFunction|];
 // }
 // 
-// var x: typeof /*FIND ALL REFS*/[| DefaultExportedFunction|];
+// var x: typeof /*FIND ALL REFS*/[|DefaultExportedFunction|];
 // 
-// var y =[| DefaultExportedFunction|]();
+// var y = [|DefaultExportedFunction|]();
 // 
 // namespace DefaultExportedFunction {
 // }
@@ -57,13 +57,13 @@
 // === findAllReferences ===
 // === /findAllRefsForDefaultExport02.ts ===
 
-// export default function[| DefaultExportedFunction|]() {
-//     return[| DefaultExportedFunction|];
+// export default function [|DefaultExportedFunction|]() {
+//     return [|DefaultExportedFunction|];
 // }
 // 
-// var x: typeof[| DefaultExportedFunction|];
+// var x: typeof [|DefaultExportedFunction|];
 // 
-// var y = /*FIND ALL REFS*/[| DefaultExportedFunction|]();
+// var y = /*FIND ALL REFS*/[|DefaultExportedFunction|]();
 // 
 // namespace DefaultExportedFunction {
 // }
@@ -83,5 +83,5 @@
 // 
 // var y = DefaultExportedFunction();
 // 
-// namespace /*FIND ALL REFS*/[| DefaultExportedFunction|] {
+// namespace /*FIND ALL REFS*/[|DefaultExportedFunction|] {
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport04.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport04.baseline.jsonc
index 21f95ef1b4..e11417d5cd 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport04.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport04.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// const /*FIND ALL REFS*/[| a|] = 0;
-// export default[| a|];
+// const /*FIND ALL REFS*/[|a|] = 0;
+// export default [|a|];
 
 
 
@@ -10,8 +10,8 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// const[| a|] = 0;
-// export default /*FIND ALL REFS*/[| a|];
+// const [|a|] = 0;
+// export default /*FIND ALL REFS*/[|a|];
 
 
 
@@ -24,8 +24,8 @@
 // === findAllReferences ===
 // === /b.ts ===
 
-// import /*FIND ALL REFS*/[| a|] from "./a";[|
-// a|];
+// import /*FIND ALL REFS*/[|a|] from "./a";
+// [|a|];
 
 
 
@@ -33,5 +33,5 @@
 // === findAllReferences ===
 // === /b.ts ===
 
-// import[| a|] from "./a";[|
-// /*FIND ALL REFS*/a|];
+// import [|a|] from "./a";
+// /*FIND ALL REFS*/[|a|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport09.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport09.baseline.jsonc
index 028711bb09..cf193dcabd 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport09.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport09.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /foo.ts ===
 
-// import * as /*FIND ALL REFS*/[| a|] from "./a.js"
+// import * as /*FIND ALL REFS*/[|a|] from "./a.js"
 // import aDefault from "./a.js"
 // import * as b from "./b.js"
 // import bDefault from "./b.js"
@@ -14,7 +14,7 @@
 // === /foo.ts ===
 
 // import * as a from "./a.js"
-// import /*FIND ALL REFS*/[| aDefault|] from "./a.js"
+// import /*FIND ALL REFS*/[|aDefault|] from "./a.js"
 // import * as b from "./b.js"
 // import bDefault from "./b.js"
 // 
@@ -28,7 +28,7 @@
 
 // import * as a from "./a.js"
 // import aDefault from "./a.js"
-// import * as /*FIND ALL REFS*/[| b|] from "./b.js"
+// import * as /*FIND ALL REFS*/[|b|] from "./b.js"
 // import bDefault from "./b.js"
 // 
 // import * as c from "./c"
@@ -43,7 +43,7 @@
 // import * as a from "./a.js"
 // import aDefault from "./a.js"
 // import * as b from "./b.js"
-// import /*FIND ALL REFS*/[| bDefault|] from "./b.js"
+// import /*FIND ALL REFS*/[|bDefault|] from "./b.js"
 // 
 // import * as c from "./c"
 // import cDefault from "./c"
@@ -61,7 +61,7 @@
 // import * as b from "./b.js"
 // import bDefault from "./b.js"
 // 
-// import * as /*FIND ALL REFS*/[| c|] from "./c"
+// import * as /*FIND ALL REFS*/[|c|] from "./c"
 // import cDefault from "./c"
 // import * as d from "./d"
 // import dDefault from "./d"
@@ -76,7 +76,7 @@
 // import bDefault from "./b.js"
 // 
 // import * as c from "./c"
-// import /*FIND ALL REFS*/[| cDefault|] from "./c"
+// import /*FIND ALL REFS*/[|cDefault|] from "./c"
 // import * as d from "./d"
 // import dDefault from "./d"
 
@@ -90,7 +90,7 @@
 // 
 // import * as c from "./c"
 // import cDefault from "./c"
-// import * as /*FIND ALL REFS*/[| d|] from "./d"
+// import * as /*FIND ALL REFS*/[|d|] from "./d"
 // import dDefault from "./d"
 
 
@@ -103,4 +103,4 @@
 // import * as c from "./c"
 // import cDefault from "./c"
 // import * as d from "./d"
-// import /*FIND ALL REFS*/[| dDefault|] from "./d"
+// import /*FIND ALL REFS*/[|dDefault|] from "./d"
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport_reExport.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport_reExport.baseline.jsonc
index ca6992ba1a..d20ffaf10d 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport_reExport.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultExport_reExport.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /export.ts ===
 
-// const /*FIND ALL REFS*/[| foo|] = 1;
-// export default[| foo|];
+// const /*FIND ALL REFS*/[|foo|] = 1;
+// export default [|foo|];
 
 
 
@@ -10,8 +10,8 @@
 // === findAllReferences ===
 // === /export.ts ===
 
-// const[| foo|] = 1;
-// export default /*FIND ALL REFS*/[| foo|];
+// const [|foo|] = 1;
+// export default /*FIND ALL REFS*/[|foo|];
 
 
 
@@ -24,4 +24,4 @@
 // === findAllReferences ===
 // === /re-export-dep.ts ===
 
-// import /*FIND ALL REFS*/[| fooDefault|] from "./re-export";
+// import /*FIND ALL REFS*/[|fooDefault|] from "./re-export";
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultKeyword.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultKeyword.baseline.jsonc
index 7cf9d56844..0aa761c8ea 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultKeyword.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForDefaultKeyword.baseline.jsonc
@@ -21,10 +21,9 @@
 // === findAllReferences ===
 // === /findAllRefsForDefaultKeyword.ts ===
 
-// --- (line: 5) skipped ---
-// 
+// --- (line: 6) skipped ---
 // class default {}
 // 
-// const foo = {[|
-//     /*FIND ALL REFS*/default|]: 1
+// const foo = {
+//     /*FIND ALL REFS*/[|default|]: 1
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForFunctionExpression01.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForFunctionExpression01.baseline.jsonc
index 3644f6d08b..bdbf47e94e 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForFunctionExpression01.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForFunctionExpression01.baseline.jsonc
@@ -6,8 +6,8 @@
 // === findAllReferences ===
 // === /file1.ts ===
 
-// var foo = function /*FIND ALL REFS*/[| foo|](a =[| foo|](), b = () =>[| foo|]) {[|
-//     foo|]([|foo|],[| foo|]);
+// var foo = function /*FIND ALL REFS*/[|foo|](a = [|foo|](), b = () => [|foo|]) {
+//     [|foo|]([|foo|], [|foo|]);
 // }
 
 
@@ -16,8 +16,8 @@
 // === findAllReferences ===
 // === /file1.ts ===
 
-// var foo = function foo(a = /*FIND ALL REFS*/[| foo|](a =[| foo|](), b = () =>[| foo|]) {[|
-//     foo|]([|foo|],[| foo|]);
+// var foo = function foo(a = /*FIND ALL REFS*/[|foo|](a = [|foo|](), b = () => [|foo|]) {
+//     [|foo|]([|foo|], [|foo|]);
 // }
 
 
@@ -26,8 +26,8 @@
 // === findAllReferences ===
 // === /file1.ts ===
 
-// var foo = function foo(a = foo(), b = () => /*FIND ALL REFS*/[| foo|](a =[| foo|](), b = () =>[| foo|]) {[|
-//     foo|]([|foo|],[| foo|]);
+// var foo = function foo(a = foo(), b = () => /*FIND ALL REFS*/[|foo|](a = [|foo|](), b = () => [|foo|]) {
+//     [|foo|]([|foo|], [|foo|]);
 // }
 
 
@@ -36,8 +36,8 @@
 // === findAllReferences ===
 // === /file1.ts ===
 
-// var foo = function[| foo|](a =[| foo|](), b = () =>[| foo|]) {[|
-//     /*FIND ALL REFS*/foo|]([|foo|],[| foo|]);
+// var foo = function [|foo|](a = [|foo|](), b = () => [|foo|]) {
+//     /*FIND ALL REFS*/[|foo|]([|foo|], [|foo|]);
 // }
 
 
@@ -46,8 +46,8 @@
 // === findAllReferences ===
 // === /file1.ts ===
 
-// var foo = function[| foo|](a =[| foo|](), b = () =>[| foo|]) {[|
-//     foo(/*FIND ALL REFS*/|]([|foo|],[| foo|]);
+// var foo = function [|foo|](a = [|foo|](), b = () => [|foo|]) {
+//     foo(/*FIND ALL REFS*/[|foo|]([|foo|], [|foo|]);
 // }
 
 
@@ -56,6 +56,6 @@
 // === findAllReferences ===
 // === /file1.ts ===
 
-// var foo = function[| foo|](a =[| foo|](), b = () =>[| foo|]) {[|
-//     foo(foo, /*FIND ALL REFS*/|]([|foo|],[| foo|]);
+// var foo = function [|foo|](a = [|foo|](), b = () => [|foo|]) {
+//     foo(foo, /*FIND ALL REFS*/[|foo|]([|foo|], [|foo|]);
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCall.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCall.baseline.jsonc
index 6ba97d494a..0c643ad3a4 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCall.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCall.baseline.jsonc
@@ -1,4 +1,4 @@
 // === findAllReferences ===
 // === /app.ts ===
 
-// export function he/*FIND ALL REFS*/[| hello|]() {};
+// export function he/*FIND ALL REFS*/[|hello|]() {};
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCallType.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCallType.baseline.jsonc
index 6ba97d494a..0c643ad3a4 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCallType.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForImportCallType.baseline.jsonc
@@ -1,4 +1,4 @@
 // === findAllReferences ===
 // === /app.ts ===
 
-// export function he/*FIND ALL REFS*/[| hello|]() {};
+// export function he/*FIND ALL REFS*/[|hello|]() {};
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForMappedType.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForMappedType.baseline.jsonc
index 284a8945a5..2400d5635a 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForMappedType.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForMappedType.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllRefsForMappedType.ts ===
 
-// interface T { /*FIND ALL REFS*/[| a|]: number };
+// interface T { /*FIND ALL REFS*/[|a|]: number };
 // type U = { [K in keyof T]: string };
 // type V = { [K in keyof U]: boolean };
 // const u: U = { a: "" }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForObjectLiteralProperties.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForObjectLiteralProperties.baseline.jsonc
index 3048eb1713..1d532e979e 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForObjectLiteralProperties.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForObjectLiteralProperties.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /findAllRefsForObjectLiteralProperties.ts ===
 
-// var x = {[|
-//     /*FIND ALL REFS*/property|]: {}
+// var x = {
+//     /*FIND ALL REFS*/[|property|]: {}
 // };
 // 
 // x.[|property|];
@@ -15,8 +15,8 @@
 // === findAllReferences ===
 // === /findAllRefsForObjectLiteralProperties.ts ===
 
-// var x = {[|
-//     property|]: {}
+// var x = {
+//     [|property|]: {}
 // };
 // 
 // x./*FIND ALL REFS*/[|property|];
@@ -34,8 +34,8 @@
 // === findAllReferences ===
 // === /findAllRefsForObjectLiteralProperties.ts ===
 
-// var x = {[|
-//     property|]: {}
+// var x = {
+//     [|property|]: {}
 // };
 // 
 // x.[|property|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForObjectSpread.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForObjectSpread.baseline.jsonc
index 951e638635..7ed09580c9 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForObjectSpread.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForObjectSpread.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllRefsForObjectSpread.ts ===
 
-// interface A1 { readonly /*FIND ALL REFS*/[| a|]: string };
+// interface A1 { readonly /*FIND ALL REFS*/[|a|]: string };
 // interface A2 { a?: number };
 // let a1: A1;
 // let a2: A2;
@@ -16,7 +16,7 @@
 // === /findAllRefsForObjectSpread.ts ===
 
 // interface A1 { readonly a: string };
-// interface A2 { /*FIND ALL REFS*/[| a|]?: number };
+// interface A2 { /*FIND ALL REFS*/[|a|]?: number };
 // let a1: A1;
 // let a2: A2;
 // let a12 = { ...a1, ...a2 };
@@ -29,8 +29,8 @@
 // === findAllReferences ===
 // === /findAllRefsForObjectSpread.ts ===
 
-// interface A1 { readonly[| a|]: string };
-// interface A2 {[| a|]?: number };
+// interface A1 { readonly [|a|]: string };
+// interface A2 { [|a|]?: number };
 // let a1: A1;
 // let a2: A2;
 // let a12 = { ...a1, ...a2 };
@@ -43,7 +43,7 @@
 // === findAllReferences ===
 // === /findAllRefsForObjectSpread.ts ===
 
-// interface A1 { readonly[| a|]: string };
+// interface A1 { readonly [|a|]: string };
 // interface A2 { a?: number };
 // let a1: A1;
 // let a2: A2;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForRest.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForRest.baseline.jsonc
index ecad05c10e..7eaac036a6 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForRest.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForRest.baseline.jsonc
@@ -2,8 +2,8 @@
 // === /findAllRefsForRest.ts ===
 
 // interface Gen {
-//     x: number[|
-//     /*FIND ALL REFS*/parent|]: Gen;
+//     x: number
+//     /*FIND ALL REFS*/[|parent|]: Gen;
 //     millenial: string;
 // }
 // let t: Gen;
@@ -17,8 +17,8 @@
 // === /findAllRefsForRest.ts ===
 
 // interface Gen {
-//     x: number[|
-//     parent|]: Gen;
+//     x: number
+//     [|parent|]: Gen;
 //     millenial: string;
 // }
 // let t: Gen;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForStaticInstanceMethodInheritance.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForStaticInstanceMethodInheritance.baseline.jsonc
index 0b9a5ee847..fbdf8be2bb 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForStaticInstanceMethodInheritance.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForStaticInstanceMethodInheritance.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /findAllRefsForStaticInstanceMethodInheritance.ts ===
 
-// class X{[|
-// 	/*FIND ALL REFS*/foo|](): void{}
+// class X{
+// 	/*FIND ALL REFS*/[|foo|](): void{}
 // }
 // 
 // class Y extends X{
@@ -10,8 +10,8 @@
 // }
 // 
 // class Z extends Y{
-// 	static foo(): void{}[|
-// 	foo|](): void{}
+// 	static foo(): void{}
+// 	[|foo|](): void{}
 // }
 // 
 // const x = new X();
@@ -34,7 +34,7 @@
 // }
 // 
 // class Y extends X{
-// 	static /*FIND ALL REFS*/[| foo|](): void{}
+// 	static /*FIND ALL REFS*/[|foo|](): void{}
 // }
 // 
 // class Z extends Y{
@@ -58,7 +58,7 @@
 // }
 // 
 // class Z extends Y{
-// 	static /*FIND ALL REFS*/[| foo|](): void{}
+// 	static /*FIND ALL REFS*/[|foo|](): void{}
 // 	foo(): void{}
 // }
 // 
@@ -77,8 +77,8 @@
 // === findAllReferences ===
 // === /findAllRefsForStaticInstanceMethodInheritance.ts ===
 
-// class X{[|
-// 	foo|](): void{}
+// class X{
+// 	[|foo|](): void{}
 // }
 // 
 // class Y extends X{
@@ -86,8 +86,8 @@
 // }
 // 
 // class Z extends Y{
-// 	static foo(): void{}[|
-// 	/*FIND ALL REFS*/foo|](): void{}
+// 	static foo(): void{}
+// 	/*FIND ALL REFS*/[|foo|](): void{}
 // }
 // 
 // const x = new X();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForStaticInstancePropertyInheritance.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForStaticInstancePropertyInheritance.baseline.jsonc
index e209837da4..765d864857 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForStaticInstancePropertyInheritance.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForStaticInstancePropertyInheritance.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /findAllRefsForStaticInstancePropertyInheritance.ts ===
 
-// class X{[|
-// 	/*FIND ALL REFS*/foo|]:any
+// class X{
+// 	/*FIND ALL REFS*/[|foo|]:any
 // }
 // 
 // class Y extends X{
@@ -10,8 +10,8 @@
 // }
 // 
 // class Z extends Y{
-// 	static foo:any[|
-// 	foo|]:any
+// 	static foo:any
+// 	[|foo|]:any
 // }
 // 
 // const x = new X();
@@ -34,7 +34,7 @@
 // }
 // 
 // class Y extends X{
-// 	static /*FIND ALL REFS*/[| foo|]:any
+// 	static /*FIND ALL REFS*/[|foo|]:any
 // }
 // 
 // class Z extends Y{
@@ -58,7 +58,7 @@
 // }
 // 
 // class Z extends Y{
-// 	static /*FIND ALL REFS*/[| foo|]:any
+// 	static /*FIND ALL REFS*/[|foo|]:any
 // 	foo:any
 // }
 // 
@@ -77,8 +77,8 @@
 // === findAllReferences ===
 // === /findAllRefsForStaticInstancePropertyInheritance.ts ===
 
-// class X{[|
-// 	foo|]:any
+// class X{
+// 	[|foo|]:any
 // }
 // 
 // class Y extends X{
@@ -86,8 +86,8 @@
 // }
 // 
 // class Z extends Y{
-// 	static foo:any[|
-// 	/*FIND ALL REFS*/foo|]:any
+// 	static foo:any
+// 	/*FIND ALL REFS*/[|foo|]:any
 // }
 // 
 // const x = new X();
@@ -105,8 +105,8 @@
 // === findAllReferences ===
 // === /findAllRefsForStaticInstancePropertyInheritance.ts ===
 
-// class X{[|
-// 	foo|]:any
+// class X{
+// 	[|foo|]:any
 // }
 // 
 // class Y extends X{
@@ -114,8 +114,8 @@
 // }
 // 
 // class Z extends Y{
-// 	static foo:any[|
-// 	foo|]:any
+// 	static foo:any
+// 	[|foo|]:any
 // }
 // 
 // const x = new X();
@@ -133,8 +133,8 @@
 // === findAllReferences ===
 // === /findAllRefsForStaticInstancePropertyInheritance.ts ===
 
-// class X{[|
-// 	foo|]:any
+// class X{
+// 	[|foo|]:any
 // }
 // 
 // class Y extends X{
@@ -142,8 +142,8 @@
 // }
 // 
 // class Z extends Y{
-// 	static foo:any[|
-// 	foo|]:any
+// 	static foo:any
+// 	[|foo|]:any
 // }
 // 
 // const x = new X();
@@ -161,8 +161,8 @@
 // === findAllReferences ===
 // === /findAllRefsForStaticInstancePropertyInheritance.ts ===
 
-// class X{[|
-// 	foo|]:any
+// class X{
+// 	[|foo|]:any
 // }
 // 
 // class Y extends X{
@@ -170,8 +170,8 @@
 // }
 // 
 // class Z extends Y{
-// 	static foo:any[|
-// 	foo|]:any
+// 	static foo:any
+// 	[|foo|]:any
 // }
 // 
 // const x = new X();
@@ -194,7 +194,7 @@
 // }
 // 
 // class Y extends X{
-// 	static[| foo|]:any
+// 	static [|foo|]:any
 // }
 // 
 // class Z extends Y{
@@ -218,7 +218,7 @@
 // }
 // 
 // class Z extends Y{
-// 	static[| foo|]:any
+// 	static [|foo|]:any
 // 	foo:any
 // }
 // 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForUMDModuleAlias1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForUMDModuleAlias1.baseline.jsonc
index 20b23783eb..d4fcc7ef8e 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForUMDModuleAlias1.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForUMDModuleAlias1.baseline.jsonc
@@ -8,7 +8,7 @@
 
 // export function doThing(): string;
 // export function doTheOtherThing(): void;
-// export as namespace /*FIND ALL REFS*/[| myLib|];
+// export as namespace /*FIND ALL REFS*/[|myLib|];
 
 
 
@@ -18,10 +18,10 @@
 
 // export function doThing(): string;
 // export function doTheOtherThing(): void;
-// export as namespace[| myLib|];
+// export as namespace [|myLib|];
 
 
 // === /1.ts ===
 
-// [|/// <reference path="0.d.ts" />
-// /*FIND ALL REFS*/myLib|].doThing();
+// /// <reference path="0.d.ts" />
+// /*FIND ALL REFS*/[|myLib|].doThing();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForVariableInExtendsClause01.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForVariableInExtendsClause01.baseline.jsonc
index 80a5ed8019..cc3995d32d 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForVariableInExtendsClause01.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForVariableInExtendsClause01.baseline.jsonc
@@ -6,8 +6,8 @@
 // === findAllReferences ===
 // === /findAllRefsForVariableInExtendsClause01.ts ===
 
-// var /*FIND ALL REFS*/[| Base|] = class { };
-// class C extends[| Base|] { }
+// var /*FIND ALL REFS*/[|Base|] = class { };
+// class C extends [|Base|] { }
 
 
 
@@ -15,5 +15,5 @@
 // === findAllReferences ===
 // === /findAllRefsForVariableInExtendsClause01.ts ===
 
-// var[| Base|] = class { };
-// class C extends /*FIND ALL REFS*/[| Base|] { }
+// var [|Base|] = class { };
+// class C extends /*FIND ALL REFS*/[|Base|] { }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForVariableInExtendsClause02.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForVariableInExtendsClause02.baseline.jsonc
index 3ca4224415..3b94fbd0cb 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForVariableInExtendsClause02.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsForVariableInExtendsClause02.baseline.jsonc
@@ -6,10 +6,10 @@
 // === findAllReferences ===
 // === /findAllRefsForVariableInExtendsClause02.ts ===
 
-// interface /*FIND ALL REFS*/[| Base|] { }
+// interface /*FIND ALL REFS*/[|Base|] { }
 // namespace n {
 //     var Base = class { };
-//     interface I extends[| Base|] { }
+//     interface I extends [|Base|] { }
 // }
 
 
@@ -18,8 +18,8 @@
 // === findAllReferences ===
 // === /findAllRefsForVariableInExtendsClause02.ts ===
 
-// interface[| Base|] { }
+// interface [|Base|] { }
 // namespace n {
 //     var Base = class { };
-//     interface I extends /*FIND ALL REFS*/[| Base|] { }
+//     interface I extends /*FIND ALL REFS*/[|Base|] { }
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsImportType.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsImportType.baseline.jsonc
index 0634c3f22f..0c3e8eea87 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsImportType.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsImportType.baseline.jsonc
@@ -7,7 +7,7 @@
 // === /a.js ===
 
 // module.exports = 0;
-// export type /*FIND ALL REFS*/[| N|] = number;
+// export type /*FIND ALL REFS*/[|N|] = number;
 
 
 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInClassExpression.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInClassExpression.baseline.jsonc
index b011dea7d1..ac58d2b7a8 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInClassExpression.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInClassExpression.baseline.jsonc
@@ -1,9 +1,9 @@
 // === findAllReferences ===
 // === /findAllRefsInClassExpression.ts ===
 
-// interface I { /*FIND ALL REFS*/[| boom|](): void; }
-// new class C implements I {[|
-//    boom|](){}
+// interface I { /*FIND ALL REFS*/[|boom|](): void; }
+// new class C implements I {
+//    [|boom|](){}
 // }
 
 
@@ -12,7 +12,7 @@
 // === findAllReferences ===
 // === /findAllRefsInClassExpression.ts ===
 
-// interface I {[| boom|](): void; }
-// new class C implements I {[|
-//    /*FIND ALL REFS*/boom|](){}
+// interface I { [|boom|](): void; }
+// new class C implements I {
+//    /*FIND ALL REFS*/[|boom|](){}
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsIndexedAccessTypes.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsIndexedAccessTypes.baseline.jsonc
index aac7f16a57..2dad9f1fee 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsIndexedAccessTypes.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsIndexedAccessTypes.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /findAllRefsIndexedAccessTypes.ts ===
 
-// interface I {[|
-//     /*FIND ALL REFS*/0|]: number;
+// interface I {
+//     /*FIND ALL REFS*/[|0|]: number;
 //     s: string;
 // }
 // interface J {
@@ -17,12 +17,12 @@
 // === /findAllRefsIndexedAccessTypes.ts ===
 
 // interface I {
-//     0: number;[|
-//     /*FIND ALL REFS*/s|]: string;
+//     0: number;
+//     /*FIND ALL REFS*/[|s|]: string;
 // }
 // interface J {
 //     a: I[0],
-//     b: I[[|"s"|]],
+//     b: I["[|s|]"],
 // }
 
 
@@ -31,8 +31,8 @@
 // === findAllReferences ===
 // === /findAllRefsIndexedAccessTypes.ts ===
 
-// interface I {[|
-//     0|]: number;
+// interface I {
+//     [|0|]: number;
 //     s: string;
 // }
 // interface J {
@@ -47,10 +47,10 @@
 // === /findAllRefsIndexedAccessTypes.ts ===
 
 // interface I {
-//     0: number;[|
-//     s|]: string;
+//     0: number;
+//     [|s|]: string;
 // }
 // interface J {
 //     a: I[0],
-//     b: I["/*FIND ALL REFS*/[|"s"|]],
+//     b: I["/*FIND ALL REFS*/[|s|]"],
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties1.baseline.jsonc
index 531ad17e50..012aff5696 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties1.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties1.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /findAllRefsInheritedProperties1.ts ===
 
-//  class class1 extends class1 {[|
-//     /*FIND ALL REFS*/doStuff|]() { }
+//  class class1 extends class1 {
+//     /*FIND ALL REFS*/[|doStuff|]() { }
 //     propName: string;
 //  }
 // 
@@ -17,8 +17,8 @@
 // === /findAllRefsInheritedProperties1.ts ===
 
 //  class class1 extends class1 {
-//     doStuff() { }[|
-//     /*FIND ALL REFS*/propName|]: string;
+//     doStuff() { }
+//     /*FIND ALL REFS*/[|propName|]: string;
 //  }
 // 
 //  var v: class1;
@@ -31,8 +31,8 @@
 // === findAllReferences ===
 // === /findAllRefsInheritedProperties1.ts ===
 
-//  class class1 extends class1 {[|
-//     doStuff|]() { }
+//  class class1 extends class1 {
+//     [|doStuff|]() { }
 //     propName: string;
 //  }
 // 
@@ -47,8 +47,8 @@
 // === /findAllRefsInheritedProperties1.ts ===
 
 //  class class1 extends class1 {
-//     doStuff() { }[|
-//     propName|]: string;
+//     doStuff() { }
+//     [|propName|]: string;
 //  }
 // 
 //  var v: class1;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties2.baseline.jsonc
index 14d61c4578..2d8796609a 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties2.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /findAllRefsInheritedProperties2.ts ===
 
-//  interface interface1 extends interface1 {[|
-//     /*FIND ALL REFS*/doStuff|](): void;   // r0
+//  interface interface1 extends interface1 {
+//     /*FIND ALL REFS*/[|doStuff|](): void;   // r0
 //     propName: string;  // r1
 //  }
 // 
@@ -17,8 +17,8 @@
 // === /findAllRefsInheritedProperties2.ts ===
 
 //  interface interface1 extends interface1 {
-//     doStuff(): void;[|   // r0
-//     /*FIND ALL REFS*/propName|]: string;  // r1
+//     doStuff(): void;   // r0
+//     /*FIND ALL REFS*/[|propName|]: string;  // r1
 //  }
 // 
 //  var v: interface1;
@@ -31,8 +31,8 @@
 // === findAllReferences ===
 // === /findAllRefsInheritedProperties2.ts ===
 
-//  interface interface1 extends interface1 {[|
-//     doStuff|](): void;   // r0
+//  interface interface1 extends interface1 {
+//     [|doStuff|](): void;   // r0
 //     propName: string;  // r1
 //  }
 // 
@@ -47,8 +47,8 @@
 // === /findAllRefsInheritedProperties2.ts ===
 
 //  interface interface1 extends interface1 {
-//     doStuff(): void;[|   // r0
-//     propName|]: string;  // r1
+//     doStuff(): void;   // r0
+//     [|propName|]: string;  // r1
 //  }
 // 
 //  var v: interface1;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties3.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties3.baseline.jsonc
index 2aefa97417..a95744a09a 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties3.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties3.baseline.jsonc
@@ -1,16 +1,16 @@
 // === findAllReferences ===
 // === /findAllRefsInheritedProperties3.ts ===
 
-//  class class1 extends class1 {[|
-//      /*FIND ALL REFS*/doStuff|]() { }
+//  class class1 extends class1 {
+//      /*FIND ALL REFS*/[|doStuff|]() { }
 //      propName: string;
 //  }
 //  interface interface1 extends interface1 {
 //      doStuff(): void;
 //      propName: string;
 //  }
-//  class class2 extends class1 implements interface1 {[|
-//      doStuff|]() { }
+//  class class2 extends class1 implements interface1 {
+//      [|doStuff|]() { }
 //      propName: string;
 //  }
 // 
@@ -25,16 +25,16 @@
 // === /findAllRefsInheritedProperties3.ts ===
 
 //  class class1 extends class1 {
-//      doStuff() { }[|
-//      /*FIND ALL REFS*/propName|]: string;
+//      doStuff() { }
+//      /*FIND ALL REFS*/[|propName|]: string;
 //  }
 //  interface interface1 extends interface1 {
 //      doStuff(): void;
 //      propName: string;
 //  }
 //  class class2 extends class1 implements interface1 {
-//      doStuff() { }[|
-//      propName|]: string;
+//      doStuff() { }
+//      [|propName|]: string;
 //  }
 // 
 //  var v: class2;
@@ -51,12 +51,12 @@
 //      doStuff() { }
 //      propName: string;
 //  }
-//  interface interface1 extends interface1 {[|
-//      /*FIND ALL REFS*/doStuff|](): void;
+//  interface interface1 extends interface1 {
+//      /*FIND ALL REFS*/[|doStuff|](): void;
 //      propName: string;
 //  }
-//  class class2 extends class1 implements interface1 {[|
-//      doStuff|]() { }
+//  class class2 extends class1 implements interface1 {
+//      [|doStuff|]() { }
 //      propName: string;
 //  }
 // 
@@ -70,17 +70,15 @@
 // === findAllReferences ===
 // === /findAllRefsInheritedProperties3.ts ===
 
-//  class class1 extends class1 {
-//      doStuff() { }
-//      propName: string;
+// --- (line: 3) skipped ---
 //  }
 //  interface interface1 extends interface1 {
-//      doStuff(): void;[|
-//      /*FIND ALL REFS*/propName|]: string;
+//      doStuff(): void;
+//      /*FIND ALL REFS*/[|propName|]: string;
 //  }
 //  class class2 extends class1 implements interface1 {
-//      doStuff() { }[|
-//      propName|]: string;
+//      doStuff() { }
+//      [|propName|]: string;
 //  }
 // 
 //  var v: class2;
@@ -93,16 +91,16 @@
 // === findAllReferences ===
 // === /findAllRefsInheritedProperties3.ts ===
 
-//  class class1 extends class1 {[|
-//      doStuff|]() { }
+//  class class1 extends class1 {
+//      [|doStuff|]() { }
 //      propName: string;
 //  }
-//  interface interface1 extends interface1 {[|
-//      doStuff|](): void;
+//  interface interface1 extends interface1 {
+//      [|doStuff|](): void;
 //      propName: string;
 //  }
-//  class class2 extends class1 implements interface1 {[|
-//      /*FIND ALL REFS*/doStuff|]() { }
+//  class class2 extends class1 implements interface1 {
+//      /*FIND ALL REFS*/[|doStuff|]() { }
 //      propName: string;
 //  }
 // 
@@ -116,16 +114,16 @@
 // === findAllReferences ===
 // === /findAllRefsInheritedProperties3.ts ===
 
-//  class class1 extends class1 {[|
-//      doStuff|]() { }
+//  class class1 extends class1 {
+//      [|doStuff|]() { }
 //      propName: string;
 //  }
-//  interface interface1 extends interface1 {[|
-//      doStuff|](): void;
+//  interface interface1 extends interface1 {
+//      [|doStuff|](): void;
 //      propName: string;
 //  }
-//  class class2 extends class1 implements interface1 {[|
-//      doStuff|]() { }
+//  class class2 extends class1 implements interface1 {
+//      [|doStuff|]() { }
 //      propName: string;
 //  }
 // 
@@ -140,16 +138,16 @@
 // === /findAllRefsInheritedProperties3.ts ===
 
 //  class class1 extends class1 {
-//      doStuff() { }[|
-//      propName|]: string;
+//      doStuff() { }
+//      [|propName|]: string;
 //  }
 //  interface interface1 extends interface1 {
-//      doStuff(): void;[|
-//      propName|]: string;
+//      doStuff(): void;
+//      [|propName|]: string;
 //  }
 //  class class2 extends class1 implements interface1 {
-//      doStuff() { }[|
-//      /*FIND ALL REFS*/propName|]: string;
+//      doStuff() { }
+//      /*FIND ALL REFS*/[|propName|]: string;
 //  }
 // 
 //  var v: class2;
@@ -163,16 +161,16 @@
 // === /findAllRefsInheritedProperties3.ts ===
 
 //  class class1 extends class1 {
-//      doStuff() { }[|
-//      propName|]: string;
+//      doStuff() { }
+//      [|propName|]: string;
 //  }
 //  interface interface1 extends interface1 {
-//      doStuff(): void;[|
-//      propName|]: string;
+//      doStuff(): void;
+//      [|propName|]: string;
 //  }
 //  class class2 extends class1 implements interface1 {
-//      doStuff() { }[|
-//      propName|]: string;
+//      doStuff() { }
+//      [|propName|]: string;
 //  }
 // 
 //  var v: class2;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties4.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties4.baseline.jsonc
index 13aa0f8668..834c88658c 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties4.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties4.baseline.jsonc
@@ -1,13 +1,13 @@
 // === findAllReferences ===
 // === /findAllRefsInheritedProperties4.ts ===
 
-//  interface C extends D {[|
-//      /*FIND ALL REFS*/prop0|]: string;
+//  interface C extends D {
+//      /*FIND ALL REFS*/[|prop0|]: string;
 //      prop1: number;
 //  }
 // 
-//  interface D extends C {[|
-//      prop0|]: string;
+//  interface D extends C {
+//      [|prop0|]: string;
 //  }
 // 
 //  var d: D;
@@ -20,13 +20,13 @@
 // === findAllReferences ===
 // === /findAllRefsInheritedProperties4.ts ===
 
-//  interface C extends D {[|
-//      prop0|]: string;
+//  interface C extends D {
+//      [|prop0|]: string;
 //      prop1: number;
 //  }
 // 
-//  interface D extends C {[|
-//      /*FIND ALL REFS*/prop0|]: string;
+//  interface D extends C {
+//      /*FIND ALL REFS*/[|prop0|]: string;
 //  }
 // 
 //  var d: D;
@@ -39,13 +39,13 @@
 // === findAllReferences ===
 // === /findAllRefsInheritedProperties4.ts ===
 
-//  interface C extends D {[|
-//      prop0|]: string;
+//  interface C extends D {
+//      [|prop0|]: string;
 //      prop1: number;
 //  }
 // 
-//  interface D extends C {[|
-//      prop0|]: string;
+//  interface D extends C {
+//      [|prop0|]: string;
 //  }
 // 
 //  var d: D;
@@ -59,8 +59,8 @@
 // === /findAllRefsInheritedProperties4.ts ===
 
 //  interface C extends D {
-//      prop0: string;[|
-//      /*FIND ALL REFS*/prop1|]: number;
+//      prop0: string;
+//      /*FIND ALL REFS*/[|prop1|]: number;
 //  }
 // 
 //  interface D extends C {
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties5.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties5.baseline.jsonc
index ce8f8bfa60..8708fc909f 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties5.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInheritedProperties5.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /findAllRefsInheritedProperties5.ts ===
 
-//  class C extends D {[|
-//      /*FIND ALL REFS*/prop0|]: string;
+//  class C extends D {
+//      /*FIND ALL REFS*/[|prop0|]: string;
 //      prop1: number;
 //  }
 // 
@@ -15,8 +15,8 @@
 // === /findAllRefsInheritedProperties5.ts ===
 
 //  class C extends D {
-//      prop0: string;[|
-//      /*FIND ALL REFS*/prop1|]: number;
+//      prop0: string;
+//      /*FIND ALL REFS*/[|prop1|]: number;
 //  }
 // 
 //  class D extends C {
@@ -28,13 +28,11 @@
 // === findAllReferences ===
 // === /findAllRefsInheritedProperties5.ts ===
 
-//  class C extends D {
-//      prop0: string;
-//      prop1: number;
+// --- (line: 3) skipped ---
 //  }
 // 
-//  class D extends C {[|
-//      /*FIND ALL REFS*/prop0|]: string;
+//  class D extends C {
+//      /*FIND ALL REFS*/[|prop0|]: string;
 //  }
 // 
 //  var d: D;
@@ -47,13 +45,11 @@
 // === findAllReferences ===
 // === /findAllRefsInheritedProperties5.ts ===
 
-//  class C extends D {
-//      prop0: string;
-//      prop1: number;
+// --- (line: 3) skipped ---
 //  }
 // 
-//  class D extends C {[|
-//      prop0|]: string;
+//  class D extends C {
+//      [|prop0|]: string;
 //  }
 // 
 //  var d: D;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates1.baseline.jsonc
index 35f968e946..da04db6dd6 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates1.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates1.baseline.jsonc
@@ -6,8 +6,8 @@
 // === findAllReferences ===
 // === /findAllRefsInsideTemplates1.ts ===
 
-// var /*FIND ALL REFS*/[| x|] = 10;
-// var y = `${[| x|] } ${[| x|] }`
+// var /*FIND ALL REFS*/[|x|] = 10;
+// var y = `${ [|x|] } ${ [|x|] }`
 
 
 
@@ -15,8 +15,8 @@
 // === findAllReferences ===
 // === /findAllRefsInsideTemplates1.ts ===
 
-// var[| x|] = 10;
-// var y = `${ /*FIND ALL REFS*/[| x|] } ${[| x|] }`
+// var [|x|] = 10;
+// var y = `${ /*FIND ALL REFS*/[|x|] } ${ [|x|] }`
 
 
 
@@ -24,5 +24,5 @@
 // === findAllReferences ===
 // === /findAllRefsInsideTemplates1.ts ===
 
-// var[| x|] = 10;
-// var y = `${ x } ${ /*FIND ALL REFS*/[| x|] } ${[| x|] }`
+// var [|x|] = 10;
+// var y = `${ x } ${ /*FIND ALL REFS*/[|x|] } ${ [|x|] }`
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates2.baseline.jsonc
index beb9581ee7..ba12f4e3ea 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideTemplates2.baseline.jsonc
@@ -6,8 +6,8 @@
 // === findAllReferences ===
 // === /findAllRefsInsideTemplates2.ts ===
 
-// function /*FIND ALL REFS*/[| f|](...rest: any[]) { }[|
-// f|] `${[| f|] } ${[| f|] }`
+// function /*FIND ALL REFS*/[|f|](...rest: any[]) { }
+// [|f|] `${ [|f|] } ${ [|f|] }`
 
 
 
@@ -15,8 +15,8 @@
 // === findAllReferences ===
 // === /findAllRefsInsideTemplates2.ts ===
 
-// function[| f|](...rest: any[]) { }[|
-// /*FIND ALL REFS*/f|] `${[| f|] } ${[| f|] }`
+// function [|f|](...rest: any[]) { }
+// /*FIND ALL REFS*/[|f|] `${ [|f|] } ${ [|f|] }`
 
 
 
@@ -24,8 +24,8 @@
 // === findAllReferences ===
 // === /findAllRefsInsideTemplates2.ts ===
 
-// function[| f|](...rest: any[]) { }[|
-// f `${ /*FIND ALL REFS*/|] `${[| f|] } ${[| f|] }`
+// function [|f|](...rest: any[]) { }
+// f `${ /*FIND ALL REFS*/[|f|] `${ [|f|] } ${ [|f|] }`
 
 
 
@@ -33,5 +33,5 @@
 // === findAllReferences ===
 // === /findAllRefsInsideTemplates2.ts ===
 
-// function[| f|](...rest: any[]) { }[|
-// f `${ f } ${ /*FIND ALL REFS*/|] `${[| f|] } ${[| f|] }`
+// function [|f|](...rest: any[]) { }
+// f `${ f } ${ /*FIND ALL REFS*/[|f|] `${ [|f|] } ${ [|f|] }`
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideWithBlock.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideWithBlock.baseline.jsonc
index 3b7884e79e..e342796aff 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideWithBlock.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsInsideWithBlock.baseline.jsonc
@@ -6,14 +6,14 @@
 // === findAllReferences ===
 // === /findAllRefsInsideWithBlock.ts ===
 
-// var /*FIND ALL REFS*/[| x|] = 0;
+// var /*FIND ALL REFS*/[|x|] = 0;
 // 
 // with ({}) {
 //     var y = x;  // Reference of x here should not be picked
 //     y++;        // also reference for y should be ignored
-// }[|
+// }
 // 
-// x|] =[| x|] + 1;
+// [|x|] = [|x|] + 1;
 
 
 
@@ -21,14 +21,14 @@
 // === findAllReferences ===
 // === /findAllRefsInsideWithBlock.ts ===
 
-// var[| x|] = 0;
+// var [|x|] = 0;
 // 
 // with ({}) {
 //     var y = x;  // Reference of x here should not be picked
 //     y++;        // also reference for y should be ignored
-// }[|
+// }
 // 
-// /*FIND ALL REFS*/x|] =[| x|] + 1;
+// /*FIND ALL REFS*/[|x|] = [|x|] + 1;
 
 
 
@@ -36,11 +36,11 @@
 // === findAllReferences ===
 // === /findAllRefsInsideWithBlock.ts ===
 
-// var[| x|] = 0;
+// var [|x|] = 0;
 // 
 // with ({}) {
 //     var y = x;  // Reference of x here should not be picked
 //     y++;        // also reference for y should be ignored
-// }[|
+// }
 // 
-// x = /*FIND ALL REFS*/|] =[| x|] + 1;
+// x = /*FIND ALL REFS*/[|x|] = [|x|] + 1;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsIsDefinition.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsIsDefinition.baseline.jsonc
index e76d34113f..640e9faa8d 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsIsDefinition.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsIsDefinition.baseline.jsonc
@@ -1,17 +1,17 @@
 // === findAllReferences ===
 // === /findAllRefsIsDefinition.ts ===
 
-// 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|](a: number): number;
+// declare function [|foo|](a: string): string;
+// declare function foo/*FIND ALL REFS*/[|foo|](a: string | number): string | number;
 // 
 // function foon(a: number): number;
 // function foon(a: string): string;
 // function foon(a: string | number): string | number {
 //     return a
-// }[|
+// }
 // 
-// foo|]; foon;
+// [|foo|]; foon;
 // 
 // export const bar = 123;
 // console.log({ bar });
@@ -27,13 +27,13 @@
 // declare function foo(a: string): string;
 // declare function foo(a: string | number): string | number;
 // 
-// function[| foon|](a: number): number;
-// function[| foon|](a: string): string;
-// function foon/*FIND ALL REFS*/[| foon|](a: string | number): string | number {
+// function [|foon|](a: number): number;
+// function [|foon|](a: string): string;
+// function foon/*FIND ALL REFS*/[|foon|](a: string | number): string | number {
 //     return a
 // }
 // 
-// foo;[| foon|];
+// foo; [|foon|];
 // 
 // export const bar = 123;
 // console.log({ bar });
@@ -49,8 +49,8 @@
 // 
 // foo; foon;
 // 
-// export const bar/*FIND ALL REFS*/[| bar|] = 123;
-// console.log({[| bar|] });
+// export const bar/*FIND ALL REFS*/[|bar|] = 123;
+// console.log({ [|bar|] });
 // 
 // interface IFoo {
 //     foo(): void;
@@ -62,18 +62,17 @@
 // === findAllReferences ===
 // === /findAllRefsIsDefinition.ts ===
 
-// --- (line: 12) skipped ---
-// export const bar = 123;
+// --- (line: 13) skipped ---
 // console.log({ bar });
 // 
-// interface IFoo {[|
-//     foo|]/*FIND ALL REFS*/(): void;
+// interface IFoo {
+//     foo/*FIND ALL REFS*/[|foo|](): void;
 // }
 // class Foo implements IFoo {
 //     constructor(n: number)
 //     constructor()
-//     constructor(n: number?) { }[|
-//     foo|](): void { }
+//     constructor(n: number?) { }
+//     [|foo|](): void { }
 //     static init() { return new this() }
 // }
 
@@ -87,7 +86,7 @@
 // interface IFoo {
 //     foo(): void;
 // }
-// class[| Foo|] implements IFoo {
+// class [|Foo|] implements IFoo {
 //     constructor(n: number)
 //     constructor()
 //     /*FIND ALL REFS*/constructor(n: number?) { }
@@ -101,17 +100,16 @@
 // === findAllReferences ===
 // === /findAllRefsIsDefinition.ts ===
 
-// --- (line: 12) skipped ---
-// export const bar = 123;
+// --- (line: 13) skipped ---
 // console.log({ bar });
 // 
-// interface IFoo {[|
-//     foo|](): void;
+// interface IFoo {
+//     [|foo|](): void;
 // }
 // class Foo implements IFoo {
 //     constructor(n: number)
 //     constructor()
-//     constructor(n: number?) { }[|
-//     foo|]/*FIND ALL REFS*/(): void { }
+//     constructor(n: number?) { }
+//     foo/*FIND ALL REFS*/[|foo|](): void { }
 //     static init() { return new this() }
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag2.baseline.jsonc
index bb32cd209b..9987febf6d 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag2.baseline.jsonc
@@ -1,9 +1,9 @@
 // === findAllReferences ===
 // === /player.js ===
 
-// import[| Component|] from './component.js';
+// import [|Component|] from './component.js';
 // 
 // /**
 //  * @extends Component/*FIND ALL REFS*/[|Component|]
 //  */
-// export class Player extends[| Component|] {}
+// 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 19b80b4920..7bf992e0a5 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag3.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag3.baseline.jsonc
@@ -1,9 +1,9 @@
 // === findAllReferences ===
 // === /player.js ===
 
-// import {[| Component|] } from './component.js';
+// import { [|Component|] } from './component.js';
 // 
 // /**
 //  * @extends Component/*FIND ALL REFS*/[|Component|]
 //  */
-// export class Player extends[| Component|] {}
+// 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 74303d3b74..b5667df472 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag4.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag4.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /player.js ===
 
-// import * as[| C|] from './component.js';
+// import * as [|C|] from './component.js';
 // 
 // /**
 //  * @extends C/*FIND ALL REFS*/[|C|].Component
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag5.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag5.baseline.jsonc
index e2d1c9698c..792093fbff 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag5.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsDocImportTag5.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /a.js ===
 
-// export default function /*FIND ALL REFS*/[| a|]() {}
+// export default function /*FIND ALL REFS*/[|a|]() {}
 
 
 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsThisPropertyAssignment.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsThisPropertyAssignment.baseline.jsonc
index e2bf8c4f1f..44c5225d74 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsThisPropertyAssignment.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsThisPropertyAssignment.baseline.jsonc
@@ -12,7 +12,7 @@
 
 // === /infer.d.ts ===
 
-// export declare function infer(o: { m(): void } & ThisType<{[| x|]: number }>): void;
+// export declare function infer(o: { m(): void } & ThisType<{ [|x|]: number }>): void;
 
 
 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsThisPropertyAssignment2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsThisPropertyAssignment2.baseline.jsonc
index cecf65049e..4532bf1be8 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsThisPropertyAssignment2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsJsThisPropertyAssignment2.baseline.jsonc
@@ -14,7 +14,7 @@
 
 // === /infer.d.ts ===
 
-// export declare function infer(o: { m: Record<string, Function> } & ThisType<{[| x|]: number }>): void;
+// export declare function infer(o: { m: Record<string, Function> } & ThisType<{ [|x|]: number }>): void;
 
 
 
@@ -48,4 +48,4 @@
 
 // === /infer.d.ts ===
 
-// export declare function infer(o: { m: Record<string, Function> } & ThisType<{[| x|]: number }>): void;
+// export declare function infer(o: { m: Record<string, Function> } & ThisType<{ [|x|]: number }>): void;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsMappedType.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsMappedType.baseline.jsonc
index c41e31f80d..595ca19d09 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsMappedType.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsMappedType.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllRefsMappedType.ts ===
 
-// interface T { /*FIND ALL REFS*/[| a|]: number; }
+// interface T { /*FIND ALL REFS*/[|a|]: number; }
 // type U = { readonly [K in keyof T]?: string };
 // declare const t: T;
 // t.[|a|];
@@ -14,7 +14,7 @@
 // === findAllReferences ===
 // === /findAllRefsMappedType.ts ===
 
-// interface T {[| a|]: number; }
+// interface T { [|a|]: number; }
 // type U = { readonly [K in keyof T]?: string };
 // declare const t: T;
 // t./*FIND ALL REFS*/[|a|];
@@ -27,7 +27,7 @@
 // === findAllReferences ===
 // === /findAllRefsMappedType.ts ===
 
-// interface T {[| a|]: number; }
+// interface T { [|a|]: number; }
 // type U = { readonly [K in keyof T]?: string };
 // declare const t: T;
 // t.[|a|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsMissingModulesOverlappingSpecifiers.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsMissingModulesOverlappingSpecifiers.baseline.jsonc
index 59c6f3de0c..d8b51f70d8 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsMissingModulesOverlappingSpecifiers.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsMissingModulesOverlappingSpecifiers.baseline.jsonc
@@ -8,4 +8,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*/[|resolve|] } from "whatever";
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsNoImportClause.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsNoImportClause.baseline.jsonc
index 78c3733121..b93e88873c 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsNoImportClause.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsNoImportClause.baseline.jsonc
@@ -6,4 +6,4 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// export const /*FIND ALL REFS*/[| x|] = 0;
+// export const /*FIND ALL REFS*/[|x|] = 0;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName01.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName01.baseline.jsonc
index bad2f9dbb6..83a6fd9260 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName01.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName01.baseline.jsonc
@@ -1,13 +1,13 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName01.ts ===
 
-// interface I {[|
-//     /*FIND ALL REFS*/property1|]: number;
+// interface I {
+//     /*FIND ALL REFS*/[|property1|]: number;
 //     property2: string;
 // }
 // 
 // var foo: I;
-// var {[| property1|]: prop1 } = foo;
+// var { [|property1|]: prop1 } = foo;
 
 
 
@@ -20,10 +20,10 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName01.ts ===
 
-// interface I {[|
-//     property1|]: number;
+// interface I {
+//     [|property1|]: number;
 //     property2: string;
 // }
 // 
 // var foo: I;
-// var { /*FIND ALL REFS*/[| property1|]: prop1 } = foo;
+// var { /*FIND ALL REFS*/[|property1|]: prop1 } = foo;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName02.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName02.baseline.jsonc
index c825bcd01b..9a76dc032a 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName02.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName02.baseline.jsonc
@@ -1,13 +1,13 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName02.ts ===
 
-// interface I {[|
-//     /*FIND ALL REFS*/property1|]: number;
+// interface I {
+//     /*FIND ALL REFS*/[|property1|]: number;
 //     property2: string;
 // }
 // 
 // var foo: I;
-// var {[| property1|]: {} } = foo;
+// var { [|property1|]: {} } = foo;
 
 
 
@@ -20,10 +20,10 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName02.ts ===
 
-// interface I {[|
-//     property1|]: number;
+// interface I {
+//     [|property1|]: number;
 //     property2: string;
 // }
 // 
 // var foo: I;
-// var { /*FIND ALL REFS*/[| property1|]: {} } = foo;
+// var { /*FIND ALL REFS*/[|property1|]: {} } = foo;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName03.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName03.baseline.jsonc
index f32aef1855..693b834f7f 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName03.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName03.baseline.jsonc
@@ -1,13 +1,13 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName03.ts ===
 
-// interface I {[|
-//     /*FIND ALL REFS*/property1|]: number;
+// interface I {
+//     /*FIND ALL REFS*/[|property1|]: number;
 //     property2: string;
 // }
 // 
 // var foo: I;
-// var [ {[| property1|]: prop1 }, {[| property1|], property2 } ] = [foo, foo];
+// var [ { [|property1|]: prop1 }, { [|property1|], property2 } ] = [foo, foo];
 
 
 
@@ -15,10 +15,10 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName03.ts ===
 
-// interface I {[|
-//     property1|]: number;
+// interface I {
+//     [|property1|]: number;
 //     property2: string;
 // }
 // 
 // var foo: I;
-// var [ { property1: prop1 }, { /*FIND ALL REFS*/[| property1|]: prop1 }, {[| property1|], property2 } ] = [foo, foo];
+// var [ { property1: prop1 }, { /*FIND ALL REFS*/[|property1|]: prop1 }, { [|property1|], property2 } ] = [foo, foo];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName04.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName04.baseline.jsonc
index 2454a338e9..915b803c98 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName04.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName04.baseline.jsonc
@@ -1,13 +1,13 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName04.ts ===
 
-// interface I {[|
-//     /*FIND ALL REFS*/property1|]: number;
+// interface I {
+//     /*FIND ALL REFS*/[|property1|]: number;
 //     property2: string;
 // }
 // 
-// function f({[| property1|]: p1 }: I,
-//            {[| property1|] }: I,
+// function f({ [|property1|]: p1 }: I,
+//            { [|property1|] }: I,
 //            { property1: p2 }) {
 // 
 //     return property1 + 1;
@@ -19,13 +19,13 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName04.ts ===
 
-// interface I {[|
-//     property1|]: number;
+// interface I {
+//     [|property1|]: number;
 //     property2: string;
 // }
 // 
-// function f({ /*FIND ALL REFS*/[| property1|]: p1 }: I,
-//            {[| property1|] }: I,
+// function f({ /*FIND ALL REFS*/[|property1|]: p1 }: I,
+//            { [|property1|] }: I,
 //            { property1: p2 }) {
 // 
 //     return property1 + 1;
@@ -37,16 +37,16 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName04.ts ===
 
-// interface I {[|
-//     property1|]: number;
+// interface I {
+//     [|property1|]: number;
 //     property2: string;
 // }
 // 
-// function f({[| property1|]: p1 }: I,
-//            { /*FIND ALL REFS*/[| property1|] }: I,
+// function f({ [|property1|]: p1 }: I,
+//            { /*FIND ALL REFS*/[|property1|] }: I,
 //            { property1: p2 }) {
 // 
-//     return[| property1|] + 1;
+//     return [|property1|] + 1;
 // }
 
 
@@ -59,8 +59,8 @@
 // }
 // 
 // function f({ property1: p1 }: I,
-//            {[| property1|] }: I,
+//            { [|property1|] }: I,
 //            { property1: p2 }) {
 // 
-//     return /*FIND ALL REFS*/[| property1|] + 1;
+//     return /*FIND ALL REFS*/[|property1|] + 1;
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName06.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName06.baseline.jsonc
index 6809e7c21c..c7dc40260b 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName06.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName06.baseline.jsonc
@@ -1,17 +1,17 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName06.ts ===
 
-// interface I {[|
-//     /*FIND ALL REFS*/property1|]: number;
+// interface I {
+//     /*FIND ALL REFS*/[|property1|]: number;
 //     property2: string;
 // }
 // 
 // var elems: I[];
-// for (let {[| property1|]: p } of elems) {
+// for (let { [|property1|]: p } of elems) {
 // }
-// for (let {[| property1|] } of elems) {
+// for (let { [|property1|] } of elems) {
 // }
-// for (var {[| property1|]: p1 } of elems) {
+// for (var { [|property1|]: p1 } of elems) {
 // }
 // var p2;
 // for ({ property1 : p2 } of elems) {
@@ -23,17 +23,17 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName06.ts ===
 
-// interface I {[|
-//     property1|]: number;
+// interface I {
+//     [|property1|]: number;
 //     property2: string;
 // }
 // 
 // var elems: I[];
-// for (let { /*FIND ALL REFS*/[| property1|]: p } of elems) {
+// for (let { /*FIND ALL REFS*/[|property1|]: p } of elems) {
 // }
-// for (let {[| property1|] } of elems) {
+// for (let { [|property1|] } of elems) {
 // }
-// for (var {[| property1|]: p1 } of elems) {
+// for (var { [|property1|]: p1 } of elems) {
 // }
 // var p2;
 // for ({ property1 : p2 } of elems) {
@@ -45,17 +45,17 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName06.ts ===
 
-// interface I {[|
-//     property1|]: number;
+// interface I {
+//     [|property1|]: number;
 //     property2: string;
 // }
 // 
 // var elems: I[];
-// for (let {[| property1|]: p } of elems) {
+// for (let { [|property1|]: p } of elems) {
 // }
-// for (let {[| property1|] } of elems) {
+// for (let { [|property1|] } of elems) {
 // }
-// for (var { /*FIND ALL REFS*/[| property1|]: p1 } of elems) {
+// for (var { /*FIND ALL REFS*/[|property1|]: p1 } of elems) {
 // }
 // var p2;
 // for ({ property1 : p2 } of elems) {
@@ -71,7 +71,7 @@
 // for (var { property1: p1 } of elems) {
 // }
 // var p2;
-// for ({ /*FIND ALL REFS*/[| property1|] : p2 } of elems) {
+// for ({ /*FIND ALL REFS*/[|property1|] : p2 } of elems) {
 // }
 
 
@@ -80,17 +80,17 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName06.ts ===
 
-// interface I {[|
-//     property1|]: number;
+// interface I {
+//     [|property1|]: number;
 //     property2: string;
 // }
 // 
 // var elems: I[];
-// for (let {[| property1|]: p } of elems) {
+// for (let { [|property1|]: p } of elems) {
 // }
-// for (let { /*FIND ALL REFS*/[| property1|] } of elems) {
+// for (let { /*FIND ALL REFS*/[|property1|] } of elems) {
 // }
-// for (var {[| property1|]: p1 } of elems) {
+// for (var { [|property1|]: p1 } of elems) {
 // }
 // var p2;
 // for ({ property1 : p2 } of elems) {
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName07.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName07.baseline.jsonc
index cb5f6a27a8..3eb936bfc5 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName07.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName07.baseline.jsonc
@@ -3,4 +3,4 @@
 
 // let p, b;
 // 
-// p, [{ /*FIND ALL REFS*/[| a|]: p, b }] = [{ a: 10, b: true }];
+// p, [{ /*FIND ALL REFS*/[|a|]: p, b }] = [{ a: 10, b: true }];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName10.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName10.baseline.jsonc
index 158e57f749..300868e69d 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName10.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsObjectBindingElementPropertyName10.baseline.jsonc
@@ -1,12 +1,12 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName10.ts ===
 
-// interface Recursive {[|
-//     /*FIND ALL REFS*/next|]?: Recursive;
+// interface Recursive {
+//     /*FIND ALL REFS*/[|next|]?: Recursive;
 //     value: any;
 // }
 // 
-// function f ({[| next|]: {[| next|]: x} }: Recursive) {
+// function f ({ [|next|]: { [|next|]: x} }: Recursive) {
 // }
 
 
@@ -20,12 +20,12 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName10.ts ===
 
-// interface Recursive {[|
-//     next|]?: Recursive;
+// interface Recursive {
+//     [|next|]?: Recursive;
 //     value: any;
 // }
 // 
-// function f ({ /*FIND ALL REFS*/[| next|]: {[| next|]: x} }: Recursive) {
+// function f ({ /*FIND ALL REFS*/[|next|]: { [|next|]: x} }: Recursive) {
 // }
 
 
@@ -34,10 +34,10 @@
 // === findAllReferences ===
 // === /findAllRefsObjectBindingElementPropertyName10.ts ===
 
-// interface Recursive {[|
-//     next|]?: Recursive;
+// interface Recursive {
+//     [|next|]?: Recursive;
 //     value: any;
 // }
 // 
-// function f ({ next: { /*FIND ALL REFS*/[| next|]: {[| next|]: x} }: Recursive) {
+// function f ({ next: { /*FIND ALL REFS*/[|next|]: { [|next|]: x} }: Recursive) {
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOfConstructor_withModifier.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOfConstructor_withModifier.baseline.jsonc
index 4f6c32058e..79cc67c300 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOfConstructor_withModifier.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOfConstructor_withModifier.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllRefsOfConstructor_withModifier.ts ===
 
-// class[| X|] {
+// class [|X|] {
 //     public /*FIND ALL REFS*/constructor() {}
 // }
-// var x = new[| X|]();
+// var x = new [|X|]();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDecorators.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDecorators.baseline.jsonc
index c4fa145b22..b529a66035 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDecorators.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDecorators.baseline.jsonc
@@ -6,10 +6,10 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// function /*FIND ALL REFS*/[| decorator|](target) {
+// function /*FIND ALL REFS*/[|decorator|](target) {
 //     return target;
-// }[|
-// decorator|]();
+// }
+// [|decorator|]();
 
 
 
@@ -17,10 +17,10 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// function[| decorator|](target) {
+// function [|decorator|](target) {
 //     return target;
-// }[|
-// /*FIND ALL REFS*/decorator|]();
+// }
+// /*FIND ALL REFS*/[|decorator|]();
 
 
 
@@ -28,10 +28,10 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// function[| decorator|](target) {
+// function [|decorator|](target) {
 //     return target;
-// }[|
-// decorator|]();
+// }
+// [|decorator|]();
 
 
 // === /b.ts ===
@@ -48,10 +48,10 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// function[| decorator|](target) {
+// function [|decorator|](target) {
 //     return target;
-// }[|
-// decorator|]();
+// }
+// [|decorator|]();
 
 
 // === /b.ts ===
@@ -68,10 +68,10 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// function[| decorator|](target) {
+// function [|decorator|](target) {
 //     return target;
-// }[|
-// decorator|]();
+// }
+// [|decorator|]();
 
 
 // === /b.ts ===
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDefinition.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDefinition.baseline.jsonc
index bd933687c5..213cd71e89 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDefinition.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDefinition.baseline.jsonc
@@ -10,7 +10,7 @@
 // 
 //     }
 // 
-//     public /*FIND ALL REFS*/[| start|](){
+//     public /*FIND ALL REFS*/[|start|](){
 //         return this;
 //     }
 // 
@@ -26,7 +26,7 @@
 // 
 //     }
 // 
-//     public[| start|](){
+//     public [|start|](){
 //         return this;
 //     }
 // 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDefinition2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDefinition2.baseline.jsonc
index 4286f5bf41..f060ae0a43 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDefinition2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnDefinition2.baseline.jsonc
@@ -8,7 +8,7 @@
 
 // export module Test{
 // 
-//     export interface /*FIND ALL REFS*/[| start|] { }
+//     export interface /*FIND ALL REFS*/[|start|] { }
 // 
 //     export interface stop { }
 // }
@@ -21,7 +21,7 @@
 
 // export module Test{
 // 
-//     export interface[| start|] { }
+//     export interface [|start|] { }
 // 
 //     export interface stop { }
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnImportAliases.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnImportAliases.baseline.jsonc
index 84c9a02501..960cfac642 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnImportAliases.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnImportAliases.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// export class /*FIND ALL REFS*/[| Class|] {
+// export class /*FIND ALL REFS*/[|Class|] {
 // }
 
 
@@ -10,9 +10,9 @@
 // === findAllReferences ===
 // === /b.ts ===
 
-// import { /*FIND ALL REFS*/[| Class|] } from "./a";
+// import { /*FIND ALL REFS*/[|Class|] } from "./a";
 // 
-// var c = new[| Class|]();
+// var c = new [|Class|]();
 
 
 
@@ -20,6 +20,6 @@
 // === findAllReferences ===
 // === /b.ts ===
 
-// import {[| Class|] } from "./a";
+// import { [|Class|] } from "./a";
 // 
-// var c = new /*FIND ALL REFS*/[| Class|]();
+// var c = new /*FIND ALL REFS*/[|Class|]();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnPrivateParameterProperty1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnPrivateParameterProperty1.baseline.jsonc
index f4e6079687..5d53378eeb 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnPrivateParameterProperty1.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsOnPrivateParameterProperty1.baseline.jsonc
@@ -7,7 +7,7 @@
 // === /findAllRefsOnPrivateParameterProperty1.ts ===
 
 // class ABCD {
-//     constructor(private x: number, public y: number, private /*FIND ALL REFS*/[| z|]: number) {
+//     constructor(private x: number, public y: number, private /*FIND ALL REFS*/[|z|]: number) {
 //     }
 // 
 //     func() {
@@ -22,7 +22,7 @@
 // === /findAllRefsOnPrivateParameterProperty1.ts ===
 
 // class ABCD {
-//     constructor(private x: number, public y: number, private[| z|]: number) {
+//     constructor(private x: number, public y: number, private [|z|]: number) {
 //     }
 // 
 //     func() {
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration1.baseline.jsonc
index 476cefe28d..1051fef3e0 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration1.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration1.baseline.jsonc
@@ -2,8 +2,8 @@
 // === /findAllRefsParameterPropertyDeclaration1.ts ===
 
 // class Foo {
-//     constructor(private /*FIND ALL REFS*/[| privateParam|]: number) {
-//         let localPrivate =[| privateParam|];
+//     constructor(private /*FIND ALL REFS*/[|privateParam|]: number) {
+//         let localPrivate = [|privateParam|];
 //         this.[|privateParam|] += 10;
 //     }
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration2.baseline.jsonc
index 312781db6b..7ad1bdc9fd 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration2.baseline.jsonc
@@ -2,8 +2,8 @@
 // === /findAllRefsParameterPropertyDeclaration2.ts ===
 
 // class Foo {
-//     constructor(public /*FIND ALL REFS*/[| publicParam|]: number) {
-//         let localPublic =[| publicParam|];
+//     constructor(public /*FIND ALL REFS*/[|publicParam|]: number) {
+//         let localPublic = [|publicParam|];
 //         this.[|publicParam|] += 10;
 //     }
 // }
@@ -15,8 +15,8 @@
 // === /findAllRefsParameterPropertyDeclaration2.ts ===
 
 // class Foo {
-//     constructor(public[| publicParam|]: number) {
-//         let localPublic = /*FIND ALL REFS*/[| publicParam|];
+//     constructor(public [|publicParam|]: number) {
+//         let localPublic = /*FIND ALL REFS*/[|publicParam|];
 //         this.[|publicParam|] += 10;
 //     }
 // }
@@ -28,8 +28,8 @@
 // === /findAllRefsParameterPropertyDeclaration2.ts ===
 
 // class Foo {
-//     constructor(public[| publicParam|]: number) {
-//         let localPublic =[| publicParam|];
+//     constructor(public [|publicParam|]: number) {
+//         let localPublic = [|publicParam|];
 //         this./*FIND ALL REFS*/[|publicParam|] += 10;
 //     }
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration3.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration3.baseline.jsonc
index 51d582769c..a0cdacdd22 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration3.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration3.baseline.jsonc
@@ -2,8 +2,8 @@
 // === /findAllRefsParameterPropertyDeclaration3.ts ===
 
 // class Foo {
-//     constructor(protected /*FIND ALL REFS*/[| protectedParam|]: number) {
-//         let localProtected =[| protectedParam|];
+//     constructor(protected /*FIND ALL REFS*/[|protectedParam|]: number) {
+//         let localProtected = [|protectedParam|];
 //         this.[|protectedParam|] += 10;
 //     }
 // }
@@ -15,8 +15,8 @@
 // === /findAllRefsParameterPropertyDeclaration3.ts ===
 
 // class Foo {
-//     constructor(protected[| protectedParam|]: number) {
-//         let localProtected = /*FIND ALL REFS*/[| protectedParam|];
+//     constructor(protected [|protectedParam|]: number) {
+//         let localProtected = /*FIND ALL REFS*/[|protectedParam|];
 //         this.[|protectedParam|] += 10;
 //     }
 // }
@@ -28,8 +28,8 @@
 // === /findAllRefsParameterPropertyDeclaration3.ts ===
 
 // class Foo {
-//     constructor(protected[| protectedParam|]: number) {
-//         let localProtected =[| protectedParam|];
+//     constructor(protected [|protectedParam|]: number) {
+//         let localProtected = [|protectedParam|];
 //         this./*FIND ALL REFS*/[|protectedParam|] += 10;
 //     }
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration_inheritance.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration_inheritance.baseline.jsonc
index ab757cf2f5..2a68d0dcfe 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration_inheritance.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsParameterPropertyDeclaration_inheritance.baseline.jsonc
@@ -2,12 +2,12 @@
 // === /findAllRefsParameterPropertyDeclaration_inheritance.ts ===
 
 // class C {
-// 	constructor(public /*FIND ALL REFS*/[| x|]: string) {[|
-// 		x|];
+// 	constructor(public /*FIND ALL REFS*/[|x|]: string) {
+// 		[|x|];
 // 	}
 // }
 // class D extends C {
-// 	constructor(public[| x|]: string) {
+// 	constructor(public [|x|]: string) {
 // 		super([|x|]);
 // 	}
 // }
@@ -19,8 +19,8 @@
 // === /findAllRefsParameterPropertyDeclaration_inheritance.ts ===
 
 // class C {
-// 	constructor(public[| x|]: string) {[|
-// 		/*FIND ALL REFS*/x|];
+// 	constructor(public [|x|]: string) {
+// 		/*FIND ALL REFS*/[|x|];
 // 	}
 // }
 // class D extends C {
@@ -33,12 +33,12 @@
 // === /findAllRefsParameterPropertyDeclaration_inheritance.ts ===
 
 // class C {
-// 	constructor(public[| x|]: string) {[|
-// 		x|];
+// 	constructor(public [|x|]: string) {
+// 		[|x|];
 // 	}
 // }
 // class D extends C {
-// 	constructor(public /*FIND ALL REFS*/[| x|]: string) {
+// 	constructor(public /*FIND ALL REFS*/[|x|]: string) {
 // 		super([|x|]);
 // 	}
 // }
@@ -50,12 +50,12 @@
 // === /findAllRefsParameterPropertyDeclaration_inheritance.ts ===
 
 // class C {
-// 	constructor(public[| x|]: string) {[|
-// 		x|];
+// 	constructor(public [|x|]: string) {
+// 		[|x|];
 // 	}
 // }
 // class D extends C {
-// 	constructor(public[| x|]: string) {
+// 	constructor(public [|x|]: string) {
 // 		super(/*FIND ALL REFS*/[|x|]);
 // 	}
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrimitiveJsDoc.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrimitiveJsDoc.baseline.jsonc
index ae7e2fe2e4..a4a258ac83 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrimitiveJsDoc.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrimitiveJsDoc.baseline.jsonc
@@ -5,7 +5,7 @@
 //  * @param {/*FIND ALL REFS*/[|number|]} n
 //  * @returns {[|number|]}
 //  */
-// function f(n:[| number|]):[| number|] {}
+// function f(n: [|number|]): [|number|] {}
 
 
 
@@ -17,7 +17,7 @@
 //  * @param {[|number|]} n
 //  * @returns {/*FIND ALL REFS*/[|number|]}
 //  */
-// function f(n:[| number|]):[| number|] {}
+// function f(n: [|number|]): [|number|] {}
 
 
 
@@ -29,7 +29,7 @@
 //  * @param {[|number|]} n
 //  * @returns {[|number|]}
 //  */
-// function f(n: /*FIND ALL REFS*/[| number|]):[| number|] {}
+// function f(n: /*FIND ALL REFS*/[|number|]): [|number|] {}
 
 
 
@@ -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|]): [|number|] {}
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrivateNameAccessors.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrivateNameAccessors.baseline.jsonc
index 45510f41ea..5cec923ee6 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrivateNameAccessors.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrivateNameAccessors.baseline.jsonc
@@ -7,8 +7,8 @@
 // === /findAllRefsPrivateNameAccessors.ts ===
 
 // class C {
-//     get /*FIND ALL REFS*/[| #foo|](){ return 1; }
-//     set[| #foo|](value: number){  }
+//     get /*FIND ALL REFS*/[|#foo|](){ return 1; }
+//     set [|#foo|](value: number){  }
 //     constructor() {
 //         this.[|#foo|]();
 //     }
@@ -28,8 +28,8 @@
 // === /findAllRefsPrivateNameAccessors.ts ===
 
 // class C {
-//     get[| #foo|](){ return 1; }
-//     set /*FIND ALL REFS*/[| #foo|](value: number){  }
+//     get [|#foo|](){ return 1; }
+//     set /*FIND ALL REFS*/[|#foo|](value: number){  }
 //     constructor() {
 //         this.[|#foo|]();
 //     }
@@ -44,8 +44,8 @@
 // === /findAllRefsPrivateNameAccessors.ts ===
 
 // class C {
-//     get[| #foo|](){ return 1; }
-//     set[| #foo|](value: number){  }
+//     get [|#foo|](){ return 1; }
+//     set [|#foo|](value: number){  }
 //     constructor() {
 //         this./*FIND ALL REFS*/[|#foo|]();
 //     }
@@ -68,8 +68,8 @@
 //     }
 // }
 // class E {
-//     get /*FIND ALL REFS*/[| #foo|](){ return 1; }
-//     set[| #foo|](value: number){  }
+//     get /*FIND ALL REFS*/[|#foo|](){ return 1; }
+//     set [|#foo|](value: number){  }
 //     constructor() {
 //         this.[|#foo|]();
 //     }
@@ -90,8 +90,8 @@
 //     }
 // }
 // class E {
-//     get[| #foo|](){ return 1; }
-//     set /*FIND ALL REFS*/[| #foo|](value: number){  }
+//     get [|#foo|](){ return 1; }
+//     set /*FIND ALL REFS*/[|#foo|](value: number){  }
 //     constructor() {
 //         this.[|#foo|]();
 //     }
@@ -107,8 +107,8 @@
 //     }
 // }
 // class E {
-//     get[| #foo|](){ return 1; }
-//     set[| #foo|](value: number){  }
+//     get [|#foo|](){ return 1; }
+//     set [|#foo|](value: number){  }
 //     constructor() {
 //         this./*FIND ALL REFS*/[|#foo|]();
 //     }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrivateNameMethods.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrivateNameMethods.baseline.jsonc
index 843e873d7d..f24a72a75c 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrivateNameMethods.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrivateNameMethods.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /findAllRefsPrivateNameMethods.ts ===
 
-// class C {[|
-//     /*FIND ALL REFS*/#foo|](){ }
+// class C {
+//     /*FIND ALL REFS*/[|#foo|](){ }
 //     constructor() {
 //         this.[|#foo|]();
 //     }
@@ -16,8 +16,8 @@
 // === findAllReferences ===
 // === /findAllRefsPrivateNameMethods.ts ===
 
-// class C {[|
-//     #foo|](){ }
+// class C {
+//     [|#foo|](){ }
 //     constructor() {
 //         this./*FIND ALL REFS*/[|#foo|]();
 //     }
@@ -31,12 +31,11 @@
 // === findAllReferences ===
 // === /findAllRefsPrivateNameMethods.ts ===
 
-// --- (line: 9) skipped ---
-//         this.#foo = 20;
+// --- (line: 10) skipped ---
 //     }
 // }
-// class E {[|
-//     /*FIND ALL REFS*/#foo|](){ }
+// class E {
+//     /*FIND ALL REFS*/[|#foo|](){ }
 //     constructor() {
 //         this.[|#foo|]();
 //     }
@@ -48,12 +47,11 @@
 // === findAllReferences ===
 // === /findAllRefsPrivateNameMethods.ts ===
 
-// --- (line: 9) skipped ---
-//         this.#foo = 20;
+// --- (line: 10) skipped ---
 //     }
 // }
-// class E {[|
-//     #foo|](){ }
+// class E {
+//     [|#foo|](){ }
 //     constructor() {
 //         this./*FIND ALL REFS*/[|#foo|]();
 //     }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrivateNameProperties.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrivateNameProperties.baseline.jsonc
index 67b7fbec40..9cca24a9f5 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrivateNameProperties.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPrivateNameProperties.baseline.jsonc
@@ -1,11 +1,11 @@
 // === findAllReferences ===
 // === /findAllRefsPrivateNameProperties.ts ===
 
-// class C {[|
-//     /*FIND ALL REFS*/#foo|] = 10;
+// class C {
+//     /*FIND ALL REFS*/[|#foo|] = 10;
 //     constructor() {
-//         this.[|#foo|] = 20;[|
-//         #foo|] in this;
+//         this.[|#foo|] = 20;
+//         [|#foo|] in this;
 //     }
 // }
 // class D extends C {
@@ -17,11 +17,11 @@
 // === findAllReferences ===
 // === /findAllRefsPrivateNameProperties.ts ===
 
-// class C {[|
-//     #foo|] = 10;
+// class C {
+//     [|#foo|] = 10;
 //     constructor() {
-//         this./*FIND ALL REFS*/[|#foo|] = 20;[|
-//         #foo|] in this;
+//         this./*FIND ALL REFS*/[|#foo|] = 20;
+//         [|#foo|] in this;
 //     }
 // }
 // class D extends C {
@@ -33,11 +33,11 @@
 // === findAllReferences ===
 // === /findAllRefsPrivateNameProperties.ts ===
 
-// class C {[|
-//     #foo|] = 10;
+// class C {
+//     [|#foo|] = 10;
 //     constructor() {
-//         this.[|#foo|] = 20;[|
-//         /*FIND ALL REFS*/#foo|] in this;
+//         this.[|#foo|] = 20;
+//         /*FIND ALL REFS*/[|#foo|] in this;
 //     }
 // }
 // class D extends C {
@@ -49,12 +49,11 @@
 // === findAllReferences ===
 // === /findAllRefsPrivateNameProperties.ts ===
 
-// --- (line: 10) skipped ---
-//         this.#foo = 20;
+// --- (line: 11) skipped ---
 //     }
 // }
-// class E {[|
-//     /*FIND ALL REFS*/#foo|]: number;
+// class E {
+//     /*FIND ALL REFS*/[|#foo|]: number;
 //     constructor() {
 //         this.[|#foo|] = 20;
 //     }
@@ -66,12 +65,11 @@
 // === findAllReferences ===
 // === /findAllRefsPrivateNameProperties.ts ===
 
-// --- (line: 10) skipped ---
-//         this.#foo = 20;
+// --- (line: 11) skipped ---
 //     }
 // }
-// class E {[|
-//     #foo|]: number;
+// class E {
+//     [|#foo|]: number;
 //     constructor() {
 //         this./*FIND ALL REFS*/[|#foo|] = 20;
 //     }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPropertyContextuallyTypedByTypeParam01.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPropertyContextuallyTypedByTypeParam01.baseline.jsonc
index 787cd4eabe..37f4a74f9b 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPropertyContextuallyTypedByTypeParam01.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsPropertyContextuallyTypedByTypeParam01.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /findAllRefsPropertyContextuallyTypedByTypeParam01.ts ===
 
-// interface IFoo {[|
-//     /*FIND ALL REFS*/a|]: string;
+// interface IFoo {
+//     /*FIND ALL REFS*/[|a|]: string;
 // }
 // class C<T extends IFoo> {
 //     method() {
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsRedeclaredPropertyInDerivedInterface.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsRedeclaredPropertyInDerivedInterface.baseline.jsonc
index c24cda7263..069893a1f3 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsRedeclaredPropertyInDerivedInterface.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsRedeclaredPropertyInDerivedInterface.baseline.jsonc
@@ -2,10 +2,10 @@
 // === /findAllRefsRedeclaredPropertyInDerivedInterface.ts ===
 
 // interface A {
-//     readonly /*FIND ALL REFS*/[| x|]: number | string;
+//     readonly /*FIND ALL REFS*/[|x|]: number | string;
 // }
 // interface B extends A {
-//     readonly[| x|]: number;
+//     readonly [|x|]: number;
 // }
 // const a: A = { x: 0 };
 // const b: B = { x: 0 };
@@ -17,10 +17,10 @@
 // === /findAllRefsRedeclaredPropertyInDerivedInterface.ts ===
 
 // interface A {
-//     readonly[| x|]: number | string;
+//     readonly [|x|]: number | string;
 // }
 // interface B extends A {
-//     readonly /*FIND ALL REFS*/[| x|]: number;
+//     readonly /*FIND ALL REFS*/[|x|]: number;
 // }
 // const a: A = { x: 0 };
 // const b: B = { x: 0 };
@@ -35,7 +35,7 @@
 // interface B extends A {
 //     readonly x: number;
 // }
-// const a: A = { /*FIND ALL REFS*/[| x|]: 0 };
+// const a: A = { /*FIND ALL REFS*/[|x|]: 0 };
 // const b: B = { x: 0 };
 
 
@@ -48,4 +48,4 @@
 //     readonly x: number;
 // }
 // const a: A = { x: 0 };
-// const b: B = { /*FIND ALL REFS*/[| x|]: 0 };
+// const b: B = { /*FIND ALL REFS*/[|x|]: 0 };
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsRootSymbols.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsRootSymbols.baseline.jsonc
index 7a141f8dd2..7b17dcb086 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsRootSymbols.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsRootSymbols.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllRefsRootSymbols.ts ===
 
-// interface I { /*FIND ALL REFS*/[| x|]: {}; }
+// interface I { /*FIND ALL REFS*/[|x|]: {}; }
 // interface J { x: {}; }
 // declare const o: (I | J) & { x: string };
 // o.[|x|];
@@ -13,7 +13,7 @@
 // === /findAllRefsRootSymbols.ts ===
 
 // interface I { x: {}; }
-// interface J { /*FIND ALL REFS*/[| x|]: {}; }
+// interface J { /*FIND ALL REFS*/[|x|]: {}; }
 // declare const o: (I | J) & { x: string };
 // o.[|x|];
 
@@ -25,7 +25,7 @@
 
 // interface I { x: {}; }
 // interface J { x: {}; }
-// declare const o: (I | J) & { /*FIND ALL REFS*/[| x|]: string };
+// declare const o: (I | J) & { /*FIND ALL REFS*/[|x|]: string };
 // o.[|x|];
 
 
@@ -34,7 +34,7 @@
 // === findAllReferences ===
 // === /findAllRefsRootSymbols.ts ===
 
-// interface I {[| x|]: {}; }
-// interface J {[| x|]: {}; }
-// declare const o: (I | J) & {[| x|]: string };
+// interface I { [|x|]: {}; }
+// interface J { [|x|]: {}; }
+// declare const o: (I | J) & { [|x|]: string };
 // o./*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 9f3540c87c..85287fafda 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsThisKeyword.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsThisKeyword.baseline.jsonc
@@ -15,7 +15,7 @@
 
 // this;
 // function f(/*FIND ALL REFS*/[|this|]) {
-//     return[| this|];
+//     return [|this|];
 //     function g(this) { return this; }
 // }
 // class C {
@@ -29,7 +29,7 @@
 
 // this;
 // function f([|this|]) {
-//     return /*FIND ALL REFS*/[| this|];
+//     return /*FIND ALL REFS*/[|this|];
 //     function g(this) { return this; }
 // }
 // class C {
@@ -44,7 +44,7 @@
 // this;
 // function f(this) {
 //     return this;
-//     function g(/*FIND ALL REFS*/[|this|]) { return[| this|]; }
+//     function g(/*FIND ALL REFS*/[|this|]) { return [|this|]; }
 // }
 // class C {
 //     static x() {
@@ -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|]) { return [|this|]; }
 // }
 // class C {
 //     static x() {
@@ -71,15 +71,14 @@
 // === findAllReferences ===
 // === /findAllRefsThisKeyword.ts ===
 
-// --- (line: 3) skipped ---
-//     function g(this) { return this; }
+// --- (line: 4) skipped ---
 // }
 // class C {
-//     static x() {[|
-//         /*FIND ALL REFS*/this|];
+//     static x() {
+//         /*FIND ALL REFS*/[|this|];
 //     }
 //     static y() {
-//         () =>[| this|];
+//         () => [|this|];
 //     }
 //     constructor() {
 //         this;
@@ -91,15 +90,14 @@
 // === findAllReferences ===
 // === /findAllRefsThisKeyword.ts ===
 
-// --- (line: 3) skipped ---
-//     function g(this) { return this; }
+// --- (line: 4) skipped ---
 // }
 // class C {
-//     static x() {[|
-//         this|];
+//     static x() {
+//         [|this|];
 //     }
 //     static y() {
-//         () => /*FIND ALL REFS*/[| this|];
+//         () => /*FIND ALL REFS*/[|this|];
 //     }
 //     constructor() {
 //         this;
@@ -111,15 +109,14 @@
 // === findAllReferences ===
 // === /findAllRefsThisKeyword.ts ===
 
-// --- (line: 9) skipped ---
-//     static y() {
+// --- (line: 10) skipped ---
 //         () => this;
 //     }
-//     constructor() {[|
-//         /*FIND ALL REFS*/this|];
+//     constructor() {
+//         /*FIND ALL REFS*/[|this|];
 //     }
 //     method() {
-//         () =>[| this|];
+//         () => [|this|];
 //     }
 // }
 // // These are *not* real uses of the 'this' keyword, they are identifiers.
@@ -132,15 +129,14 @@
 // === findAllReferences ===
 // === /findAllRefsThisKeyword.ts ===
 
-// --- (line: 9) skipped ---
-//     static y() {
+// --- (line: 10) skipped ---
 //         () => this;
 //     }
-//     constructor() {[|
-//         this|];
+//     constructor() {
+//         [|this|];
 //     }
 //     method() {
-//         () => /*FIND ALL REFS*/[| this|];
+//         () => /*FIND ALL REFS*/[|this|];
 //     }
 // }
 // // These are *not* real uses of the 'this' keyword, they are identifiers.
@@ -157,7 +153,7 @@
 //     }
 // }
 // // These are *not* real uses of the 'this' keyword, they are identifiers.
-// const x = { /*FIND ALL REFS*/[| this|]: 0 }
+// const x = { /*FIND ALL REFS*/[|this|]: 0 }
 // x.[|this|];
 
 
@@ -170,5 +166,5 @@
 //     }
 // }
 // // These are *not* real uses of the 'this' keyword, they are identifiers.
-// const x = {[| this|]: 0 }
+// const x = { [|this|]: 0 }
 // x./*FIND ALL REFS*/[|this|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsThisKeywordMultipleFiles.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsThisKeywordMultipleFiles.baseline.jsonc
index a335a75f45..84f2d2a7eb 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsThisKeywordMultipleFiles.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsThisKeywordMultipleFiles.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /file1.ts ===
 
-// /*FIND ALL REFS*/[|this|];[| this|];
+// /*FIND ALL REFS*/[|this|]; [|this|];
 
 
 
@@ -9,7 +9,7 @@
 // === findAllReferences ===
 // === /file1.ts ===
 
-// this; /*FIND ALL REFS*/[|this|];[| this|];
+// this; /*FIND ALL REFS*/[|this|]; [|this|];
 
 
 
@@ -17,8 +17,8 @@
 // === findAllReferences ===
 // === /file2.ts ===
 
-// /*FIND ALL REFS*/[|this|];[|
-// this|];
+// /*FIND ALL REFS*/[|this|];
+// [|this|];
 
 
 
@@ -26,8 +26,8 @@
 // === findAllReferences ===
 // === /file2.ts ===
 
-// [|this|];[|
-// /*FIND ALL REFS*/this|];
+// [|this|];
+// /*FIND ALL REFS*/[|this|];
 
 
 
@@ -35,7 +35,7 @@
 // === findAllReferences ===
 // === /file3.ts ===
 
-//  ((x = /*FIND ALL REFS*/[| this|], y) =>[| this|])([|this|],[| this|]);
+//  ((x = /*FIND ALL REFS*/[|this|], y) => [|this|])([|this|], [|this|]);
 //  // different 'this'
 //  function f(this) { return 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|], y) => [|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|], y) => [|this|])([|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|], y) => [|this|])([|this|], [|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 5d6fadbeae..db5de047a8 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsTypeParameterInMergedInterface.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsTypeParameterInMergedInterface.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /findAllRefsTypeParameterInMergedInterface.ts ===
 
-// interface I</*FIND ALL REFS*/[|T|]> { a:[| T|] }
-// interface I<[|T|]> { b:[| T|] }
+// interface I</*FIND ALL REFS*/[|T|]> { a: [|T|] }
+// interface I<[|T|]> { b: [|T|] }
 
 
 
@@ -10,8 +10,8 @@
 // === findAllReferences ===
 // === /findAllRefsTypeParameterInMergedInterface.ts ===
 
-// interface I<T> { a: /*FIND ALL REFS*/[|T|]> { a:[| T|] }
-// interface I<[|T|]> { b:[| T|] }
+// interface I<T> { a: /*FIND ALL REFS*/[|T|]> { a: [|T|] }
+// interface I<[|T|]> { b: [|T|] }
 
 
 
@@ -19,8 +19,8 @@
 // === findAllReferences ===
 // === /findAllRefsTypeParameterInMergedInterface.ts ===
 
-// interface I<[|T|]> { a:[| T|] }
-// interface I</*FIND ALL REFS*/[|T|]> { b:[| T|] }
+// interface I<[|T|]> { a: [|T|] }
+// interface I</*FIND ALL REFS*/[|T|]> { b: [|T|] }
 
 
 
@@ -28,5 +28,5 @@
 // === findAllReferences ===
 // === /findAllRefsTypeParameterInMergedInterface.ts ===
 
-// interface I<[|T|]> { a:[| T|] }
-// interface I<T> { b: /*FIND ALL REFS*/[|T|]> { b:[| T|] }
+// interface I<[|T|]> { a: [|T|] }
+// interface I<T> { b: /*FIND ALL REFS*/[|T|]> { b: [|T|] }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsTypeofImport.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsTypeofImport.baseline.jsonc
index d7d717b9c1..8a271bc267 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsTypeofImport.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsTypeofImport.baseline.jsonc
@@ -6,7 +6,7 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// export const /*FIND ALL REFS*/[| x|] = 0;
+// export const /*FIND ALL REFS*/[|x|] = 0;
 // declare const a: typeof import("./a");
 // a.[|x|];
 
@@ -16,6 +16,6 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// export const[| x|] = 0;
+// export const [|x|] = 0;
 // declare const a: typeof import("./a");
 // a./*FIND ALL REFS*/[|x|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnionProperty.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnionProperty.baseline.jsonc
index 3bb0f678ab..529079f7a0 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnionProperty.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnionProperty.baseline.jsonc
@@ -2,8 +2,8 @@
 // === /findAllRefsUnionProperty.ts ===
 
 // type T =
-//     | { /*FIND ALL REFS*/[| type|]: "a", prop: number }
-//     | {[| type|]: "b", prop: string };
+//     | { /*FIND ALL REFS*/[|type|]: "a", prop: number }
+//     | { [|type|]: "b", prop: string };
 // const tt: T = {
 //     type: "a",
 //     prop: 0,
@@ -22,8 +22,8 @@
 // === /findAllRefsUnionProperty.ts ===
 
 // type T =
-//     | {[| type|]: "a", prop: number }
-//     | { /*FIND ALL REFS*/[| type|]: "b", prop: string };
+//     | { [|type|]: "a", prop: number }
+//     | { /*FIND ALL REFS*/[|type|]: "b", prop: string };
 // const tt: T = {
 //     type: "a",
 //     prop: 0,
@@ -42,8 +42,8 @@
 // === /findAllRefsUnionProperty.ts ===
 
 // type T =
-//     | {[| type|]: "a", prop: number }
-//     | {[| type|]: "b", prop: string };
+//     | { [|type|]: "a", prop: number }
+//     | { [|type|]: "b", prop: string };
 // const tt: T = {
 //     type: "a",
 //     prop: 0,
@@ -62,8 +62,8 @@
 // === /findAllRefsUnionProperty.ts ===
 
 // type T =
-//     | {[| type|]: "a", prop: number }
-//     | {[| type|]: "b", prop: string };
+//     | { [|type|]: "a", prop: number }
+//     | { [|type|]: "b", prop: string };
 // const tt: T = {
 //     type: "a",
 //     prop: 0,
@@ -82,8 +82,8 @@
 // === /findAllRefsUnionProperty.ts ===
 
 // type T =
-//     | {[| type|]: "a", prop: number }
-//     | {[| type|]: "b", prop: string };
+//     | { [|type|]: "a", prop: number }
+//     | { [|type|]: "b", prop: string };
 // const tt: T = {
 //     type: "a",
 //     prop: 0,
@@ -104,8 +104,8 @@
 // type T =
 //     | { type: "a", prop: number }
 //     | { type: "b", prop: string };
-// const tt: T = {[|
-//     /*FIND ALL REFS*/type|]: "a",
+// const tt: T = {
+//     /*FIND ALL REFS*/[|type|]: "a",
 //     prop: 0,
 // };
 // declare const t: T;
@@ -118,8 +118,8 @@
 // === /findAllRefsUnionProperty.ts ===
 
 // type T =
-//     | { type: "a", /*FIND ALL REFS*/[| prop|]: number }
-//     | { type: "b",[| prop|]: string };
+//     | { type: "a", /*FIND ALL REFS*/[|prop|]: number }
+//     | { type: "b", [|prop|]: string };
 // const tt: T = {
 //     type: "a",
 //     prop: 0,
@@ -132,8 +132,8 @@
 // === /findAllRefsUnionProperty.ts ===
 
 // type T =
-//     | { type: "a",[| prop|]: number }
-//     | { type: "b", /*FIND ALL REFS*/[| prop|]: string };
+//     | { type: "a", [|prop|]: number }
+//     | { type: "b", /*FIND ALL REFS*/[|prop|]: string };
 // const tt: T = {
 //     type: "a",
 //     prop: 0,
@@ -149,8 +149,8 @@
 //     | { type: "a", prop: number }
 //     | { type: "b", prop: string };
 // const tt: T = {
-//     type: "a",[|
-//     /*FIND ALL REFS*/prop|]: 0,
+//     type: "a",
+//     /*FIND ALL REFS*/[|prop|]: 0,
 // };
 // declare const t: T;
 // if (t.type === "a") {
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnresolvedSymbols1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnresolvedSymbols1.baseline.jsonc
index 1afdfca3d5..af8ae38dbe 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnresolvedSymbols1.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnresolvedSymbols1.baseline.jsonc
@@ -1,9 +1,9 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols1.ts ===
 
-// let a: /*FIND ALL REFS*/[| Bar|];
-// let b:[| Bar|]<string>;
-// let c:[| Bar|]<string, number>;
+// let a: /*FIND ALL REFS*/[|Bar|];
+// let b: [|Bar|]<string>;
+// let c: [|Bar|]<string, number>;
 // let d: Bar.X;
 // let e: Bar.X<string>;
 // let f: Bar.X.Y;
@@ -14,9 +14,9 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols1.ts ===
 
-// let a:[| Bar|];
-// let b: /*FIND ALL REFS*/[| Bar|]<string>;
-// let c:[| Bar|]<string, number>;
+// let a: [|Bar|];
+// let b: /*FIND ALL REFS*/[|Bar|]<string>;
+// let c: [|Bar|]<string, number>;
 // let d: Bar.X;
 // let e: Bar.X<string>;
 // let f: Bar.X.Y;
@@ -27,9 +27,9 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols1.ts ===
 
-// let a:[| Bar|];
-// let b:[| Bar|]<string>;
-// let c: /*FIND ALL REFS*/[| Bar|]<string, number>;
+// let a: [|Bar|];
+// let b: [|Bar|]<string>;
+// let c: /*FIND ALL REFS*/[|Bar|]<string, number>;
 // let d: Bar.X;
 // let e: Bar.X<string>;
 // let f: Bar.X.Y;
@@ -43,9 +43,9 @@
 // let a: Bar;
 // let b: Bar<string>;
 // let c: Bar<string, number>;
-// let d: /*FIND ALL REFS*/[| Bar|].X;
-// let e:[| Bar|].X<string>;
-// let f:[| Bar|].X.Y;
+// let d: /*FIND ALL REFS*/[|Bar|].X;
+// let e: [|Bar|].X<string>;
+// let f: [|Bar|].X.Y;
 
 
 
@@ -56,9 +56,9 @@
 // let a: Bar;
 // let b: Bar<string>;
 // let c: Bar<string, number>;
-// let d:[| Bar|].X;
-// let e: /*FIND ALL REFS*/[| Bar|].X<string>;
-// let f:[| Bar|].X.Y;
+// let d: [|Bar|].X;
+// let e: /*FIND ALL REFS*/[|Bar|].X<string>;
+// let f: [|Bar|].X.Y;
 
 
 
@@ -69,9 +69,9 @@
 // let a: Bar;
 // let b: Bar<string>;
 // let c: Bar<string, number>;
-// let d:[| Bar|].X;
-// let e:[| Bar|].X<string>;
-// let f: /*FIND ALL REFS*/[| Bar|].X.Y;
+// let d: [|Bar|].X;
+// let e: [|Bar|].X<string>;
+// let f: /*FIND ALL REFS*/[|Bar|].X.Y;
 
 
 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnresolvedSymbols2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnresolvedSymbols2.baseline.jsonc
index e96b642ecd..4835af1a9a 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnresolvedSymbols2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnresolvedSymbols2.baseline.jsonc
@@ -1,14 +1,14 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols2.ts ===
 
-// import { /*FIND ALL REFS*/[| Bar|] } from "does-not-exist";
+// import { /*FIND ALL REFS*/[|Bar|] } from "does-not-exist";
 // 
-// let a:[| Bar|];
-// let b:[| Bar|]<string>;
-// let c:[| Bar|]<string, number>;
-// let d:[| Bar|].X;
-// let e:[| Bar|].X<string>;
-// let f:[| Bar|].X.Y;
+// let a: [|Bar|];
+// let b: [|Bar|]<string>;
+// let c: [|Bar|]<string, number>;
+// let d: [|Bar|].X;
+// let e: [|Bar|].X<string>;
+// let f: [|Bar|].X.Y;
 
 
 
@@ -16,14 +16,14 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols2.ts ===
 
-// import {[| Bar|] } from "does-not-exist";
+// import { [|Bar|] } from "does-not-exist";
 // 
-// let a: /*FIND ALL REFS*/[| Bar|];
-// let b:[| Bar|]<string>;
-// let c:[| Bar|]<string, number>;
-// let d:[| Bar|].X;
-// let e:[| Bar|].X<string>;
-// let f:[| Bar|].X.Y;
+// let a: /*FIND ALL REFS*/[|Bar|];
+// let b: [|Bar|]<string>;
+// let c: [|Bar|]<string, number>;
+// let d: [|Bar|].X;
+// let e: [|Bar|].X<string>;
+// let f: [|Bar|].X.Y;
 
 
 
@@ -31,14 +31,14 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols2.ts ===
 
-// import {[| Bar|] } from "does-not-exist";
+// import { [|Bar|] } from "does-not-exist";
 // 
-// let a:[| Bar|];
-// let b: /*FIND ALL REFS*/[| Bar|]<string>;
-// let c:[| Bar|]<string, number>;
-// let d:[| Bar|].X;
-// let e:[| Bar|].X<string>;
-// let f:[| Bar|].X.Y;
+// let a: [|Bar|];
+// let b: /*FIND ALL REFS*/[|Bar|]<string>;
+// let c: [|Bar|]<string, number>;
+// let d: [|Bar|].X;
+// let e: [|Bar|].X<string>;
+// let f: [|Bar|].X.Y;
 
 
 
@@ -46,14 +46,14 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols2.ts ===
 
-// import {[| Bar|] } from "does-not-exist";
+// import { [|Bar|] } from "does-not-exist";
 // 
-// let a:[| Bar|];
-// let b:[| Bar|]<string>;
-// let c: /*FIND ALL REFS*/[| Bar|]<string, number>;
-// let d:[| Bar|].X;
-// let e:[| Bar|].X<string>;
-// let f:[| Bar|].X.Y;
+// let a: [|Bar|];
+// let b: [|Bar|]<string>;
+// let c: /*FIND ALL REFS*/[|Bar|]<string, number>;
+// let d: [|Bar|].X;
+// let e: [|Bar|].X<string>;
+// let f: [|Bar|].X.Y;
 
 
 
@@ -61,14 +61,14 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols2.ts ===
 
-// import {[| Bar|] } from "does-not-exist";
+// import { [|Bar|] } from "does-not-exist";
 // 
-// let a:[| Bar|];
-// let b:[| Bar|]<string>;
-// let c:[| Bar|]<string, number>;
-// let d: /*FIND ALL REFS*/[| Bar|].X;
-// let e:[| Bar|].X<string>;
-// let f:[| Bar|].X.Y;
+// let a: [|Bar|];
+// let b: [|Bar|]<string>;
+// let c: [|Bar|]<string, number>;
+// let d: /*FIND ALL REFS*/[|Bar|].X;
+// let e: [|Bar|].X<string>;
+// let f: [|Bar|].X.Y;
 
 
 
@@ -76,14 +76,14 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols2.ts ===
 
-// import {[| Bar|] } from "does-not-exist";
+// import { [|Bar|] } from "does-not-exist";
 // 
-// let a:[| Bar|];
-// let b:[| Bar|]<string>;
-// let c:[| Bar|]<string, number>;
-// let d:[| Bar|].X;
-// let e: /*FIND ALL REFS*/[| Bar|].X<string>;
-// let f:[| Bar|].X.Y;
+// let a: [|Bar|];
+// let b: [|Bar|]<string>;
+// let c: [|Bar|]<string, number>;
+// let d: [|Bar|].X;
+// let e: /*FIND ALL REFS*/[|Bar|].X<string>;
+// let f: [|Bar|].X.Y;
 
 
 
@@ -91,14 +91,14 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols2.ts ===
 
-// import {[| Bar|] } from "does-not-exist";
+// import { [|Bar|] } from "does-not-exist";
 // 
-// let a:[| Bar|];
-// let b:[| Bar|]<string>;
-// let c:[| Bar|]<string, number>;
-// let d:[| Bar|].X;
-// let e:[| Bar|].X<string>;
-// let f: /*FIND ALL REFS*/[| Bar|].X.Y;
+// let a: [|Bar|];
+// let b: [|Bar|]<string>;
+// let c: [|Bar|]<string, number>;
+// let d: [|Bar|].X;
+// let e: [|Bar|].X<string>;
+// let f: /*FIND ALL REFS*/[|Bar|].X.Y;
 
 
 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnresolvedSymbols3.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnresolvedSymbols3.baseline.jsonc
index 8b880336ae..68a4f7d54e 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnresolvedSymbols3.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsUnresolvedSymbols3.baseline.jsonc
@@ -1,14 +1,14 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols3.ts ===
 
-// import * as /*FIND ALL REFS*/[| Bar|] from "does-not-exist";
+// import * as /*FIND ALL REFS*/[|Bar|] from "does-not-exist";
 // 
-// let a:[| Bar|];
-// let b:[| Bar|]<string>;
-// let c:[| Bar|]<string, number>;
-// let d:[| Bar|].X;
-// let e:[| Bar|].X<string>;
-// let f:[| Bar|].X.Y;
+// let a: [|Bar|];
+// let b: [|Bar|]<string>;
+// let c: [|Bar|]<string, number>;
+// let d: [|Bar|].X;
+// let e: [|Bar|].X<string>;
+// let f: [|Bar|].X.Y;
 
 
 
@@ -16,14 +16,14 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols3.ts ===
 
-// import * as[| Bar|] from "does-not-exist";
+// import * as [|Bar|] from "does-not-exist";
 // 
-// let a: /*FIND ALL REFS*/[| Bar|];
-// let b:[| Bar|]<string>;
-// let c:[| Bar|]<string, number>;
-// let d:[| Bar|].X;
-// let e:[| Bar|].X<string>;
-// let f:[| Bar|].X.Y;
+// let a: /*FIND ALL REFS*/[|Bar|];
+// let b: [|Bar|]<string>;
+// let c: [|Bar|]<string, number>;
+// let d: [|Bar|].X;
+// let e: [|Bar|].X<string>;
+// let f: [|Bar|].X.Y;
 
 
 
@@ -31,14 +31,14 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols3.ts ===
 
-// import * as[| Bar|] from "does-not-exist";
+// import * as [|Bar|] from "does-not-exist";
 // 
-// let a:[| Bar|];
-// let b: /*FIND ALL REFS*/[| Bar|]<string>;
-// let c:[| Bar|]<string, number>;
-// let d:[| Bar|].X;
-// let e:[| Bar|].X<string>;
-// let f:[| Bar|].X.Y;
+// let a: [|Bar|];
+// let b: /*FIND ALL REFS*/[|Bar|]<string>;
+// let c: [|Bar|]<string, number>;
+// let d: [|Bar|].X;
+// let e: [|Bar|].X<string>;
+// let f: [|Bar|].X.Y;
 
 
 
@@ -46,14 +46,14 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols3.ts ===
 
-// import * as[| Bar|] from "does-not-exist";
+// import * as [|Bar|] from "does-not-exist";
 // 
-// let a:[| Bar|];
-// let b:[| Bar|]<string>;
-// let c: /*FIND ALL REFS*/[| Bar|]<string, number>;
-// let d:[| Bar|].X;
-// let e:[| Bar|].X<string>;
-// let f:[| Bar|].X.Y;
+// let a: [|Bar|];
+// let b: [|Bar|]<string>;
+// let c: /*FIND ALL REFS*/[|Bar|]<string, number>;
+// let d: [|Bar|].X;
+// let e: [|Bar|].X<string>;
+// let f: [|Bar|].X.Y;
 
 
 
@@ -61,14 +61,14 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols3.ts ===
 
-// import * as[| Bar|] from "does-not-exist";
+// import * as [|Bar|] from "does-not-exist";
 // 
-// let a:[| Bar|];
-// let b:[| Bar|]<string>;
-// let c:[| Bar|]<string, number>;
-// let d: /*FIND ALL REFS*/[| Bar|].X;
-// let e:[| Bar|].X<string>;
-// let f:[| Bar|].X.Y;
+// let a: [|Bar|];
+// let b: [|Bar|]<string>;
+// let c: [|Bar|]<string, number>;
+// let d: /*FIND ALL REFS*/[|Bar|].X;
+// let e: [|Bar|].X<string>;
+// let f: [|Bar|].X.Y;
 
 
 
@@ -76,14 +76,14 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols3.ts ===
 
-// import * as[| Bar|] from "does-not-exist";
+// import * as [|Bar|] from "does-not-exist";
 // 
-// let a:[| Bar|];
-// let b:[| Bar|]<string>;
-// let c:[| Bar|]<string, number>;
-// let d:[| Bar|].X;
-// let e: /*FIND ALL REFS*/[| Bar|].X<string>;
-// let f:[| Bar|].X.Y;
+// let a: [|Bar|];
+// let b: [|Bar|]<string>;
+// let c: [|Bar|]<string, number>;
+// let d: [|Bar|].X;
+// let e: /*FIND ALL REFS*/[|Bar|].X<string>;
+// let f: [|Bar|].X.Y;
 
 
 
@@ -91,14 +91,14 @@
 // === findAllReferences ===
 // === /findAllRefsUnresolvedSymbols3.ts ===
 
-// import * as[| Bar|] from "does-not-exist";
+// import * as [|Bar|] from "does-not-exist";
 // 
-// let a:[| Bar|];
-// let b:[| Bar|]<string>;
-// let c:[| Bar|]<string, number>;
-// let d:[| Bar|].X;
-// let e:[| Bar|].X<string>;
-// let f: /*FIND ALL REFS*/[| Bar|].X.Y;
+// let a: [|Bar|];
+// let b: [|Bar|]<string>;
+// let c: [|Bar|]<string, number>;
+// let d: [|Bar|].X;
+// let e: [|Bar|].X<string>;
+// let f: /*FIND ALL REFS*/[|Bar|].X.Y;
 
 
 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames1.baseline.jsonc
index 9f6a1c1d3b..a03a11574a 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames1.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames1.baseline.jsonc
@@ -7,7 +7,7 @@
 // === /findAllRefsWithLeadingUnderscoreNames1.ts ===
 
 // class Foo {
-//     public /*FIND ALL REFS*/[| _bar|]() { return 0; }
+//     public /*FIND ALL REFS*/[|_bar|]() { return 0; }
 // }
 // 
 // var x: Foo;
@@ -20,7 +20,7 @@
 // === /findAllRefsWithLeadingUnderscoreNames1.ts ===
 
 // class Foo {
-//     public[| _bar|]() { return 0; }
+//     public [|_bar|]() { return 0; }
 // }
 // 
 // var x: Foo;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames2.baseline.jsonc
index 66d1596dc7..22e55a419f 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames2.baseline.jsonc
@@ -7,7 +7,7 @@
 // === /findAllRefsWithLeadingUnderscoreNames2.ts ===
 
 // class Foo {
-//     public /*FIND ALL REFS*/[| __bar|]() { return 0; }
+//     public /*FIND ALL REFS*/[|__bar|]() { return 0; }
 // }
 // 
 // var x: Foo;
@@ -20,7 +20,7 @@
 // === /findAllRefsWithLeadingUnderscoreNames2.ts ===
 
 // class Foo {
-//     public[| __bar|]() { return 0; }
+//     public [|__bar|]() { return 0; }
 // }
 // 
 // var x: Foo;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames3.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames3.baseline.jsonc
index 701021dc17..9b927de2cb 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames3.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames3.baseline.jsonc
@@ -7,7 +7,7 @@
 // === /findAllRefsWithLeadingUnderscoreNames3.ts ===
 
 // class Foo {
-//     public /*FIND ALL REFS*/[| ___bar|]() { return 0; }
+//     public /*FIND ALL REFS*/[|___bar|]() { return 0; }
 // }
 // 
 // var x: Foo;
@@ -20,7 +20,7 @@
 // === /findAllRefsWithLeadingUnderscoreNames3.ts ===
 
 // class Foo {
-//     public[| ___bar|]() { return 0; }
+//     public [|___bar|]() { return 0; }
 // }
 // 
 // var x: Foo;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames4.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames4.baseline.jsonc
index 550f992c2e..596c76ecbc 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames4.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames4.baseline.jsonc
@@ -7,7 +7,7 @@
 // === /findAllRefsWithLeadingUnderscoreNames4.ts ===
 
 // class Foo {
-//     public /*FIND ALL REFS*/[| ____bar|]() { return 0; }
+//     public /*FIND ALL REFS*/[|____bar|]() { return 0; }
 // }
 // 
 // var x: Foo;
@@ -20,7 +20,7 @@
 // === /findAllRefsWithLeadingUnderscoreNames4.ts ===
 
 // class Foo {
-//     public[| ____bar|]() { return 0; }
+//     public [|____bar|]() { return 0; }
 // }
 // 
 // var x: Foo;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames5.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames5.baseline.jsonc
index c4fcea8d1b..c14cc759c9 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames5.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames5.baseline.jsonc
@@ -9,7 +9,7 @@
 // class Foo {
 //     public _bar;
 //     public __bar;
-//     public /*FIND ALL REFS*/[| ___bar|];
+//     public /*FIND ALL REFS*/[|___bar|];
 //     public ____bar;
 // }
 // 
@@ -28,7 +28,7 @@
 // class Foo {
 //     public _bar;
 //     public __bar;
-//     public[| ___bar|];
+//     public [|___bar|];
 //     public ____bar;
 // }
 // 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames6.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames6.baseline.jsonc
index ff399f4b6d..ef113d8cad 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames6.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames6.baseline.jsonc
@@ -8,7 +8,7 @@
 
 // class Foo {
 //     public _bar;
-//     public /*FIND ALL REFS*/[| __bar|];
+//     public /*FIND ALL REFS*/[|__bar|];
 //     public ___bar;
 //     public ____bar;
 // }
@@ -27,7 +27,7 @@
 
 // class Foo {
 //     public _bar;
-//     public[| __bar|];
+//     public [|__bar|];
 //     public ___bar;
 //     public ____bar;
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames7.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames7.baseline.jsonc
index 2095da2415..3974e9acce 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames7.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames7.baseline.jsonc
@@ -6,8 +6,8 @@
 // === findAllReferences ===
 // === /findAllRefsWithLeadingUnderscoreNames7.ts ===
 
-// function /*FIND ALL REFS*/[| __foo|]() {[|
-//     __foo|]();
+// function /*FIND ALL REFS*/[|__foo|]() {
+//     [|__foo|]();
 // }
 
 
@@ -16,6 +16,6 @@
 // === findAllReferences ===
 // === /findAllRefsWithLeadingUnderscoreNames7.ts ===
 
-// function[| __foo|]() {[|
-//     /*FIND ALL REFS*/__foo|]();
+// function [|__foo|]() {
+//     /*FIND ALL REFS*/[|__foo|]();
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames8.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames8.baseline.jsonc
index 67c7f54750..e081e745e1 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames8.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames8.baseline.jsonc
@@ -6,8 +6,8 @@
 // === findAllReferences ===
 // === /findAllRefsWithLeadingUnderscoreNames8.ts ===
 
-// (function /*FIND ALL REFS*/__foo() {[|
-//     __foo|]();
+// (function /*FIND ALL REFS*/__foo() {
+//     [|__foo|]();
 // })
 
 
@@ -16,6 +16,6 @@
 // === findAllReferences ===
 // === /findAllRefsWithLeadingUnderscoreNames8.ts ===
 
-// (function __foo() {[|
-//     /*FIND ALL REFS*/__foo|]();
+// (function __foo() {
+//     /*FIND ALL REFS*/[|__foo|]();
 // })
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames9.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames9.baseline.jsonc
index a243689a69..a577c1b973 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames9.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithLeadingUnderscoreNames9.baseline.jsonc
@@ -6,8 +6,8 @@
 // === findAllReferences ===
 // === /findAllRefsWithLeadingUnderscoreNames9.ts ===
 
-// (function /*FIND ALL REFS*/___foo() {[|
-//     ___foo|]();
+// (function /*FIND ALL REFS*/___foo() {
+//     [|___foo|]();
 // })
 
 
@@ -16,6 +16,6 @@
 // === findAllReferences ===
 // === /findAllRefsWithLeadingUnderscoreNames9.ts ===
 
-// (function ___foo() {[|
-//     /*FIND ALL REFS*/___foo|]();
+// (function ___foo() {
+//     /*FIND ALL REFS*/[|___foo|]();
 // })
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithShorthandPropertyAssignment.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithShorthandPropertyAssignment.baseline.jsonc
index 3ee61fda6e..a280474c32 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithShorthandPropertyAssignment.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithShorthandPropertyAssignment.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllRefsWithShorthandPropertyAssignment.ts ===
 
-//  var /*FIND ALL REFS*/[| name|] = "Foo";
+//  var /*FIND ALL REFS*/[|name|] = "Foo";
 // 
 //  var obj = { name };
 //  var obj1 = { name: name };
@@ -15,8 +15,8 @@
 
 //  var name = "Foo";
 // 
-//  var obj = {[| name|] };
-//  var obj1 = { name: /*FIND ALL REFS*/[| name|] };
+//  var obj = { [|name|] };
+//  var obj1 = { name: /*FIND ALL REFS*/[|name|] };
 //  obj.name;
 
 
@@ -27,7 +27,7 @@
 
 //  var name = "Foo";
 // 
-//  var obj = { /*FIND ALL REFS*/[| name|] };
+//  var obj = { /*FIND ALL REFS*/[|name|] };
 //  var obj1 = { name: name };
 //  obj.[|name|];
 
@@ -40,7 +40,7 @@
 //  var name = "Foo";
 // 
 //  var obj = { name };
-//  var obj1 = { /*FIND ALL REFS*/[| name|]: name };
+//  var obj1 = { /*FIND ALL REFS*/[|name|]: name };
 //  obj.name;
 
 
@@ -51,6 +51,6 @@
 
 //  var name = "Foo";
 // 
-//  var obj = {[| name|] };
+//  var obj = { [|name|] };
 //  var obj1 = { name: name };
 //  obj./*FIND ALL REFS*/[|name|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithShorthandPropertyAssignment2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithShorthandPropertyAssignment2.baseline.jsonc
index f724e0175f..73ad2e0b11 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithShorthandPropertyAssignment2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWithShorthandPropertyAssignment2.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /findAllRefsWithShorthandPropertyAssignment2.ts ===
 
-//  var /*FIND ALL REFS*/[| dx|] = "Foo";
+//  var /*FIND ALL REFS*/[|dx|] = "Foo";
 // 
 //  module M { export var dx; }
 //  module M {
@@ -15,10 +15,10 @@
 
 //  var dx = "Foo";
 // 
-//  module M { export var /*FIND ALL REFS*/[| dx|]; }
+//  module M { export var /*FIND ALL REFS*/[|dx|]; }
 //  module M {
 //     var z = 100;
-//     export var y = {[| dx|], z };
+//     export var y = { [|dx|], z };
 //  }
 //  M.y.dx;
 
@@ -33,7 +33,7 @@
 //  module M { export var dx; }
 //  module M {
 //     var z = 100;
-//     export var y = { /*FIND ALL REFS*/[| dx|], z };
+//     export var y = { /*FIND ALL REFS*/[|dx|], z };
 //  }
 //  M.y.[|dx|];
 
@@ -48,6 +48,6 @@
 //  module M { export var dx; }
 //  module M {
 //     var z = 100;
-//     export var y = {[| dx|], z };
+//     export var y = { [|dx|], z };
 //  }
 //  M.y./*FIND ALL REFS*/[|dx|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWriteAccess.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWriteAccess.baseline.jsonc
index 1fb06ce607..8254d6314d 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWriteAccess.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefsWriteAccess.baseline.jsonc
@@ -2,7 +2,7 @@
 // === /findAllRefsWriteAccess.ts ===
 
 // interface Obj {
-//     [`/*FIND ALL REFS*/[|`num`|]]: number;
+//     [`/*FIND ALL REFS*/[|num|]`]: number;
 // }
 // 
 // let o: Obj = {
@@ -13,8 +13,8 @@
 //     ['num']: 1
 // };
 // 
-// o[[|'num'|]] = 2;
-// o[[|`num`|]] = 3;
+// o['[|num|]'] = 2;
+// o[`[|num|]`] = 3;
 // 
-// o[[|'num'|]];
-// o[[|`num`|]];
+// o['[|num|]'];
+// o[`[|num|]`];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefs_importType_meaningAtLocation.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefs_importType_meaningAtLocation.baseline.jsonc
index 17e19341d7..29e5843745 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefs_importType_meaningAtLocation.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefs_importType_meaningAtLocation.baseline.jsonc
@@ -6,7 +6,7 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// export type /*FIND ALL REFS*/[| T|] = 0;
+// export type /*FIND ALL REFS*/[|T|] = 0;
 // export const T = 0;
 
 
@@ -21,7 +21,7 @@
 // === /a.ts ===
 
 // export type T = 0;
-// export const /*FIND ALL REFS*/[| T|] = 0;
+// export const /*FIND ALL REFS*/[|T|] = 0;
 
 
 
@@ -29,7 +29,7 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// export type[| T|] = 0;
+// export type [|T|] = 0;
 // export const T = 0;
 
 
@@ -39,4 +39,4 @@
 // === /a.ts ===
 
 // export type T = 0;
-// export const[| T|] = 0;
+// export const [|T|] = 0;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefs_importType_named.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefs_importType_named.baseline.jsonc
index b8d3e9f825..fe6034d766 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefs_importType_named.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefs_importType_named.baseline.jsonc
@@ -6,7 +6,7 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// export type /*FIND ALL REFS*/[| T|] = number;
+// export type /*FIND ALL REFS*/[|T|] = number;
 // export type U = string;
 
 
@@ -21,7 +21,7 @@
 // === /a.ts ===
 
 // export type T = number;
-// export type /*FIND ALL REFS*/[| U|] = string;
+// export type /*FIND ALL REFS*/[|U|] = string;
 
 
 
@@ -29,7 +29,7 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// export type[| T|] = number;
+// export type [|T|] = number;
 // export type U = string;
 
 
@@ -39,4 +39,4 @@
 // === /a.ts ===
 
 // export type T = number;
-// export type[| U|] = string;
+// export type [|U|] = string;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefs_jsEnum.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefs_jsEnum.baseline.jsonc
index 3b70aa90f3..49ccd3768e 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindAllRefs_jsEnum.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindAllRefs_jsEnum.baseline.jsonc
@@ -7,10 +7,10 @@
 // === /a.js ===
 
 // /** @enum {string} */
-// const /*FIND ALL REFS*/[| E|] = { A: "" };[|
-// E|]["A"];
+// const /*FIND ALL REFS*/[|E|] = { A: "" };
+// [|E|]["A"];
 // /** @type {E} */
-// const e =[| E|].A;
+// const e = [|E|].A;
 
 
 
@@ -19,10 +19,10 @@
 // === /a.js ===
 
 // /** @enum {string} */
-// const[| E|] = { A: "" };[|
-// /*FIND ALL REFS*/E|]["A"];
+// const [|E|] = { A: "" };
+// /*FIND ALL REFS*/[|E|]["A"];
 // /** @type {E} */
-// const e =[| E|].A;
+// const e = [|E|].A;
 
 
 
@@ -36,7 +36,7 @@
 // === /a.js ===
 
 // /** @enum {string} */
-// const[| E|] = { A: "" };[|
-// E|]["A"];
+// const [|E|] = { A: "" };
+// [|E|]["A"];
 // /** @type {E} */
-// const e = /*FIND ALL REFS*/[| E|].A;
+// const e = /*FIND ALL REFS*/[|E|].A;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesAcrossMultipleProjects.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesAcrossMultipleProjects.baseline.jsonc
index 26566f4605..ab3aee87cc 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesAcrossMultipleProjects.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesAcrossMultipleProjects.baseline.jsonc
@@ -6,7 +6,7 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// var /*FIND ALL REFS*/[| x|]: number;
+// var /*FIND ALL REFS*/[|x|]: number;
 
 
 
@@ -14,13 +14,13 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// var[| x|]: number;
+// var [|x|]: number;
 
 
 // === /b.ts ===
 
-// [|/// <reference path="a.ts" />
-// /*FIND ALL REFS*/x|]++;
+// /// <reference path="a.ts" />
+// /*FIND ALL REFS*/[|x|]++;
 
 
 
@@ -28,16 +28,16 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// var[| x|]: number;
+// var [|x|]: number;
 
 
 // === /b.ts ===
 
-// [|/// <reference path="a.ts" />
-// x|]++;
+// /// <reference path="a.ts" />
+// [|x|]++;
 
 
 // === /c.ts ===
 
-// [|/// <reference path="a.ts" />
-// /*FIND ALL REFS*/x|]++;
+// /// <reference path="a.ts" />
+// /*FIND ALL REFS*/[|x|]++;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesBindingPatternInJsdocNoCrash1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesBindingPatternInJsdocNoCrash1.baseline.jsonc
index 33160e5645..e7bcffaea2 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesBindingPatternInJsdocNoCrash1.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesBindingPatternInJsdocNoCrash1.baseline.jsonc
@@ -2,4 +2,4 @@
 // === /src/index.ts ===
 
 // import { useQuery } from "use-query";
-// const { /*FIND ALL REFS*/[| data|] } = useQuery();
+// const { /*FIND ALL REFS*/[|data|] } = useQuery();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesBindingPatternInJsdocNoCrash2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesBindingPatternInJsdocNoCrash2.baseline.jsonc
index 33160e5645..e7bcffaea2 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesBindingPatternInJsdocNoCrash2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesBindingPatternInJsdocNoCrash2.baseline.jsonc
@@ -2,4 +2,4 @@
 // === /src/index.ts ===
 
 // import { useQuery } from "use-query";
-// const { /*FIND ALL REFS*/[| data|] } = useQuery();
+// const { /*FIND ALL REFS*/[|data|] } = useQuery();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesDefinitionDisplayParts.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesDefinitionDisplayParts.baseline.jsonc
index 31394e7c02..0a4dc16ff7 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*/[|Greeter|] {
 //     someFunction() { this;  }
 // }
 // 
@@ -14,7 +14,7 @@
 // === /findReferencesDefinitionDisplayParts.ts ===
 
 // class Greeter {
-//     someFunction() { th/*FIND ALL REFS*/[| this|];  }
+//     someFunction() { th/*FIND ALL REFS*/[|this|];  }
 // }
 // 
 // type Options = "option 1" | "option 2";
@@ -31,12 +31,9 @@
 // === findAllReferences ===
 // === /findReferencesDefinitionDisplayParts.ts ===
 
-// class Greeter {
-//     someFunction() { this;  }
-// }
-// 
+// --- (line: 4) skipped ---
 // type Options = "option 1" | "option 2";
-// let myOption: Options = "option 1";[|
+// let myOption: Options = "option 1";
 // 
-// some/*FIND ALL REFS*/Label|]:
-// break[| someLabel|];
+// some/*FIND ALL REFS*/[|someLabel|]:
+// break [|someLabel|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesJSXTagName.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesJSXTagName.baseline.jsonc
index 6ddc7cac58..77eb67746d 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesJSXTagName.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesJSXTagName.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /index.tsx ===
 
-// import { /*FIND ALL REFS*/[| SubmissionComp|] } from "./RedditSubmission"
+// import { /*FIND ALL REFS*/[|SubmissionComp|] } from "./RedditSubmission"
 // function displaySubreddit(subreddit: string) {
 //     let components = submissions
 //         .map((value, index) => <[|SubmissionComp|] key={ index } elementPosition= { index } {...value.data} />);
@@ -13,5 +13,5 @@
 // === findAllReferences ===
 // === /RedditSubmission.ts ===
 
-// export const /*FIND ALL REFS*/[| SubmissionComp|] = (submission: SubmissionProps) =>
+// export const /*FIND ALL REFS*/[|SubmissionComp|] = (submission: SubmissionProps) =>
 //     <div style={{ fontFamily: "sans-serif" }}></div>;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesJSXTagName2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesJSXTagName2.baseline.jsonc
index f0599f3d0a..ba82e57b50 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesJSXTagName2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesJSXTagName2.baseline.jsonc
@@ -6,7 +6,7 @@
 // === findAllReferences ===
 // === /index.tsx ===
 
-// const /*FIND ALL REFS*/[| obj|] = {Component: () => <div/>};
+// const /*FIND ALL REFS*/[|obj|] = {Component: () => <div/>};
 // const element = <[|obj|].Component/>;
 
 
@@ -15,5 +15,5 @@
 // === findAllReferences ===
 // === /index.tsx ===
 
-// const[| obj|] = {Component: () => <div/>};
+// const [|obj|] = {Component: () => <div/>};
 // const element = </*FIND ALL REFS*/[|obj|].Component/>;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/FindReferencesSeeTagInTs.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/FindReferencesSeeTagInTs.baseline.jsonc
index cf4c6eae38..6659580478 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*/[|doStuffWithStuff|](stuff: { quantity: number }) {}
 // 
 // declare const stuff: { quantity: number };
 // /** @see {doStuffWithStuff} */
diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfArrowFunction.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfArrowFunction.baseline.jsonc
index 50992749cf..b50a0bf5f7 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfArrowFunction.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfArrowFunction.baseline.jsonc
@@ -6,8 +6,8 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfArrowFunction.ts ===
 
-// var /*FIND ALL REFS*/[| f|] = x => x + 1;[|
-// f|](12);
+// var /*FIND ALL REFS*/[|f|] = x => x + 1;
+// [|f|](12);
 
 
 
@@ -15,5 +15,5 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfArrowFunction.ts ===
 
-// var[| f|] = x => x + 1;[|
-// /*FIND ALL REFS*/f|](12);
+// var [|f|] = x => x + 1;
+// /*FIND ALL REFS*/[|f|](12);
diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfBindingPattern.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfBindingPattern.baseline.jsonc
index 8c3e1b7643..25461975f6 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfBindingPattern.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfBindingPattern.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfBindingPattern.ts ===
 
-// const { /*FIND ALL REFS*/[| x|], y } = {[| x|]: 1, y: 2 };
-// const z =[| x|];
+// const { /*FIND ALL REFS*/[|x|], y } = { [|x|]: 1, y: 2 };
+// const z = [|x|];
 
 
 
@@ -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|], y } = { [|x|]: 1, y: 2 };
 // const z = x;
 
 
@@ -19,5 +19,5 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfBindingPattern.ts ===
 
-// const {[| x|], y } = { x: 1, y: 2 };
-// const z = /*FIND ALL REFS*/[| x|];
+// const { [|x|], y } = { x: 1, y: 2 };
+// const z = /*FIND ALL REFS*/[|x|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfClass.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfClass.baseline.jsonc
index ae9ace7817..f10d7bd558 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfClass.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfClass.baseline.jsonc
@@ -6,13 +6,13 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfClass.ts ===
 
-// class /*FIND ALL REFS*/[| C|] {
+// class /*FIND ALL REFS*/[|C|] {
 //     n: number;
 //     constructor() {
 //         this.n = 12;
 //     }
 // }
-// let c = new[| C|]();
+// let c = new [|C|]();
 
 
 
@@ -20,10 +20,10 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfClass.ts ===
 
-// class[| C|] {
+// class [|C|] {
 //     n: number;
 //     constructor() {
 //         this.n = 12;
 //     }
 // }
-// let c = new /*FIND ALL REFS*/[| C|]();
+// let c = new /*FIND ALL REFS*/[|C|]();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfComputedProperty.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfComputedProperty.baseline.jsonc
index f9df2bdf10..f9fc036526 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfComputedProperty.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfComputedProperty.baseline.jsonc
@@ -6,9 +6,9 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfComputedProperty.ts ===
 
-// let o = { ["/*FIND ALL REFS*/[|"foo"|]]: 12 };
+// let o = { ["/*FIND ALL REFS*/[|foo|]"]: 12 };
 // let y = o.[|foo|];
-// let z = o[[|'foo'|]];
+// let z = o['[|foo|]'];
 
 
 
@@ -16,9 +16,9 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfComputedProperty.ts ===
 
-// let o = { [[|"foo"|]]: 12 };
+// let o = { ["[|foo|]"]: 12 };
 // let y = o./*FIND ALL REFS*/[|foo|];
-// let z = o[[|'foo'|]];
+// let z = o['[|foo|]'];
 
 
 
@@ -26,6 +26,6 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfComputedProperty.ts ===
 
-// let o = { [[|"foo"|]]: 12 };
+// let o = { ["[|foo|]"]: 12 };
 // let y = o.[|foo|];
-// let z = o['/*FIND ALL REFS*/[|'foo'|]];
+// let z = o['/*FIND ALL REFS*/[|foo|]'];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfEnum.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfEnum.baseline.jsonc
index dfb5291278..fed014710b 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfEnum.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfEnum.baseline.jsonc
@@ -6,11 +6,11 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfEnum.ts ===
 
-// enum /*FIND ALL REFS*/[| E|] {
+// enum /*FIND ALL REFS*/[|E|] {
 //     First,
 //     Second
 // }
-// let first =[| E|].First;
+// let first = [|E|].First;
 
 
 
@@ -18,8 +18,8 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfEnum.ts ===
 
-// enum[| E|] {
+// enum [|E|] {
 //     First,
 //     Second
 // }
-// let first = /*FIND ALL REFS*/[| E|].First;
+// let first = /*FIND ALL REFS*/[|E|].First;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfExport.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfExport.baseline.jsonc
index 871e506774..c7a261c082 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfExport.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfExport.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /m.ts ===
 
-// export var /*FIND ALL REFS*/[| x|] = 12;
+// export var /*FIND ALL REFS*/[|x|] = 12;
 
 
 
@@ -9,5 +9,5 @@
 // === findAllReferences ===
 // === /main.ts ===
 
-// import { /*FIND ALL REFS*/[| x|] } from "./m";
-// const y =[| x|];
+// import { /*FIND ALL REFS*/[|x|] } from "./m";
+// const y = [|x|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfFunction.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfFunction.baseline.jsonc
index fda7246da9..f68e797752 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfFunction.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfFunction.baseline.jsonc
@@ -6,9 +6,9 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfFunction.ts ===
 
-// function /*FIND ALL REFS*/[| func|](x: number) {
-// }[|
-// func|](x)
+// function /*FIND ALL REFS*/[|func|](x: number) {
+// }
+// [|func|](x)
 
 
 
@@ -16,6 +16,6 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfFunction.ts ===
 
-// function[| func|](x: number) {
-// }[|
-// /*FIND ALL REFS*/func|](x)
+// function [|func|](x: number) {
+// }
+// /*FIND ALL REFS*/[|func|](x)
diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfInterface.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfInterface.baseline.jsonc
index 2bf3199047..a69f9f7b4b 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfInterface.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfInterface.baseline.jsonc
@@ -6,10 +6,10 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfInterface.ts ===
 
-// interface /*FIND ALL REFS*/[| I|] {
+// interface /*FIND ALL REFS*/[|I|] {
 //     p: number;
 // }
-// let i:[| I|] = { p: 12 };
+// let i: [|I|] = { p: 12 };
 
 
 
@@ -17,7 +17,7 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfInterface.ts ===
 
-// interface[| I|] {
+// interface [|I|] {
 //     p: number;
 // }
-// let i: /*FIND ALL REFS*/[| I|] = { p: 12 };
+// let i: /*FIND ALL REFS*/[|I|] = { p: 12 };
diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfInterfaceClassMerge.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfInterfaceClassMerge.baseline.jsonc
index 5defdee331..a5741652e6 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfInterfaceClassMerge.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfInterfaceClassMerge.baseline.jsonc
@@ -6,18 +6,18 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfInterfaceClassMerge.ts ===
 
-// interface /*FIND ALL REFS*/[| Numbers|] {
+// interface /*FIND ALL REFS*/[|Numbers|] {
 //     p: number;
 // }
-// interface[| Numbers|] {
+// interface [|Numbers|] {
 //     m: number;
 // }
-// class[| Numbers|] {
+// class [|Numbers|] {
 //     f(n: number) {
 //         return this.p + this.m + n;
 //     }
 // }
-// let i:[| Numbers|] = new[| Numbers|]();
+// let i: [|Numbers|] = new [|Numbers|]();
 // let x = i.f(i.p + i.m);
 
 
@@ -31,18 +31,18 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfInterfaceClassMerge.ts ===
 
-// interface[| Numbers|] {
+// interface [|Numbers|] {
 //     p: number;
 // }
-// interface /*FIND ALL REFS*/[| Numbers|] {
+// interface /*FIND ALL REFS*/[|Numbers|] {
 //     m: number;
 // }
-// class[| Numbers|] {
+// class [|Numbers|] {
 //     f(n: number) {
 //         return this.p + this.m + n;
 //     }
 // }
-// let i:[| Numbers|] = new[| Numbers|]();
+// let i: [|Numbers|] = new [|Numbers|]();
 // let x = i.f(i.p + i.m);
 
 
@@ -56,18 +56,18 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfInterfaceClassMerge.ts ===
 
-// interface[| Numbers|] {
+// interface [|Numbers|] {
 //     p: number;
 // }
-// interface[| Numbers|] {
+// interface [|Numbers|] {
 //     m: number;
 // }
-// class /*FIND ALL REFS*/[| Numbers|] {
+// class /*FIND ALL REFS*/[|Numbers|] {
 //     f(n: number) {
 //         return this.p + this.m + n;
 //     }
 // }
-// let i:[| Numbers|] = new[| Numbers|]();
+// let i: [|Numbers|] = new [|Numbers|]();
 // let x = i.f(i.p + i.m);
 
 
@@ -76,18 +76,18 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfInterfaceClassMerge.ts ===
 
-// interface[| Numbers|] {
+// interface [|Numbers|] {
 //     p: number;
 // }
-// interface[| Numbers|] {
+// interface [|Numbers|] {
 //     m: number;
 // }
-// class[| Numbers|] {
+// class [|Numbers|] {
 //     f(n: number) {
 //         return this.p + this.m + n;
 //     }
 // }
-// let i: /*FIND ALL REFS*/[| Numbers|] = new[| Numbers|]();
+// let i: /*FIND ALL REFS*/[|Numbers|] = new [|Numbers|]();
 // let x = i.f(i.p + i.m);
 
 
@@ -96,16 +96,16 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfInterfaceClassMerge.ts ===
 
-// interface[| Numbers|] {
+// interface [|Numbers|] {
 //     p: number;
 // }
-// interface[| Numbers|] {
+// interface [|Numbers|] {
 //     m: number;
 // }
-// class[| Numbers|] {
+// class [|Numbers|] {
 //     f(n: number) {
 //         return this.p + this.m + n;
 //     }
 // }
-// let i: Numbers = new /*FIND ALL REFS*/[| Numbers|] = new[| Numbers|]();
+// let i: Numbers = new /*FIND ALL REFS*/[|Numbers|] = new [|Numbers|]();
 // let x = i.f(i.p + i.m);
diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfNamespace.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfNamespace.baseline.jsonc
index d9485d18ec..17f4ef3e1d 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfNamespace.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfNamespace.baseline.jsonc
@@ -6,10 +6,10 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfNamespace.ts ===
 
-// namespace /*FIND ALL REFS*/[| Numbers|] {
+// namespace /*FIND ALL REFS*/[|Numbers|] {
 //     export var n = 12;
 // }
-// let x =[| Numbers|].n + 1;
+// let x = [|Numbers|].n + 1;
 
 
 
@@ -17,7 +17,7 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfNamespace.ts ===
 
-// namespace[| Numbers|] {
+// namespace [|Numbers|] {
 //     export var n = 12;
 // }
-// let x = /*FIND ALL REFS*/[| Numbers|].n + 1;
+// let x = /*FIND ALL REFS*/[|Numbers|].n + 1;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfNumberNamedProperty.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfNumberNamedProperty.baseline.jsonc
index f376a0f7fb..a0531f2db8 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfNumberNamedProperty.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfNumberNamedProperty.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfNumberNamedProperty.ts ===
 
-// let o = { /*FIND ALL REFS*/[| 1|]: 12 };
+// let o = { /*FIND ALL REFS*/[|1|]: 12 };
 // let y = o[[|1|]];
 
 
@@ -10,5 +10,5 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfNumberNamedProperty.ts ===
 
-// let o = {[| 1|]: 12 };
+// let o = { [|1|]: 12 };
 // let y = o[/*FIND ALL REFS*/[|1|]];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfParameter.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfParameter.baseline.jsonc
index ddc8cd40d1..151e123cc8 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfParameter.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfParameter.baseline.jsonc
@@ -2,7 +2,7 @@
 // === /getOccurrencesIsDefinitionOfParameter.ts ===
 
 // function f(/*FIND ALL REFS*/[|x|]: number) {
-//   return[| x|] + 1
+//   return [|x|] + 1
 // }
 
 
@@ -12,5 +12,5 @@
 // === /getOccurrencesIsDefinitionOfParameter.ts ===
 
 // function f([|x|]: number) {
-//   return /*FIND ALL REFS*/[| x|] + 1
+//   return /*FIND ALL REFS*/[|x|] + 1
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfStringNamedProperty.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfStringNamedProperty.baseline.jsonc
index b2007932ed..3cfbe8fd34 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfStringNamedProperty.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfStringNamedProperty.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfStringNamedProperty.ts ===
 
-// let o = { /*FIND ALL REFS*/[| "x"|]: 12 };
+// let o = { /*FIND ALL REFS*/"[|x|]": 12 };
 // let y = o.[|x|];
 
 
@@ -10,7 +10,7 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfStringNamedProperty.ts ===
 
-// let o = { "/*FIND ALL REFS*/[| "x"|]: 12 };
+// let o = { "/*FIND ALL REFS*/[|x|]": 12 };
 // let y = o.[|x|];
 
 
@@ -19,5 +19,5 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfStringNamedProperty.ts ===
 
-// let o = {[| "x"|]: 12 };
+// let o = { "[|x|]": 12 };
 // let y = o./*FIND ALL REFS*/[|x|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfTypeAlias.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfTypeAlias.baseline.jsonc
index 6a82a728f4..50463084b2 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfTypeAlias.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfTypeAlias.baseline.jsonc
@@ -6,8 +6,8 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfTypeAlias.ts ===
 
-// type /*FIND ALL REFS*/[| Alias|]= number;
-// let n:[| Alias|] = 12;
+// type /*FIND ALL REFS*/[|Alias|]= number;
+// let n: [|Alias|] = 12;
 
 
 
@@ -15,5 +15,5 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfTypeAlias.ts ===
 
-// type[| Alias|]= number;
-// let n: /*FIND ALL REFS*/[| Alias|] = 12;
+// type [|Alias|]= number;
+// let n: /*FIND ALL REFS*/[|Alias|] = 12;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfVariable.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfVariable.baseline.jsonc
index 6f19a9cf5a..d7252492f5 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfVariable.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/GetOccurrencesIsDefinitionOfVariable.baseline.jsonc
@@ -6,23 +6,23 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfVariable.ts ===
 
-// var /*FIND ALL REFS*/[| x|] = 0;
-// var assignmentRightHandSide =[| x|];
-// var assignmentRightHandSide2 = 1 +[| x|];[|
+// var /*FIND ALL REFS*/[|x|] = 0;
+// var assignmentRightHandSide = [|x|];
+// var assignmentRightHandSide2 = 1 + [|x|];
 // 
-// x|] = 1;[|
-// x|] =[| x|] +[| x|];[|
+// [|x|] = 1;
+// [|x|] = [|x|] + [|x|];
 // 
-// x|] == 1;[|
-// x|] <= 1;
+// [|x|] == 1;
+// [|x|] <= 1;
 // 
 // var preIncrement = ++[|x|];
-// var postIncrement =[| x|]++;
+// var postIncrement = [|x|]++;
 // var preDecrement = --[|x|];
-// var postDecrement =[| x|]--;[|
+// var postDecrement = [|x|]--;
 // 
-// x|] += 1;[|
-// x|] <<= 1;
+// [|x|] += 1;
+// [|x|] <<= 1;
 
 
 
@@ -30,23 +30,23 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfVariable.ts ===
 
-// var[| x|] = 0;
-// var assignmentRightHandSide = /*FIND ALL REFS*/[| x|];
-// var assignmentRightHandSide2 = 1 +[| x|];[|
+// var [|x|] = 0;
+// var assignmentRightHandSide = /*FIND ALL REFS*/[|x|];
+// var assignmentRightHandSide2 = 1 + [|x|];
 // 
-// x|] = 1;[|
-// x|] =[| x|] +[| x|];[|
+// [|x|] = 1;
+// [|x|] = [|x|] + [|x|];
 // 
-// x|] == 1;[|
-// x|] <= 1;
+// [|x|] == 1;
+// [|x|] <= 1;
 // 
 // var preIncrement = ++[|x|];
-// var postIncrement =[| x|]++;
+// var postIncrement = [|x|]++;
 // var preDecrement = --[|x|];
-// var postDecrement =[| x|]--;[|
+// var postDecrement = [|x|]--;
 // 
-// x|] += 1;[|
-// x|] <<= 1;
+// [|x|] += 1;
+// [|x|] <<= 1;
 
 
 
@@ -54,23 +54,23 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfVariable.ts ===
 
-// var[| x|] = 0;
-// var assignmentRightHandSide =[| x|];
-// var assignmentRightHandSide2 = 1 + /*FIND ALL REFS*/[| x|];[|
+// var [|x|] = 0;
+// var assignmentRightHandSide = [|x|];
+// var assignmentRightHandSide2 = 1 + /*FIND ALL REFS*/[|x|];
 // 
-// x|] = 1;[|
-// x|] =[| x|] +[| x|];[|
+// [|x|] = 1;
+// [|x|] = [|x|] + [|x|];
 // 
-// x|] == 1;[|
-// x|] <= 1;
+// [|x|] == 1;
+// [|x|] <= 1;
 // 
 // var preIncrement = ++[|x|];
-// var postIncrement =[| x|]++;
+// var postIncrement = [|x|]++;
 // var preDecrement = --[|x|];
-// var postDecrement =[| x|]--;[|
+// var postDecrement = [|x|]--;
 // 
-// x|] += 1;[|
-// x|] <<= 1;
+// [|x|] += 1;
+// [|x|] <<= 1;
 
 
 
@@ -78,23 +78,23 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfVariable.ts ===
 
-// var[| x|] = 0;
-// var assignmentRightHandSide =[| x|];
-// var assignmentRightHandSide2 = 1 +[| x|];[|
+// var [|x|] = 0;
+// var assignmentRightHandSide = [|x|];
+// var assignmentRightHandSide2 = 1 + [|x|];
 // 
-// /*FIND ALL REFS*/x|] = 1;[|
-// x|] =[| x|] +[| x|];[|
+// /*FIND ALL REFS*/[|x|] = 1;
+// [|x|] = [|x|] + [|x|];
 // 
-// x|] == 1;[|
-// x|] <= 1;
+// [|x|] == 1;
+// [|x|] <= 1;
 // 
 // var preIncrement = ++[|x|];
-// var postIncrement =[| x|]++;
+// var postIncrement = [|x|]++;
 // var preDecrement = --[|x|];
-// var postDecrement =[| x|]--;[|
+// var postDecrement = [|x|]--;
 // 
-// x|] += 1;[|
-// x|] <<= 1;
+// [|x|] += 1;
+// [|x|] <<= 1;
 
 
 
@@ -102,23 +102,23 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfVariable.ts ===
 
-// var[| x|] = 0;
-// var assignmentRightHandSide =[| x|];
-// var assignmentRightHandSide2 = 1 +[| x|];[|
+// var [|x|] = 0;
+// var assignmentRightHandSide = [|x|];
+// var assignmentRightHandSide2 = 1 + [|x|];
 // 
-// x|] = 1;[|
-// /*FIND ALL REFS*/x|] =[| x|] +[| x|];[|
+// [|x|] = 1;
+// /*FIND ALL REFS*/[|x|] = [|x|] + [|x|];
 // 
-// x|] == 1;[|
-// x|] <= 1;
+// [|x|] == 1;
+// [|x|] <= 1;
 // 
 // var preIncrement = ++[|x|];
-// var postIncrement =[| x|]++;
+// var postIncrement = [|x|]++;
 // var preDecrement = --[|x|];
-// var postDecrement =[| x|]--;[|
+// var postDecrement = [|x|]--;
 // 
-// x|] += 1;[|
-// x|] <<= 1;
+// [|x|] += 1;
+// [|x|] <<= 1;
 
 
 
@@ -126,23 +126,23 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfVariable.ts ===
 
-// var[| x|] = 0;
-// var assignmentRightHandSide =[| x|];
-// var assignmentRightHandSide2 = 1 +[| x|];[|
+// var [|x|] = 0;
+// var assignmentRightHandSide = [|x|];
+// var assignmentRightHandSide2 = 1 + [|x|];
 // 
-// x|] = 1;[|
-// x = /*FIND ALL REFS*/|] =[| x|] +[| x|];[|
+// [|x|] = 1;
+// x = /*FIND ALL REFS*/[|x|] = [|x|] + [|x|];
 // 
-// x|] == 1;[|
-// x|] <= 1;
+// [|x|] == 1;
+// [|x|] <= 1;
 // 
 // var preIncrement = ++[|x|];
-// var postIncrement =[| x|]++;
+// var postIncrement = [|x|]++;
 // var preDecrement = --[|x|];
-// var postDecrement =[| x|]--;[|
+// var postDecrement = [|x|]--;
 // 
-// x|] += 1;[|
-// x|] <<= 1;
+// [|x|] += 1;
+// [|x|] <<= 1;
 
 
 
@@ -150,23 +150,23 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfVariable.ts ===
 
-// var[| x|] = 0;
-// var assignmentRightHandSide =[| x|];
-// var assignmentRightHandSide2 = 1 +[| x|];[|
+// var [|x|] = 0;
+// var assignmentRightHandSide = [|x|];
+// var assignmentRightHandSide2 = 1 + [|x|];
 // 
-// x|] = 1;[|
-// x = x + /*FIND ALL REFS*/|] =[| x|] +[| x|];[|
+// [|x|] = 1;
+// x = x + /*FIND ALL REFS*/[|x|] = [|x|] + [|x|];
 // 
-// x|] == 1;[|
-// x|] <= 1;
+// [|x|] == 1;
+// [|x|] <= 1;
 // 
 // var preIncrement = ++[|x|];
-// var postIncrement =[| x|]++;
+// var postIncrement = [|x|]++;
 // var preDecrement = --[|x|];
-// var postDecrement =[| x|]--;[|
+// var postDecrement = [|x|]--;
 // 
-// x|] += 1;[|
-// x|] <<= 1;
+// [|x|] += 1;
+// [|x|] <<= 1;
 
 
 
@@ -174,23 +174,23 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfVariable.ts ===
 
-// var[| x|] = 0;
-// var assignmentRightHandSide =[| x|];
-// var assignmentRightHandSide2 = 1 +[| x|];[|
+// var [|x|] = 0;
+// var assignmentRightHandSide = [|x|];
+// var assignmentRightHandSide2 = 1 + [|x|];
 // 
-// x|] = 1;[|
-// x|] =[| x|] +[| x|];[|
+// [|x|] = 1;
+// [|x|] = [|x|] + [|x|];
 // 
-// /*FIND ALL REFS*/x|] == 1;[|
-// x|] <= 1;
+// /*FIND ALL REFS*/[|x|] == 1;
+// [|x|] <= 1;
 // 
 // var preIncrement = ++[|x|];
-// var postIncrement =[| x|]++;
+// var postIncrement = [|x|]++;
 // var preDecrement = --[|x|];
-// var postDecrement =[| x|]--;[|
+// var postDecrement = [|x|]--;
 // 
-// x|] += 1;[|
-// x|] <<= 1;
+// [|x|] += 1;
+// [|x|] <<= 1;
 
 
 
@@ -198,23 +198,23 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfVariable.ts ===
 
-// var[| x|] = 0;
-// var assignmentRightHandSide =[| x|];
-// var assignmentRightHandSide2 = 1 +[| x|];[|
+// var [|x|] = 0;
+// var assignmentRightHandSide = [|x|];
+// var assignmentRightHandSide2 = 1 + [|x|];
 // 
-// x|] = 1;[|
-// x|] =[| x|] +[| x|];[|
+// [|x|] = 1;
+// [|x|] = [|x|] + [|x|];
 // 
-// x|] == 1;[|
-// /*FIND ALL REFS*/x|] <= 1;
+// [|x|] == 1;
+// /*FIND ALL REFS*/[|x|] <= 1;
 // 
 // var preIncrement = ++[|x|];
-// var postIncrement =[| x|]++;
+// var postIncrement = [|x|]++;
 // var preDecrement = --[|x|];
-// var postDecrement =[| x|]--;[|
+// var postDecrement = [|x|]--;
 // 
-// x|] += 1;[|
-// x|] <<= 1;
+// [|x|] += 1;
+// [|x|] <<= 1;
 
 
 
@@ -222,23 +222,23 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfVariable.ts ===
 
-// var[| x|] = 0;
-// var assignmentRightHandSide =[| x|];
-// var assignmentRightHandSide2 = 1 +[| x|];[|
+// var [|x|] = 0;
+// var assignmentRightHandSide = [|x|];
+// var assignmentRightHandSide2 = 1 + [|x|];
 // 
-// x|] = 1;[|
-// x|] =[| x|] +[| x|];[|
+// [|x|] = 1;
+// [|x|] = [|x|] + [|x|];
 // 
-// x|] == 1;[|
-// x|] <= 1;
+// [|x|] == 1;
+// [|x|] <= 1;
 // 
 // var preIncrement = ++/*FIND ALL REFS*/[|x|];
-// var postIncrement =[| x|]++;
+// var postIncrement = [|x|]++;
 // var preDecrement = --[|x|];
-// var postDecrement =[| x|]--;[|
+// var postDecrement = [|x|]--;
 // 
-// x|] += 1;[|
-// x|] <<= 1;
+// [|x|] += 1;
+// [|x|] <<= 1;
 
 
 
@@ -246,23 +246,23 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfVariable.ts ===
 
-// var[| x|] = 0;
-// var assignmentRightHandSide =[| x|];
-// var assignmentRightHandSide2 = 1 +[| x|];[|
+// var [|x|] = 0;
+// var assignmentRightHandSide = [|x|];
+// var assignmentRightHandSide2 = 1 + [|x|];
 // 
-// x|] = 1;[|
-// x|] =[| x|] +[| x|];[|
+// [|x|] = 1;
+// [|x|] = [|x|] + [|x|];
 // 
-// x|] == 1;[|
-// x|] <= 1;
+// [|x|] == 1;
+// [|x|] <= 1;
 // 
 // var preIncrement = ++[|x|];
-// var postIncrement = /*FIND ALL REFS*/[| x|]++;
+// var postIncrement = /*FIND ALL REFS*/[|x|]++;
 // var preDecrement = --[|x|];
-// var postDecrement =[| x|]--;[|
+// var postDecrement = [|x|]--;
 // 
-// x|] += 1;[|
-// x|] <<= 1;
+// [|x|] += 1;
+// [|x|] <<= 1;
 
 
 
@@ -270,23 +270,23 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfVariable.ts ===
 
-// var[| x|] = 0;
-// var assignmentRightHandSide =[| x|];
-// var assignmentRightHandSide2 = 1 +[| x|];[|
+// var [|x|] = 0;
+// var assignmentRightHandSide = [|x|];
+// var assignmentRightHandSide2 = 1 + [|x|];
 // 
-// x|] = 1;[|
-// x|] =[| x|] +[| x|];[|
+// [|x|] = 1;
+// [|x|] = [|x|] + [|x|];
 // 
-// x|] == 1;[|
-// x|] <= 1;
+// [|x|] == 1;
+// [|x|] <= 1;
 // 
 // var preIncrement = ++[|x|];
-// var postIncrement =[| x|]++;
+// var postIncrement = [|x|]++;
 // var preDecrement = --/*FIND ALL REFS*/[|x|];
-// var postDecrement =[| x|]--;[|
+// var postDecrement = [|x|]--;
 // 
-// x|] += 1;[|
-// x|] <<= 1;
+// [|x|] += 1;
+// [|x|] <<= 1;
 
 
 
@@ -294,23 +294,23 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfVariable.ts ===
 
-// var[| x|] = 0;
-// var assignmentRightHandSide =[| x|];
-// var assignmentRightHandSide2 = 1 +[| x|];[|
+// var [|x|] = 0;
+// var assignmentRightHandSide = [|x|];
+// var assignmentRightHandSide2 = 1 + [|x|];
 // 
-// x|] = 1;[|
-// x|] =[| x|] +[| x|];[|
+// [|x|] = 1;
+// [|x|] = [|x|] + [|x|];
 // 
-// x|] == 1;[|
-// x|] <= 1;
+// [|x|] == 1;
+// [|x|] <= 1;
 // 
 // var preIncrement = ++[|x|];
-// var postIncrement =[| x|]++;
+// var postIncrement = [|x|]++;
 // var preDecrement = --[|x|];
-// var postDecrement = /*FIND ALL REFS*/[| x|]--;[|
+// var postDecrement = /*FIND ALL REFS*/[|x|]--;
 // 
-// x|] += 1;[|
-// x|] <<= 1;
+// [|x|] += 1;
+// [|x|] <<= 1;
 
 
 
@@ -318,23 +318,23 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfVariable.ts ===
 
-// var[| x|] = 0;
-// var assignmentRightHandSide =[| x|];
-// var assignmentRightHandSide2 = 1 +[| x|];[|
+// var [|x|] = 0;
+// var assignmentRightHandSide = [|x|];
+// var assignmentRightHandSide2 = 1 + [|x|];
 // 
-// x|] = 1;[|
-// x|] =[| x|] +[| x|];[|
+// [|x|] = 1;
+// [|x|] = [|x|] + [|x|];
 // 
-// x|] == 1;[|
-// x|] <= 1;
+// [|x|] == 1;
+// [|x|] <= 1;
 // 
 // var preIncrement = ++[|x|];
-// var postIncrement =[| x|]++;
+// var postIncrement = [|x|]++;
 // var preDecrement = --[|x|];
-// var postDecrement =[| x|]--;[|
+// var postDecrement = [|x|]--;
 // 
-// /*FIND ALL REFS*/x|] += 1;[|
-// x|] <<= 1;
+// /*FIND ALL REFS*/[|x|] += 1;
+// [|x|] <<= 1;
 
 
 
@@ -342,20 +342,20 @@
 // === findAllReferences ===
 // === /getOccurrencesIsDefinitionOfVariable.ts ===
 
-// var[| x|] = 0;
-// var assignmentRightHandSide =[| x|];
-// var assignmentRightHandSide2 = 1 +[| x|];[|
+// var [|x|] = 0;
+// var assignmentRightHandSide = [|x|];
+// var assignmentRightHandSide2 = 1 + [|x|];
 // 
-// x|] = 1;[|
-// x|] =[| x|] +[| x|];[|
+// [|x|] = 1;
+// [|x|] = [|x|] + [|x|];
 // 
-// x|] == 1;[|
-// x|] <= 1;
+// [|x|] == 1;
+// [|x|] <= 1;
 // 
 // var preIncrement = ++[|x|];
-// var postIncrement =[| x|]++;
+// var postIncrement = [|x|]++;
 // var preDecrement = --[|x|];
-// var postDecrement =[| x|]--;[|
+// var postDecrement = [|x|]--;
 // 
-// x|] += 1;[|
-// /*FIND ALL REFS*/x|] <<= 1;
+// [|x|] += 1;
+// /*FIND ALL REFS*/[|x|] <<= 1;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionAcrossGlobalProjects.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionAcrossGlobalProjects.baseline.jsonc
index 0dd46fbfe2..ee1e425b69 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionAcrossGlobalProjects.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionAcrossGlobalProjects.baseline.jsonc
@@ -2,7 +2,7 @@
 // === /home/src/workspaces/project/a/index.ts ===
 
 // namespace NS {
-//     export function /*FIND ALL REFS*/[| FA|]() {
+//     export function /*FIND ALL REFS*/[|FA|]() {
 //         FB();
 //     }
 // }
@@ -18,11 +18,11 @@
 //     }
 // }
 // 
-// interface /*FIND ALL REFS*/[| I|] {
+// interface /*FIND ALL REFS*/[|I|] {
 //     FA();
 // }
 // 
-// const ia:[| I|] = {
+// const ia: [|I|] = {
 //     FA() { },
 //     FB() { },
 //     FC() { },
@@ -34,12 +34,11 @@
 // === findAllReferences ===
 // === /home/src/workspaces/project/a/index.ts ===
 
-// --- (line: 3) skipped ---
-//     }
+// --- (line: 4) skipped ---
 // }
 // 
-// interface I {[|
-//     /*FIND ALL REFS*/FA|]();
+// interface I {
+//     /*FIND ALL REFS*/[|FA|]();
 // }
 // 
 // const ia: I = {
@@ -52,7 +51,7 @@
 // === /home/src/workspaces/project/b/index.ts ===
 
 // namespace NS {
-//     export function /*FIND ALL REFS*/[| FB|]() {}
+//     export function /*FIND ALL REFS*/[|FB|]() {}
 // }
 // 
 // interface I {
@@ -68,11 +67,11 @@
 //     export function FB() {}
 // }
 // 
-// interface /*FIND ALL REFS*/[| I|] {
+// interface /*FIND ALL REFS*/[|I|] {
 //     FB();
 // }
 // 
-// const ib:[| I|] = { FB() {} };
+// const ib: [|I|] = { FB() {} };
 
 
 
@@ -84,8 +83,8 @@
 //     export function FB() {}
 // }
 // 
-// interface I {[|
-//     /*FIND ALL REFS*/FB|]();
+// interface I {
+//     /*FIND ALL REFS*/[|FB|]();
 // }
 // 
 // const ib: I = { FB() {} };
@@ -97,7 +96,7 @@
 // === /home/src/workspaces/project/c/index.ts ===
 
 // namespace NS {
-//     export function /*FIND ALL REFS*/[| FC|]() {}
+//     export function /*FIND ALL REFS*/[|FC|]() {}
 // }
 // 
 // interface I {
@@ -113,11 +112,11 @@
 //     export function FC() {}
 // }
 // 
-// interface /*FIND ALL REFS*/[| I|] {
+// interface /*FIND ALL REFS*/[|I|] {
 //     FC();
 // }
 // 
-// const ic:[| I|] = { FC() {} };
+// const ic: [|I|] = { FC() {} };
 
 
 
@@ -129,8 +128,8 @@
 //     export function FC() {}
 // }
 // 
-// interface I {[|
-//     /*FIND ALL REFS*/FC|]();
+// interface I {
+//     /*FIND ALL REFS*/[|FC|]();
 // }
 // 
 // const ic: I = { FC() {} };
diff --git a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionAcrossModuleProjects.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionAcrossModuleProjects.baseline.jsonc
index 6f499d3a61..94bdcc9fce 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionAcrossModuleProjects.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionAcrossModuleProjects.baseline.jsonc
@@ -6,7 +6,7 @@
 // 
 // declare module "../b" {
 //     export namespace NS {
-//         export function /*FIND ALL REFS*/[| FA|]();
+//         export function /*FIND ALL REFS*/[|FA|]();
 //     }
 // }
 // 
@@ -31,7 +31,7 @@
 // }
 // 
 // declare module "../c" {
-//     export interface /*FIND ALL REFS*/[| I|] {
+//     export interface /*FIND ALL REFS*/[|I|] {
 //         FA();
 //     }
 // }
@@ -44,11 +44,11 @@
 //     export function FC() {}
 // }
 // 
-// export interface[| I|] {
+// export interface [|I|] {
 //     FC();
 // }
 // 
-// const ic:[| I|] = { FC() {} };
+// const ic: [|I|] = { FC() {} };
 
 
 
@@ -56,12 +56,11 @@
 // === findAllReferences ===
 // === /home/src/workspaces/project/a/index.ts ===
 
-// --- (line: 7) skipped ---
-// }
+// --- (line: 8) skipped ---
 // 
 // declare module "../c" {
-//     export interface I {[|
-//         /*FIND ALL REFS*/FA|]();
+//     export interface I {
+//         /*FIND ALL REFS*/[|FA|]();
 //     }
 // }
 // 
@@ -78,7 +77,7 @@
 // 
 // declare module "../b" {
 //     export namespace NS {
-//         export function /*FIND ALL REFS*/[| FA|]();
+//         export function /*FIND ALL REFS*/[|FA|]();
 //     }
 // }
 // 
@@ -103,7 +102,7 @@
 // }
 // 
 // declare module "../c" {
-//     export interface /*FIND ALL REFS*/[| I|] {
+//     export interface /*FIND ALL REFS*/[|I|] {
 //         FA();
 //     }
 // }
@@ -116,11 +115,11 @@
 //     export function FC() {}
 // }
 // 
-// export interface[| I|] {
+// export interface [|I|] {
 //     FC();
 // }
 // 
-// const ic:[| I|] = { FC() {} };
+// const ic: [|I|] = { FC() {} };
 
 
 
@@ -128,12 +127,11 @@
 // === findAllReferences ===
 // === /home/src/workspaces/project/a2/index.ts ===
 
-// --- (line: 7) skipped ---
-// }
+// --- (line: 8) skipped ---
 // 
 // declare module "../c" {
-//     export interface I {[|
-//         /*FIND ALL REFS*/FA|]();
+//     export interface I {
+//         /*FIND ALL REFS*/[|FA|]();
 //     }
 // }
 // 
@@ -146,7 +144,7 @@
 // === /home/src/workspaces/project/b/index.ts ===
 
 // export namespace NS {
-//     export function /*FIND ALL REFS*/[| FB|]() {}
+//     export function /*FIND ALL REFS*/[|FB|]() {}
 // }
 // 
 // export interface I {
@@ -162,11 +160,11 @@
 //     export function FB() {}
 // }
 // 
-// export interface /*FIND ALL REFS*/[| I|] {
+// export interface /*FIND ALL REFS*/[|I|] {
 //     FB();
 // }
 // 
-// const ib:[| I|] = { FB() {} };
+// const ib: [|I|] = { FB() {} };
 
 
 
@@ -178,8 +176,8 @@
 //     export function FB() {}
 // }
 // 
-// export interface I {[|
-//     /*FIND ALL REFS*/FB|]();
+// export interface I {
+//     /*FIND ALL REFS*/[|FB|]();
 // }
 // 
 // const ib: I = { FB() {} };
@@ -191,7 +189,7 @@
 // === /home/src/workspaces/project/c/index.ts ===
 
 // export namespace NS {
-//     export function /*FIND ALL REFS*/[| FC|]() {}
+//     export function /*FIND ALL REFS*/[|FC|]() {}
 // }
 // 
 // export interface I {
@@ -207,11 +205,11 @@
 //     export function FC() {}
 // }
 // 
-// export interface /*FIND ALL REFS*/[| I|] {
+// export interface /*FIND ALL REFS*/[|I|] {
 //     FC();
 // }
 // 
-// const ic:[| I|] = { FC() {} };
+// const ic: [|I|] = { FC() {} };
 
 
 
@@ -223,8 +221,8 @@
 //     export function FC() {}
 // }
 // 
-// export interface I {[|
-//     /*FIND ALL REFS*/FC|]();
+// export interface I {
+//     /*FIND ALL REFS*/[|FC|]();
 // }
 // 
 // const ic: I = { FC() {} };
diff --git a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionInterfaceImplementation.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionInterfaceImplementation.baseline.jsonc
index 0c10206272..697d149847 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionInterfaceImplementation.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionInterfaceImplementation.baseline.jsonc
@@ -1,12 +1,12 @@
 // === findAllReferences ===
 // === /isDefinitionInterfaceImplementation.ts ===
 
-// interface I {[|
-//     /*FIND ALL REFS*/M|](): void;
+// interface I {
+//     /*FIND ALL REFS*/[|M|](): void;
 // }
 // 
-// class C implements I {[|
-//     M|]() { }
+// class C implements I {
+//     [|M|]() { }
 // }
 // 
 // ({} as I).[|M|]();
@@ -18,12 +18,12 @@
 // === findAllReferences ===
 // === /isDefinitionInterfaceImplementation.ts ===
 
-// interface I {[|
-//     M|](): void;
+// interface I {
+//     [|M|](): void;
 // }
 // 
-// class C implements I {[|
-//     /*FIND ALL REFS*/M|]() { }
+// class C implements I {
+//     /*FIND ALL REFS*/[|M|]() { }
 // }
 // 
 // ({} as I).[|M|]();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionOverloads.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionOverloads.baseline.jsonc
index 8a612b570a..b603465539 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionOverloads.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionOverloads.baseline.jsonc
@@ -1,12 +1,12 @@
 // === findAllReferences ===
 // === /isDefinitionOverloads.ts ===
 
-// function /*FIND ALL REFS*/[| f|](x: number): void;
-// function[| f|](x: string): void;
-// function[| f|](x: number | string) { }[|
+// function /*FIND ALL REFS*/[|f|](x: number): void;
+// function [|f|](x: string): void;
+// function [|f|](x: number | string) { }
 // 
-// f|](1);[|
-// f|]("a");
+// [|f|](1);
+// [|f|]("a");
 
 
 
@@ -14,12 +14,12 @@
 // === findAllReferences ===
 // === /isDefinitionOverloads.ts ===
 
-// function[| f|](x: number): void;
-// function /*FIND ALL REFS*/[| f|](x: string): void;
-// function[| f|](x: number | string) { }[|
+// function [|f|](x: number): void;
+// function /*FIND ALL REFS*/[|f|](x: string): void;
+// function [|f|](x: number | string) { }
 // 
-// f|](1);[|
-// f|]("a");
+// [|f|](1);
+// [|f|]("a");
 
 
 
@@ -27,9 +27,9 @@
 // === findAllReferences ===
 // === /isDefinitionOverloads.ts ===
 
-// function[| f|](x: number): void;
-// function[| f|](x: string): void;
-// function /*FIND ALL REFS*/[| f|](x: number | string) { }[|
+// function [|f|](x: number): void;
+// function [|f|](x: string): void;
+// function /*FIND ALL REFS*/[|f|](x: number | string) { }
 // 
-// f|](1);[|
-// f|]("a");
+// [|f|](1);
+// [|f|]("a");
diff --git a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionShorthandProperty.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionShorthandProperty.baseline.jsonc
index 60d20978f3..a44f1ae070 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionShorthandProperty.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionShorthandProperty.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /isDefinitionShorthandProperty.ts ===
 
-// const /*FIND ALL REFS*/[| x|] = 1;
-// const y: { x: number } = {[| x|] };
+// const /*FIND ALL REFS*/[|x|] = 1;
+// const y: { x: number } = { [|x|] };
 
 
 
@@ -11,7 +11,7 @@
 // === /isDefinitionShorthandProperty.ts ===
 
 // const x = 1;
-// const y: { /*FIND ALL REFS*/[| x|]: number } = { x };
+// const y: { /*FIND ALL REFS*/[|x|]: number } = { x };
 
 
 
@@ -20,4 +20,4 @@
 // === /isDefinitionShorthandProperty.ts ===
 
 // const x = 1;
-// const y: { x: number } = { /*FIND ALL REFS*/[| x|] };
+// const y: { x: number } = { /*FIND ALL REFS*/[|x|] };
diff --git a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionSingleImport.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionSingleImport.baseline.jsonc
index c4a8ec823a..ab6c9a8a01 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionSingleImport.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionSingleImport.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /a.ts ===
 
-// export function /*FIND ALL REFS*/[| f|]() {}
+// export function /*FIND ALL REFS*/[|f|]() {}
 
 
 
@@ -9,4 +9,4 @@
 // === findAllReferences ===
 // === /b.ts ===
 
-// import { /*FIND ALL REFS*/[| f|] } from "./a";
+// import { /*FIND ALL REFS*/[|f|] } from "./a";
diff --git a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionSingleReference.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionSingleReference.baseline.jsonc
index 2a0bd7d380..a455d9410f 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionSingleReference.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/IsDefinitionSingleReference.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /isDefinitionSingleReference.ts ===
 
-// function /*FIND ALL REFS*/[| f|]() {}[|
-// f|]();
+// function /*FIND ALL REFS*/[|f|]() {}
+// [|f|]();
 
 
 
@@ -10,5 +10,5 @@
 // === findAllReferences ===
 // === /isDefinitionSingleReference.ts ===
 
-// function[| f|]() {}[|
-// /*FIND ALL REFS*/f|]();
+// function [|f|]() {}
+// /*FIND ALL REFS*/[|f|]();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/JsdocThrowsTag_findAllReferences.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/JsdocThrowsTag_findAllReferences.baseline.jsonc
index f62ab1c76b..c24f93ca06 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/JsdocThrowsTag_findAllReferences.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/JsdocThrowsTag_findAllReferences.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /jsdocThrowsTag_findAllReferences.ts ===
 
-// class /*FIND ALL REFS*/[| E|] extends Error {}
+// class /*FIND ALL REFS*/[|E|] extends Error {}
 // /**
 //  * @throws {E}
 //  */
diff --git a/testdata/baselines/reference/fourslash/findAllRef/JsdocTypedefTagSemanticMeaning0.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/JsdocTypedefTagSemanticMeaning0.baseline.jsonc
index 1eee0d3a9a..2bdc8e4ec9 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/JsdocTypedefTagSemanticMeaning0.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/JsdocTypedefTagSemanticMeaning0.baseline.jsonc
@@ -23,9 +23,9 @@
 // === /a.js ===
 
 // /** @typedef {number} T */
-// const /*FIND ALL REFS*/[| T|] = 1;
+// const /*FIND ALL REFS*/[|T|] = 1;
 // /** @type {T} */
-// const n =[| T|];
+// const n = [|T|];
 
 
 
@@ -39,6 +39,6 @@
 // === /a.js ===
 
 // /** @typedef {number} T */
-// const[| T|] = 1;
+// const [|T|] = 1;
 // /** @type {T} */
-// const n = /*FIND ALL REFS*/[| T|];
+// const n = /*FIND ALL REFS*/[|T|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/JsdocTypedefTagSemanticMeaning1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/JsdocTypedefTagSemanticMeaning1.baseline.jsonc
index 17f7fc60f1..019359fafa 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/JsdocTypedefTagSemanticMeaning1.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/JsdocTypedefTagSemanticMeaning1.baseline.jsonc
@@ -7,9 +7,9 @@
 // === /a.js ===
 
 // /** @typedef {number} */
-// const /*FIND ALL REFS*/[| T|] = 1;
+// const /*FIND ALL REFS*/[|T|] = 1;
 // /** @type {T} */
-// const n =[| T|];
+// const n = [|T|];
 
 
 
@@ -23,6 +23,6 @@
 // === /a.js ===
 
 // /** @typedef {number} */
-// const[| T|] = 1;
+// const [|T|] = 1;
 // /** @type {T} */
-// const n = /*FIND ALL REFS*/[| T|];
+// const n = /*FIND ALL REFS*/[|T|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferenceInParameterPropertyDeclaration.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferenceInParameterPropertyDeclaration.baseline.jsonc
index fc7bd686bc..8733deae92 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferenceInParameterPropertyDeclaration.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferenceInParameterPropertyDeclaration.baseline.jsonc
@@ -2,11 +2,11 @@
 // === /file1.ts ===
 
 //  class Foo {
-//      constructor(private /*FIND ALL REFS*/[| privateParam|]: number,
+//      constructor(private /*FIND ALL REFS*/[|privateParam|]: number,
 //          public publicParam: string,
 //          protected protectedParam: boolean) {
 // 
-//          let localPrivate =[| privateParam|];
+//          let localPrivate = [|privateParam|];
 //          this.[|privateParam|] += 10;
 // 
 //          let localPublic = publicParam;
@@ -21,13 +21,13 @@
 
 //  class Foo {
 //      constructor(private privateParam: number,
-//          public /*FIND ALL REFS*/[| publicParam|]: string,
+//          public /*FIND ALL REFS*/[|publicParam|]: string,
 //          protected protectedParam: boolean) {
 // 
 //          let localPrivate = privateParam;
 //          this.privateParam += 10;
 // 
-//          let localPublic =[| publicParam|];
+//          let localPublic = [|publicParam|];
 //          this.[|publicParam|] += " Hello!";
 // 
 //          let localProtected = protectedParam;
@@ -44,7 +44,7 @@
 //  class Foo {
 //      constructor(private privateParam: number,
 //          public publicParam: string,
-//          protected /*FIND ALL REFS*/[| protectedParam|]: boolean) {
+//          protected /*FIND ALL REFS*/[|protectedParam|]: boolean) {
 // 
 //          let localPrivate = privateParam;
 //          this.privateParam += 10;
@@ -52,7 +52,7 @@
 //          let localPublic = publicParam;
 //          this.publicParam += " Hello!";
 // 
-//          let localProtected =[| protectedParam|];
+//          let localProtected = [|protectedParam|];
 //          this.[|protectedParam|] = false;
 //      }
 //  }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferenceToClass.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferenceToClass.baseline.jsonc
index bdece0bc13..7da7eb3002 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferenceToClass.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferenceToClass.baseline.jsonc
@@ -1,18 +1,18 @@
 // === findAllReferences ===
 // === /referenceToClass_1.ts ===
 
-// class /*FIND ALL REFS*/[| foo|] {
-//     public n:[| foo|];
+// class /*FIND ALL REFS*/[|foo|] {
+//     public n: [|foo|];
 //     public foo: number;
 // }
 // 
 // class bar {
-//     public n:[| foo|];
-//     public k = new[| foo|]();
+//     public n: [|foo|];
+//     public k = new [|foo|]();
 // }
 // 
 // module mod {
-//     var k:[| foo|] = null;
+//     var k: [|foo|] = null;
 // }
 
 
@@ -21,18 +21,18 @@
 // === findAllReferences ===
 // === /referenceToClass_1.ts ===
 
-// class[| foo|] {
-//     public n: /*FIND ALL REFS*/[| foo|];
+// class [|foo|] {
+//     public n: /*FIND ALL REFS*/[|foo|];
 //     public foo: number;
 // }
 // 
 // class bar {
-//     public n:[| foo|];
-//     public k = new[| foo|]();
+//     public n: [|foo|];
+//     public k = new [|foo|]();
 // }
 // 
 // module mod {
-//     var k:[| foo|] = null;
+//     var k: [|foo|] = null;
 // }
 
 
@@ -41,18 +41,18 @@
 // === findAllReferences ===
 // === /referenceToClass_1.ts ===
 
-// class[| foo|] {
-//     public n:[| foo|];
+// class [|foo|] {
+//     public n: [|foo|];
 //     public foo: number;
 // }
 // 
 // class bar {
-//     public n: /*FIND ALL REFS*/[| foo|];
-//     public k = new[| foo|]();
+//     public n: /*FIND ALL REFS*/[|foo|];
+//     public k = new [|foo|]();
 // }
 // 
 // module mod {
-//     var k:[| foo|] = null;
+//     var k: [|foo|] = null;
 // }
 
 
@@ -61,18 +61,18 @@
 // === findAllReferences ===
 // === /referenceToClass_1.ts ===
 
-// class[| foo|] {
-//     public n:[| foo|];
+// class [|foo|] {
+//     public n: [|foo|];
 //     public foo: number;
 // }
 // 
 // class bar {
-//     public n:[| foo|];
-//     public k = new /*FIND ALL REFS*/[| foo|]();
+//     public n: [|foo|];
+//     public k = new /*FIND ALL REFS*/[|foo|]();
 // }
 // 
 // module mod {
-//     var k:[| foo|] = null;
+//     var k: [|foo|] = null;
 // }
 
 
@@ -81,18 +81,18 @@
 // === findAllReferences ===
 // === /referenceToClass_1.ts ===
 
-// class[| foo|] {
-//     public n:[| foo|];
+// class [|foo|] {
+//     public n: [|foo|];
 //     public foo: number;
 // }
 // 
 // class bar {
-//     public n:[| foo|];
-//     public k = new[| foo|]();
+//     public n: [|foo|];
+//     public k = new [|foo|]();
 // }
 // 
 // module mod {
-//     var k: /*FIND ALL REFS*/[| foo|] = null;
+//     var k: /*FIND ALL REFS*/[|foo|] = null;
 // }
 
 
@@ -101,21 +101,21 @@
 // === findAllReferences ===
 // === /referenceToClass_1.ts ===
 
-// class[| foo|] {
-//     public n:[| foo|];
+// class [|foo|] {
+//     public n: [|foo|];
 //     public foo: number;
 // }
 // 
 // class bar {
-//     public n:[| foo|];
-//     public k = new[| foo|]();
+//     public n: [|foo|];
+//     public k = new [|foo|]();
 // }
 // 
 // module mod {
-//     var k:[| foo|] = null;
+//     var k: [|foo|] = null;
 // }
 
 
 // === /referenceToClass_2.ts ===
 
-// var k: /*FIND ALL REFS*/[| foo|];
+// var k: /*FIND ALL REFS*/[|foo|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/References01.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/References01.baseline.jsonc
index b3526c1185..ce7a705518 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/References01.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/References01.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /home/src/workspaces/project/referencesForGlobals_1.ts ===
 
-// class[| globalClass|] {
+// class [|globalClass|] {
 //     public f() { }
 // }
 
@@ -9,4 +9,4 @@
 // === /home/src/workspaces/project/referencesForGlobals_2.ts ===
 
 // ///<reference path="referencesForGlobals_1.ts" />
-// var c = /*FIND ALL REFS*/[| globalClass|]();
+// var c = /*FIND ALL REFS*/[|globalClass|]();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesBloomFilters.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesBloomFilters.baseline.jsonc
index 5f16e9e938..9b8165c36a 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesBloomFilters.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesBloomFilters.baseline.jsonc
@@ -1,4 +1,4 @@
 // === findAllReferences ===
 // === /declaration.ts ===
 
-// var container = { /*FIND ALL REFS*/[| searchProp|] : 1 };
+// var container = { /*FIND ALL REFS*/[|searchProp|] : 1 };
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesBloomFilters2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesBloomFilters2.baseline.jsonc
index 1daa716861..c72c447ab6 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesBloomFilters2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesBloomFilters2.baseline.jsonc
@@ -1,4 +1,4 @@
 // === findAllReferences ===
 // === /declaration.ts ===
 
-// var container = { /*FIND ALL REFS*/[| 42|]: 1 };
+// var container = { /*FIND ALL REFS*/[|42|]: 1 };
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesBloomFilters3.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesBloomFilters3.baseline.jsonc
index 3952b6c8af..2216c0996e 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesBloomFilters3.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesBloomFilters3.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /declaration.ts ===
 
-// enum Test { /*FIND ALL REFS*/[| "42"|] = 1 };
+// enum Test { /*FIND ALL REFS*/"[|42|]" = 1 };
 
 
 
@@ -9,7 +9,7 @@
 // === findAllReferences ===
 // === /declaration.ts ===
 
-// enum Test { "/*FIND ALL REFS*/[| "42"|] = 1 };
+// enum Test { "/*FIND ALL REFS*/[|42|]" = 1 };
 
 
 
@@ -17,7 +17,7 @@
 // === findAllReferences ===
 // === /declaration.ts ===
 
-// enum Test {[| "42"|] = 1 };
+// enum Test { "[|42|]" = 1 };
 
 
 // === /expression.ts ===
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForAmbients.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForAmbients.baseline.jsonc
index 2bc6b38756..b7a7907609 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForAmbients.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForAmbients.baseline.jsonc
@@ -6,12 +6,12 @@
 // === findAllReferences ===
 // === /referencesForAmbients.ts ===
 
-// declare module "/*FIND ALL REFS*/[| "foo"|] {
+// declare module "/*FIND ALL REFS*/[|foo|]" {
 //     var f: number;
 // }
 // 
 // declare module "bar" {
-//     export import foo = require([|"foo"|]);
+//     export import foo = require("[|foo|]");
 //     var f2: typeof foo.f;
 // }
 // 
@@ -29,7 +29,7 @@
 // === /referencesForAmbients.ts ===
 
 // declare module "foo" {
-//     var /*FIND ALL REFS*/[| f|]: number;
+//     var /*FIND ALL REFS*/[|f|]: number;
 // }
 // 
 // declare module "bar" {
@@ -55,13 +55,13 @@
 //     var f: number;
 // }
 // 
-// declare module "/*FIND ALL REFS*/[| "bar"|] {
+// declare module "/*FIND ALL REFS*/[|bar|]" {
 //     export import foo = require("foo");
 //     var f2: typeof foo.f;
 // }
 // 
 // declare module "baz" {
-//     import bar = require([|"bar"|]);
+//     import bar = require("[|bar|]");
 //     var f2: typeof bar.foo;
 // }
 
@@ -81,8 +81,8 @@
 // }
 // 
 // declare module "bar" {
-//     export import /*FIND ALL REFS*/[| foo|] = require("foo");
-//     var f2: typeof[| foo|].f;
+//     export import /*FIND ALL REFS*/[|foo|] = require("foo");
+//     var f2: typeof [|foo|].f;
 // }
 // 
 // declare module "baz" {
@@ -96,12 +96,12 @@
 // === findAllReferences ===
 // === /referencesForAmbients.ts ===
 
-// declare module[| "foo"|] {
+// declare module "[|foo|]" {
 //     var f: number;
 // }
 // 
 // declare module "bar" {
-//     export import foo = require("/*FIND ALL REFS*/[|"foo"|]);
+//     export import foo = require("/*FIND ALL REFS*/[|foo|]");
 //     var f2: typeof foo.f;
 // }
 // 
@@ -118,8 +118,8 @@
 // }
 // 
 // declare module "bar" {
-//     export import[| foo|] = require("foo");
-//     var f2: typeof /*FIND ALL REFS*/[| foo|].f;
+//     export import [|foo|] = require("foo");
+//     var f2: typeof /*FIND ALL REFS*/[|foo|].f;
 // }
 // 
 // declare module "baz" {
@@ -134,7 +134,7 @@
 // === /referencesForAmbients.ts ===
 
 // declare module "foo" {
-//     var[| f|]: number;
+//     var [|f|]: number;
 // }
 // 
 // declare module "bar" {
@@ -160,13 +160,13 @@
 //     var f: number;
 // }
 // 
-// declare module[| "bar"|] {
+// declare module "[|bar|]" {
 //     export import foo = require("foo");
 //     var f2: typeof foo.f;
 // }
 // 
 // declare module "baz" {
-//     import bar = require("/*FIND ALL REFS*/[|"bar"|]);
+//     import bar = require("/*FIND ALL REFS*/[|bar|]");
 //     var f2: typeof bar.foo;
 // }
 
@@ -181,8 +181,8 @@
 // }
 // 
 // declare module "bar" {
-//     export import[| foo|] = require("foo");
-//     var f2: typeof[| foo|].f;
+//     export import [|foo|] = require("foo");
+//     var f2: typeof [|foo|].f;
 // }
 // 
 // declare module "baz" {
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassLocal.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassLocal.baseline.jsonc
index 65032ca162..fb6ba49bc1 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassLocal.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassLocal.baseline.jsonc
@@ -9,7 +9,7 @@
 // var n = 14;
 // 
 // class foo {
-//     private /*FIND ALL REFS*/[| n|] = 0;
+//     private /*FIND ALL REFS*/[|n|] = 0;
 // 
 //     public bar() {
 //         this.[|n|] = 9;
@@ -31,7 +31,7 @@
 // var n = 14;
 // 
 // class foo {
-//     private[| n|] = 0;
+//     private [|n|] = 0;
 // 
 //     public bar() {
 //         this./*FIND ALL REFS*/[|n|] = 9;
@@ -53,7 +53,7 @@
 // var n = 14;
 // 
 // class foo {
-//     private[| n|] = 0;
+//     private [|n|] = 0;
 // 
 //     public bar() {
 //         this.[|n|] = 9;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassMembers.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassMembers.baseline.jsonc
index 580a92e03a..f340314796 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassMembers.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassMembers.baseline.jsonc
@@ -1,12 +1,12 @@
 // === findAllReferences ===
 // === /referencesForClassMembers.ts ===
 
-// class Base {[|
-//     /*FIND ALL REFS*/a|]: number;
+// class Base {
+//     /*FIND ALL REFS*/[|a|]: number;
 //     method(): void { }
 // }
-// class MyClass extends Base {[|
-//     a|];
+// class MyClass extends Base {
+//     [|a|];
 //     method() { }
 // }
 // 
@@ -20,12 +20,12 @@
 // === findAllReferences ===
 // === /referencesForClassMembers.ts ===
 
-// class Base {[|
-//     a|]: number;
+// class Base {
+//     [|a|]: number;
 //     method(): void { }
 // }
-// class MyClass extends Base {[|
-//     /*FIND ALL REFS*/a|];
+// class MyClass extends Base {
+//     /*FIND ALL REFS*/[|a|];
 //     method() { }
 // }
 // 
@@ -39,12 +39,12 @@
 // === findAllReferences ===
 // === /referencesForClassMembers.ts ===
 
-// class Base {[|
-//     a|]: number;
+// class Base {
+//     [|a|]: number;
 //     method(): void { }
 // }
-// class MyClass extends Base {[|
-//     a|];
+// class MyClass extends Base {
+//     [|a|];
 //     method() { }
 // }
 // 
@@ -59,12 +59,12 @@
 // === /referencesForClassMembers.ts ===
 
 // class Base {
-//     a: number;[|
-//     /*FIND ALL REFS*/method|](): void { }
+//     a: number;
+//     /*FIND ALL REFS*/[|method|](): void { }
 // }
 // class MyClass extends Base {
-//     a;[|
-//     method|]() { }
+//     a;
+//     [|method|]() { }
 // }
 // 
 // var c: MyClass;
@@ -78,12 +78,12 @@
 // === /referencesForClassMembers.ts ===
 
 // class Base {
-//     a: number;[|
-//     method|](): void { }
+//     a: number;
+//     [|method|](): void { }
 // }
 // class MyClass extends Base {
-//     a;[|
-//     /*FIND ALL REFS*/method|]() { }
+//     a;
+//     /*FIND ALL REFS*/[|method|]() { }
 // }
 // 
 // var c: MyClass;
@@ -97,12 +97,12 @@
 // === /referencesForClassMembers.ts ===
 
 // class Base {
-//     a: number;[|
-//     method|](): void { }
+//     a: number;
+//     [|method|](): void { }
 // }
 // class MyClass extends Base {
-//     a;[|
-//     method|]() { }
+//     a;
+//     [|method|]() { }
 // }
 // 
 // var c: MyClass;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassMembersExtendingAbstractClass.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassMembersExtendingAbstractClass.baseline.jsonc
index 99e6ebb547..429d39ba03 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassMembersExtendingAbstractClass.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassMembersExtendingAbstractClass.baseline.jsonc
@@ -2,11 +2,11 @@
 // === /referencesForClassMembersExtendingAbstractClass.ts ===
 
 // abstract class Base {
-//     abstract /*FIND ALL REFS*/[| a|]: number;
+//     abstract /*FIND ALL REFS*/[|a|]: number;
 //     abstract method(): void;
 // }
-// class MyClass extends Base {[|
-//     a|];
+// class MyClass extends Base {
+//     [|a|];
 //     method() { }
 // }
 // 
@@ -21,11 +21,11 @@
 // === /referencesForClassMembersExtendingAbstractClass.ts ===
 
 // abstract class Base {
-//     abstract[| a|]: number;
+//     abstract [|a|]: number;
 //     abstract method(): void;
 // }
-// class MyClass extends Base {[|
-//     /*FIND ALL REFS*/a|];
+// class MyClass extends Base {
+//     /*FIND ALL REFS*/[|a|];
 //     method() { }
 // }
 // 
@@ -40,11 +40,11 @@
 // === /referencesForClassMembersExtendingAbstractClass.ts ===
 
 // abstract class Base {
-//     abstract[| a|]: number;
+//     abstract [|a|]: number;
 //     abstract method(): void;
 // }
-// class MyClass extends Base {[|
-//     a|];
+// class MyClass extends Base {
+//     [|a|];
 //     method() { }
 // }
 // 
@@ -60,11 +60,11 @@
 
 // abstract class Base {
 //     abstract a: number;
-//     abstract /*FIND ALL REFS*/[| method|](): void;
+//     abstract /*FIND ALL REFS*/[|method|](): void;
 // }
 // class MyClass extends Base {
-//     a;[|
-//     method|]() { }
+//     a;
+//     [|method|]() { }
 // }
 // 
 // var c: MyClass;
@@ -79,11 +79,11 @@
 
 // abstract class Base {
 //     abstract a: number;
-//     abstract[| method|](): void;
+//     abstract [|method|](): void;
 // }
 // class MyClass extends Base {
-//     a;[|
-//     /*FIND ALL REFS*/method|]() { }
+//     a;
+//     /*FIND ALL REFS*/[|method|]() { }
 // }
 // 
 // var c: MyClass;
@@ -98,11 +98,11 @@
 
 // abstract class Base {
 //     abstract a: number;
-//     abstract[| method|](): void;
+//     abstract [|method|](): void;
 // }
 // class MyClass extends Base {
-//     a;[|
-//     method|]() { }
+//     a;
+//     [|method|]() { }
 // }
 // 
 // var c: MyClass;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassMembersExtendingGenericClass.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassMembersExtendingGenericClass.baseline.jsonc
index 6b94790332..79cdb2e1dc 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassMembersExtendingGenericClass.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassMembersExtendingGenericClass.baseline.jsonc
@@ -1,12 +1,12 @@
 // === findAllReferences ===
 // === /referencesForClassMembersExtendingGenericClass.ts ===
 
-// class Base<T> {[|
-//     /*FIND ALL REFS*/a|]: this;
+// class Base<T> {
+//     /*FIND ALL REFS*/[|a|]: this;
 //     method<U>(a?:T, b?:U): this { }
 // }
-// class MyClass extends Base<number> {[|
-//     a|];
+// class MyClass extends Base<number> {
+//     [|a|];
 //     method() { }
 // }
 // 
@@ -20,12 +20,12 @@
 // === findAllReferences ===
 // === /referencesForClassMembersExtendingGenericClass.ts ===
 
-// class Base<T> {[|
-//     a|]: this;
+// class Base<T> {
+//     [|a|]: this;
 //     method<U>(a?:T, b?:U): this { }
 // }
-// class MyClass extends Base<number> {[|
-//     /*FIND ALL REFS*/a|];
+// class MyClass extends Base<number> {
+//     /*FIND ALL REFS*/[|a|];
 //     method() { }
 // }
 // 
@@ -39,12 +39,12 @@
 // === findAllReferences ===
 // === /referencesForClassMembersExtendingGenericClass.ts ===
 
-// class Base<T> {[|
-//     a|]: this;
+// class Base<T> {
+//     [|a|]: this;
 //     method<U>(a?:T, b?:U): this { }
 // }
-// class MyClass extends Base<number> {[|
-//     a|];
+// class MyClass extends Base<number> {
+//     [|a|];
 //     method() { }
 // }
 // 
@@ -59,12 +59,12 @@
 // === /referencesForClassMembersExtendingGenericClass.ts ===
 
 // class Base<T> {
-//     a: this;[|
-//     /*FIND ALL REFS*/method|]<U>(a?:T, b?:U): this { }
+//     a: this;
+//     /*FIND ALL REFS*/[|method|]<U>(a?:T, b?:U): this { }
 // }
 // class MyClass extends Base<number> {
-//     a;[|
-//     method|]() { }
+//     a;
+//     [|method|]() { }
 // }
 // 
 // var c: MyClass;
@@ -78,12 +78,12 @@
 // === /referencesForClassMembersExtendingGenericClass.ts ===
 
 // class Base<T> {
-//     a: this;[|
-//     method|]<U>(a?:T, b?:U): this { }
+//     a: this;
+//     [|method|]<U>(a?:T, b?:U): this { }
 // }
 // class MyClass extends Base<number> {
-//     a;[|
-//     /*FIND ALL REFS*/method|]() { }
+//     a;
+//     /*FIND ALL REFS*/[|method|]() { }
 // }
 // 
 // var c: MyClass;
@@ -97,12 +97,12 @@
 // === /referencesForClassMembersExtendingGenericClass.ts ===
 
 // class Base<T> {
-//     a: this;[|
-//     method|]<U>(a?:T, b?:U): this { }
+//     a: this;
+//     [|method|]<U>(a?:T, b?:U): this { }
 // }
 // class MyClass extends Base<number> {
-//     a;[|
-//     method|]() { }
+//     a;
+//     [|method|]() { }
 // }
 // 
 // var c: MyClass;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassParameter.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassParameter.baseline.jsonc
index bb68404b4e..4f2ad47f5b 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassParameter.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForClassParameter.baseline.jsonc
@@ -11,7 +11,7 @@
 // class p { }
 // 
 // class foo {
-//     constructor (public /*FIND ALL REFS*/[| p|]: any) {
+//     constructor (public /*FIND ALL REFS*/[|p|]: any) {
 //     }
 // 
 //     public f(p) {
@@ -34,7 +34,7 @@
 // class p { }
 // 
 // class foo {
-//     constructor (public[| p|]: any) {
+//     constructor (public [|p|]: any) {
 //     }
 // 
 //     public f(p) {
@@ -57,7 +57,7 @@
 // class p { }
 // 
 // class foo {
-//     constructor (public[| p|]: any) {
+//     constructor (public [|p|]: any) {
 //     }
 // 
 //     public f(p) {
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedObjectLiteralProperties.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedObjectLiteralProperties.baseline.jsonc
index cd93790fc1..5d53579bf7 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedObjectLiteralProperties.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedObjectLiteralProperties.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /referencesForContextuallyTypedObjectLiteralProperties.ts ===
 
-// interface IFoo { /*FIND ALL REFS*/[| xy|]: number; }
+// interface IFoo { /*FIND ALL REFS*/[|xy|]: number; }
 // 
 // // Assignment
 // var a1: IFoo = { xy: 0 };
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedUnionProperties.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedUnionProperties.baseline.jsonc
index 400013c0c7..f27d573b69 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedUnionProperties.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedUnionProperties.baseline.jsonc
@@ -2,8 +2,8 @@
 // === /referencesForContextuallyTypedUnionProperties.ts ===
 
 // interface A {
-//     a: number;[|
-//     /*FIND ALL REFS*/common|]: string;
+//     a: number;
+//     /*FIND ALL REFS*/[|common|]: string;
 // }
 // 
 // interface B {
@@ -15,12 +15,11 @@
 // === findAllReferences ===
 // === /referencesForContextuallyTypedUnionProperties.ts ===
 
-// --- (line: 3) skipped ---
-// }
+// --- (line: 4) skipped ---
 // 
 // interface B {
-//     b: number;[|
-//     /*FIND ALL REFS*/common|]: number;
+//     b: number;
+//     /*FIND ALL REFS*/[|common|]: number;
 // }
 // 
 // // Assignment
@@ -36,7 +35,7 @@
 // }
 // 
 // // Assignment
-// var v1: A | B = { a: 0, /*FIND ALL REFS*/[| common|]: "" };
+// var v1: A | B = { a: 0, /*FIND ALL REFS*/[|common|]: "" };
 // var v2: A | B = { b: 0, common: 3 };
 // 
 // // Function call
@@ -52,7 +51,7 @@
 // 
 // // Assignment
 // var v1: A | B = { a: 0, common: "" };
-// var v2: A | B = { b: 0, /*FIND ALL REFS*/[| common|]: 3 };
+// var v2: A | B = { b: 0, /*FIND ALL REFS*/[|common|]: 3 };
 // 
 // // Function call
 // function consumer(f:  A | B) { }
@@ -68,7 +67,7 @@
 // 
 // // Function call
 // function consumer(f:  A | B) { }
-// consumer({ a: 0, b: 0, /*FIND ALL REFS*/[| common|]: 1 });
+// consumer({ a: 0, b: 0, /*FIND ALL REFS*/[|common|]: 1 });
 // 
 // // Type cast
 // var c = <A | B> { common: 0, b: 0 };
@@ -84,7 +83,7 @@
 // consumer({ a: 0, b: 0, common: 1 });
 // 
 // // Type cast
-// var c = <A | B> { /*FIND ALL REFS*/[| common|]: 0, b: 0 };
+// var c = <A | B> { /*FIND ALL REFS*/[|common|]: 0, b: 0 };
 // 
 // // Array literal
 // var ar: Array<A|B> = [{ a: 0, common: "" }, { b: 0, common: 0 }];
@@ -100,7 +99,7 @@
 // var c = <A | B> { common: 0, b: 0 };
 // 
 // // Array literal
-// var ar: Array<A|B> = [{ a: 0, /*FIND ALL REFS*/[| common|]: "" }, { b: 0, common: 0 }];
+// var ar: Array<A|B> = [{ a: 0, /*FIND ALL REFS*/[|common|]: "" }, { b: 0, common: 0 }];
 // 
 // // Nested object literal
 // var ob: { aorb: A|B } = { aorb: { b: 0, common: 0 } };
@@ -116,7 +115,7 @@
 // var c = <A | B> { common: 0, b: 0 };
 // 
 // // Array literal
-// var ar: Array<A|B> = [{ a: 0, common: "" }, { b: 0, /*FIND ALL REFS*/[| common|]: 0 }];
+// var ar: Array<A|B> = [{ a: 0, common: "" }, { b: 0, /*FIND ALL REFS*/[|common|]: 0 }];
 // 
 // // Nested object literal
 // var ob: { aorb: A|B } = { aorb: { b: 0, common: 0 } };
@@ -132,7 +131,7 @@
 // var ar: Array<A|B> = [{ a: 0, common: "" }, { b: 0, common: 0 }];
 // 
 // // Nested object literal
-// var ob: { aorb: A|B } = { aorb: { b: 0, /*FIND ALL REFS*/[| common|]: 0 } };
+// var ob: { aorb: A|B } = { aorb: { b: 0, /*FIND ALL REFS*/[|common|]: 0 } };
 // 
 // // Widened type
 // var w: A|B = { a:0, common: undefined };
@@ -148,7 +147,7 @@
 // var ob: { aorb: A|B } = { aorb: { b: 0, common: 0 } };
 // 
 // // Widened type
-// var w: A|B = { a:0, /*FIND ALL REFS*/[| common|]: undefined };
+// var w: A|B = { a:0, /*FIND ALL REFS*/[|common|]: undefined };
 // 
 // // Untped -- should not be included
 // var u1 = { a: 0, b: 0, common: "" };
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedUnionProperties2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedUnionProperties2.baseline.jsonc
index 8842b3d9ba..bbb244491d 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedUnionProperties2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForContextuallyTypedUnionProperties2.baseline.jsonc
@@ -1,13 +1,11 @@
 // === findAllReferences ===
 // === /referencesForContextuallyTypedUnionProperties2.ts ===
 
-// interface A {
-//     a: number;
-//     common: string;
+// --- (line: 3) skipped ---
 // }
 // 
-// interface B {[|
-//     /*FIND ALL REFS*/b|]: number;
+// interface B {
+//     /*FIND ALL REFS*/[|b|]: number;
 //     common: number;
 // }
 // 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForEnums.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForEnums.baseline.jsonc
index 0265709331..029ee16b94 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForEnums.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForEnums.baseline.jsonc
@@ -1,9 +1,9 @@
 // === findAllReferences ===
 // === /referencesForEnums.ts ===
 
-// enum E {[|
-//     /*FIND ALL REFS*/value1|] = 1,
-//     "value2" =[| value1|],
+// enum E {
+//     /*FIND ALL REFS*/[|value1|] = 1,
+//     "value2" = [|value1|],
 //     111 = 11
 // }
 // 
@@ -19,13 +19,13 @@
 // === /referencesForEnums.ts ===
 
 // enum E {
-//     value1 = 1,[|
-//     /*FIND ALL REFS*/"value2"|] = value1,
+//     value1 = 1,
+//     /*FIND ALL REFS*/"[|value2|]" = value1,
 //     111 = 11
 // }
 // 
 // E.value1;
-// E[[|"value2"|]];
+// E["[|value2|]"];
 // E.[|value2|];
 // E[111];
 
@@ -36,13 +36,13 @@
 // === /referencesForEnums.ts ===
 
 // enum E {
-//     value1 = 1,[|
-//     "/*FIND ALL REFS*/value2"|] = value1,
+//     value1 = 1,
+//     "/*FIND ALL REFS*/[|value2|]" = value1,
 //     111 = 11
 // }
 // 
 // E.value1;
-// E[[|"value2"|]];
+// E["[|value2|]"];
 // E.[|value2|];
 // E[111];
 
@@ -52,9 +52,9 @@
 // === findAllReferences ===
 // === /referencesForEnums.ts ===
 
-// enum E {[|
-//     value1|] = 1,
-//     "value2" = /*FIND ALL REFS*/[| value1|],
+// enum E {
+//     [|value1|] = 1,
+//     "value2" = /*FIND ALL REFS*/[|value1|],
 //     111 = 11
 // }
 // 
@@ -71,8 +71,8 @@
 
 // enum E {
 //     value1 = 1,
-//     "value2" = value1,[|
-//     /*FIND ALL REFS*/111|] = 11
+//     "value2" = value1,
+//     /*FIND ALL REFS*/[|111|] = 11
 // }
 // 
 // E.value1;
@@ -86,9 +86,9 @@
 // === findAllReferences ===
 // === /referencesForEnums.ts ===
 
-// enum E {[|
-//     value1|] = 1,
-//     "value2" =[| value1|],
+// enum E {
+//     [|value1|] = 1,
+//     "value2" = [|value1|],
 //     111 = 11
 // }
 // 
@@ -104,13 +104,13 @@
 // === /referencesForEnums.ts ===
 
 // enum E {
-//     value1 = 1,[|
-//     "value2"|] = value1,
+//     value1 = 1,
+//     "[|value2|]" = value1,
 //     111 = 11
 // }
 // 
 // E.value1;
-// E["/*FIND ALL REFS*/[|"value2"|]];
+// E["/*FIND ALL REFS*/[|value2|]"];
 // E.[|value2|];
 // E[111];
 
@@ -121,13 +121,13 @@
 // === /referencesForEnums.ts ===
 
 // enum E {
-//     value1 = 1,[|
-//     "value2"|] = value1,
+//     value1 = 1,
+//     "[|value2|]" = value1,
 //     111 = 11
 // }
 // 
 // E.value1;
-// E[[|"value2"|]];
+// E["[|value2|]"];
 // E./*FIND ALL REFS*/[|value2|];
 // E[111];
 
@@ -139,8 +139,8 @@
 
 // enum E {
 //     value1 = 1,
-//     "value2" = value1,[|
-//     111|] = 11
+//     "value2" = value1,
+//     [|111|] = 11
 // }
 // 
 // E.value1;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForExpressionKeywords.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForExpressionKeywords.baseline.jsonc
index 84862a4004..8437d52b03 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForExpressionKeywords.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForExpressionKeywords.baseline.jsonc
@@ -15,8 +15,8 @@
 //     static x = 1;
 // }
 // new C();
-// void C;[|
-// /*FIND ALL REFS*/typeof|] C;
+// void C;
+// /*FIND ALL REFS*/[|typeof|] C;
 // delete C.x;
 // async function* f() {
 //     yield C;
@@ -43,20 +43,20 @@
 // === findAllReferences ===
 // === /referencesForExpressionKeywords.ts ===
 
-// class[| C|] {
+// class [|C|] {
 //     static x = 1;
 // }
-// new[| C|]();
-// void[| C|];
-// typeof[| C|];
-// delete[| C|].x;
+// new [|C|]();
+// void [|C|];
+// typeof [|C|];
+// delete [|C|].x;
 // async function* f() {
-//     yield[| C|];
-//     await[| C|];
+//     yield [|C|];
+//     await [|C|];
 // }
-// "x" in[| C|];
-// undefined /*FIND ALL REFS*/instanceof[| C|];
-// undefined as[| C|];
+// "x" in [|C|];
+// undefined /*FIND ALL REFS*/instanceof [|C|];
+// undefined as [|C|];
 
 
 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForExternalModuleNames.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForExternalModuleNames.baseline.jsonc
index b86cc60874..cb50e2ff6e 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForExternalModuleNames.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForExternalModuleNames.baseline.jsonc
@@ -6,7 +6,7 @@
 // === findAllReferences ===
 // === /referencesForGlobals_1.ts ===
 
-// declare module "/*FIND ALL REFS*/[| "foo"|] {
+// declare module "/*FIND ALL REFS*/[|foo|]" {
 //     var f: number;
 // }
 
@@ -21,11 +21,11 @@
 // === findAllReferences ===
 // === /referencesForGlobals_1.ts ===
 
-// declare module[| "foo"|] {
+// declare module "[|foo|]" {
 //     var f: number;
 // }
 
 
 // === /referencesForGlobals_2.ts ===
 
-// import f = require("/*FIND ALL REFS*/[|"foo"|]);
+// import f = require("/*FIND ALL REFS*/[|foo|]");
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForFunctionOverloads.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForFunctionOverloads.baseline.jsonc
index e32c5f98f7..016ed6831e 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForFunctionOverloads.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForFunctionOverloads.baseline.jsonc
@@ -6,9 +6,9 @@
 // === findAllReferences ===
 // === /referencesForFunctionOverloads.ts ===
 
-// function /*FIND ALL REFS*/[| foo|](x: string);
-// function[| foo|](x: string, y: number) {[|
-//     foo|]('', 43);
+// function /*FIND ALL REFS*/[|foo|](x: string);
+// function [|foo|](x: string, y: number) {
+//     [|foo|]('', 43);
 // }
 
 
@@ -22,9 +22,9 @@
 // === findAllReferences ===
 // === /referencesForFunctionOverloads.ts ===
 
-// function[| foo|](x: string);
-// function /*FIND ALL REFS*/[| foo|](x: string, y: number) {[|
-//     foo|]('', 43);
+// function [|foo|](x: string);
+// function /*FIND ALL REFS*/[|foo|](x: string, y: number) {
+//     [|foo|]('', 43);
 // }
 
 
@@ -33,7 +33,7 @@
 // === findAllReferences ===
 // === /referencesForFunctionOverloads.ts ===
 
-// function[| foo|](x: string);
-// function[| foo|](x: string, y: number) {[|
-//     /*FIND ALL REFS*/foo|]('', 43);
+// function [|foo|](x: string);
+// function [|foo|](x: string, y: number) {
+//     /*FIND ALL REFS*/[|foo|]('', 43);
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForFunctionParameter.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForFunctionParameter.baseline.jsonc
index 9111edbc59..2f6301cdb3 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForFunctionParameter.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForFunctionParameter.baseline.jsonc
@@ -4,9 +4,9 @@
 // var x;
 // var n;
 // 
-// function n(x: number, /*FIND ALL REFS*/[| n|]: number) {[|
-//     n|] = 32;
-//     x =[| n|];
+// function n(x: number, /*FIND ALL REFS*/[|n|]: number) {
+//     [|n|] = 32;
+//     x = [|n|];
 // }
 
 
@@ -18,9 +18,9 @@
 // var x;
 // var n;
 // 
-// function n(x: number,[| n|]: number) {[|
-//     /*FIND ALL REFS*/n|] = 32;
-//     x =[| n|];
+// function n(x: number, [|n|]: number) {
+//     /*FIND ALL REFS*/[|n|] = 32;
+//     x = [|n|];
 // }
 
 
@@ -32,7 +32,7 @@
 // var x;
 // var n;
 // 
-// function n(x: number,[| n|]: number) {[|
-//     n|] = 32;
-//     x = /*FIND ALL REFS*/[| n|];
+// function n(x: number, [|n|]: number) {
+//     [|n|] = 32;
+//     x = /*FIND ALL REFS*/[|n|];
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals.baseline.jsonc
index e749932f2e..5a209fe3fb 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals.baseline.jsonc
@@ -6,7 +6,7 @@
 // === findAllReferences ===
 // === /referencesForGlobals_1.ts ===
 
-// var /*FIND ALL REFS*/[| global|] = 2;
+// var /*FIND ALL REFS*/[|global|] = 2;
 // 
 // class foo {
 //     constructor (public global) { }
@@ -16,14 +16,14 @@
 // 
 // class bar {
 //     constructor () {
-//         var n =[| global|];
+//         var n = [|global|];
 // 
 //         var f = new foo('');
 //         f.global = '';
 //     }
 // }
 // 
-// var k =[| global|];
+// var k = [|global|];
 
 
 
@@ -31,7 +31,7 @@
 // === findAllReferences ===
 // === /referencesForGlobals_1.ts ===
 
-// var[| global|] = 2;
+// var [|global|] = 2;
 // 
 // class foo {
 //     constructor (public global) { }
@@ -41,14 +41,14 @@
 // 
 // class bar {
 //     constructor () {
-//         var n = /*FIND ALL REFS*/[| global|];
+//         var n = /*FIND ALL REFS*/[|global|];
 // 
 //         var f = new foo('');
 //         f.global = '';
 //     }
 // }
 // 
-// var k =[| global|];
+// var k = [|global|];
 
 
 
@@ -56,7 +56,7 @@
 // === findAllReferences ===
 // === /referencesForGlobals_1.ts ===
 
-// var[| global|] = 2;
+// var [|global|] = 2;
 // 
 // class foo {
 //     constructor (public global) { }
@@ -66,14 +66,14 @@
 // 
 // class bar {
 //     constructor () {
-//         var n =[| global|];
+//         var n = [|global|];
 // 
 //         var f = new foo('');
 //         f.global = '';
 //     }
 // }
 // 
-// var k = /*FIND ALL REFS*/[| global|];
+// var k = /*FIND ALL REFS*/[|global|];
 
 
 
@@ -81,7 +81,7 @@
 // === findAllReferences ===
 // === /referencesForGlobals_1.ts ===
 
-// var[| global|] = 2;
+// var [|global|] = 2;
 // 
 // class foo {
 //     constructor (public global) { }
@@ -91,16 +91,16 @@
 // 
 // class bar {
 //     constructor () {
-//         var n =[| global|];
+//         var n = [|global|];
 // 
 //         var f = new foo('');
 //         f.global = '';
 //     }
 // }
 // 
-// var k =[| global|];
+// var k = [|global|];
 
 
 // === /referencesForGlobals_2.ts ===
 
-// var m = /*FIND ALL REFS*/[| global|];
+// var m = /*FIND ALL REFS*/[|global|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals2.baseline.jsonc
index 49f2f38ace..11ee138091 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals2.baseline.jsonc
@@ -6,7 +6,7 @@
 // === findAllReferences ===
 // === /referencesForGlobals_1.ts ===
 
-// class /*FIND ALL REFS*/[| globalClass|] {
+// class /*FIND ALL REFS*/[|globalClass|] {
 //     public f() { }
 // }
 
@@ -16,11 +16,11 @@
 // === findAllReferences ===
 // === /referencesForGlobals_1.ts ===
 
-// class[| globalClass|] {
+// class [|globalClass|] {
 //     public f() { }
 // }
 
 
 // === /referencesForGlobals_2.ts ===
 
-// var c = /*FIND ALL REFS*/[| globalClass|]();
+// var c = /*FIND ALL REFS*/[|globalClass|]();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals3.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals3.baseline.jsonc
index 4e5b2dc728..b35c83faaf 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals3.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals3.baseline.jsonc
@@ -6,7 +6,7 @@
 // === findAllReferences ===
 // === /referencesForGlobals_1.ts ===
 
-// interface /*FIND ALL REFS*/[| globalInterface|] {
+// interface /*FIND ALL REFS*/[|globalInterface|] {
 //      f();
 // }
 
@@ -16,11 +16,11 @@
 // === findAllReferences ===
 // === /referencesForGlobals_1.ts ===
 
-// interface[| globalInterface|] {
+// interface [|globalInterface|] {
 //      f();
 // }
 
 
 // === /referencesForGlobals_2.ts ===
 
-// var i: /*FIND ALL REFS*/[| globalInterface|];
+// var i: /*FIND ALL REFS*/[|globalInterface|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals4.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals4.baseline.jsonc
index 365b7ad331..bc95c07a69 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals4.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals4.baseline.jsonc
@@ -6,7 +6,7 @@
 // === findAllReferences ===
 // === /referencesForGlobals_1.ts ===
 
-// module /*FIND ALL REFS*/[| globalModule|] {
+// module /*FIND ALL REFS*/[|globalModule|] {
 //      export f() { };
 // }
 
@@ -16,11 +16,11 @@
 // === findAllReferences ===
 // === /referencesForGlobals_1.ts ===
 
-// module[| globalModule|] {
+// module [|globalModule|] {
 //      export f() { };
 // }
 
 
 // === /referencesForGlobals_2.ts ===
 
-// var m = /*FIND ALL REFS*/[| globalModule|];
+// var m = /*FIND ALL REFS*/[|globalModule|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals5.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals5.baseline.jsonc
index d7dc8b86e4..e9b86fb55a 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals5.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobals5.baseline.jsonc
@@ -10,7 +10,7 @@
 //     export var x;
 // }
 // 
-// import /*FIND ALL REFS*/[| globalAlias|] = globalModule;
+// import /*FIND ALL REFS*/[|globalAlias|] = globalModule;
 
 
 
@@ -22,9 +22,9 @@
 //     export var x;
 // }
 // 
-// import[| globalAlias|] = globalModule;
+// import [|globalAlias|] = globalModule;
 
 
 // === /referencesForGlobals_2.ts ===
 
-// var m = /*FIND ALL REFS*/[| globalAlias|];
+// var m = /*FIND ALL REFS*/[|globalAlias|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobalsInExternalModule.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobalsInExternalModule.baseline.jsonc
index 4a8f1913eb..7114a2af41 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobalsInExternalModule.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForGlobalsInExternalModule.baseline.jsonc
@@ -6,8 +6,8 @@
 // === findAllReferences ===
 // === /referencesForGlobalsInExternalModule.ts ===
 
-// var /*FIND ALL REFS*/[| topLevelVar|] = 2;
-// var topLevelVar2 =[| topLevelVar|];
+// var /*FIND ALL REFS*/[|topLevelVar|] = 2;
+// var topLevelVar2 = [|topLevelVar|];
 // 
 // class topLevelClass { }
 // var c = new topLevelClass();
@@ -19,8 +19,8 @@
 // === findAllReferences ===
 // === /referencesForGlobalsInExternalModule.ts ===
 
-// var[| topLevelVar|] = 2;
-// var topLevelVar2 = /*FIND ALL REFS*/[| topLevelVar|];
+// var [|topLevelVar|] = 2;
+// var topLevelVar2 = /*FIND ALL REFS*/[|topLevelVar|];
 // 
 // class topLevelClass { }
 // var c = new topLevelClass();
@@ -40,8 +40,8 @@
 // var topLevelVar = 2;
 // var topLevelVar2 = topLevelVar;
 // 
-// class /*FIND ALL REFS*/[| topLevelClass|] { }
-// var c = new[| topLevelClass|]();
+// class /*FIND ALL REFS*/[|topLevelClass|] { }
+// var c = new [|topLevelClass|]();
 // 
 // interface topLevelInterface { }
 // var i: topLevelInterface;
@@ -56,8 +56,8 @@
 // var topLevelVar = 2;
 // var topLevelVar2 = topLevelVar;
 // 
-// class[| topLevelClass|] { }
-// var c = new /*FIND ALL REFS*/[| topLevelClass|]();
+// class [|topLevelClass|] { }
+// var c = new /*FIND ALL REFS*/[|topLevelClass|]();
 // 
 // interface topLevelInterface { }
 // var i: topLevelInterface;
@@ -78,8 +78,8 @@
 // class topLevelClass { }
 // var c = new topLevelClass();
 // 
-// interface /*FIND ALL REFS*/[| topLevelInterface|] { }
-// var i:[| topLevelInterface|];
+// interface /*FIND ALL REFS*/[|topLevelInterface|] { }
+// var i: [|topLevelInterface|];
 // 
 // module topLevelModule {
 //     export var x;
@@ -95,8 +95,8 @@
 // class topLevelClass { }
 // var c = new topLevelClass();
 // 
-// interface[| topLevelInterface|] { }
-// var i: /*FIND ALL REFS*/[| topLevelInterface|];
+// interface [|topLevelInterface|] { }
+// var i: /*FIND ALL REFS*/[|topLevelInterface|];
 // 
 // module topLevelModule {
 //     export var x;
@@ -117,10 +117,10 @@
 // interface topLevelInterface { }
 // var i: topLevelInterface;
 // 
-// module /*FIND ALL REFS*/[| topLevelModule|] {
+// module /*FIND ALL REFS*/[|topLevelModule|] {
 //     export var x;
 // }
-// var x =[| topLevelModule|].x;
+// var x = [|topLevelModule|].x;
 // 
 // export = x;
 
@@ -134,9 +134,9 @@
 // interface topLevelInterface { }
 // var i: topLevelInterface;
 // 
-// module[| topLevelModule|] {
+// module [|topLevelModule|] {
 //     export var x;
 // }
-// var x = /*FIND ALL REFS*/[| topLevelModule|].x;
+// var x = /*FIND ALL REFS*/[|topLevelModule|].x;
 // 
 // export = x;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForIllegalAssignment.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForIllegalAssignment.baseline.jsonc
index 003f992eae..28ad5226e4 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForIllegalAssignment.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForIllegalAssignment.baseline.jsonc
@@ -12,5 +12,5 @@
 // === /referencesForIllegalAssignment.ts ===
 
 // foo = foo;
-// var /*FIND ALL REFS*/[| bar|] = function () { };[|
-// bar|] =[| bar|] + 1;
+// var /*FIND ALL REFS*/[|bar|] = function () { };
+// [|bar|] = [|bar|] + 1;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForImports.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForImports.baseline.jsonc
index e1e5b5afd7..c880ced78a 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForImports.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForImports.baseline.jsonc
@@ -10,8 +10,8 @@
 //     function $(s: string): any;
 //     export = $;
 // }
-// import /*FIND ALL REFS*/[| $|] = require("jquery");[|
-// $|]("a");
+// import /*FIND ALL REFS*/[|$|] = require("jquery");
+// [|$|]("a");
 // import $ = require("jquery");
 
 
@@ -24,8 +24,8 @@
 //     function $(s: string): any;
 //     export = $;
 // }
-// import[| $|] = require("jquery");[|
-// /*FIND ALL REFS*/$|]("a");
+// import [|$|] = require("jquery");
+// /*FIND ALL REFS*/[|$|]("a");
 // import $ = require("jquery");
 
 
@@ -43,4 +43,4 @@
 // }
 // import $ = require("jquery");
 // $("a");
-// import /*FIND ALL REFS*/[| $|] = require("jquery");
+// import /*FIND ALL REFS*/[|$|] = require("jquery");
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForIndexProperty.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForIndexProperty.baseline.jsonc
index b3480ce9e6..9e6d538aff 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForIndexProperty.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForIndexProperty.baseline.jsonc
@@ -1,13 +1,13 @@
 // === findAllReferences ===
 // === /referencesForIndexProperty.ts ===
 
-// class Foo {[|
-//     /*FIND ALL REFS*/property|]: number;
+// class Foo {
+//     /*FIND ALL REFS*/[|property|]: number;
 //     method(): void { }
 // }
 // 
 // var f: Foo;
-// f[[|"property"|]];
+// f["[|property|]"];
 // f["method"];
 
 
@@ -17,13 +17,13 @@
 // === /referencesForIndexProperty.ts ===
 
 // class Foo {
-//     property: number;[|
-//     /*FIND ALL REFS*/method|](): void { }
+//     property: number;
+//     /*FIND ALL REFS*/[|method|](): void { }
 // }
 // 
 // var f: Foo;
 // f["property"];
-// f[[|"method"|]];
+// f["[|method|]"];
 
 
 
@@ -31,13 +31,13 @@
 // === findAllReferences ===
 // === /referencesForIndexProperty.ts ===
 
-// class Foo {[|
-//     property|]: number;
+// class Foo {
+//     [|property|]: number;
 //     method(): void { }
 // }
 // 
 // var f: Foo;
-// f["/*FIND ALL REFS*/[|"property"|]];
+// f["/*FIND ALL REFS*/[|property|]"];
 // f["method"];
 
 
@@ -47,10 +47,10 @@
 // === /referencesForIndexProperty.ts ===
 
 // class Foo {
-//     property: number;[|
-//     method|](): void { }
+//     property: number;
+//     [|method|](): void { }
 // }
 // 
 // var f: Foo;
 // f["property"];
-// f["/*FIND ALL REFS*/[|"method"|]];
+// f["/*FIND ALL REFS*/[|method|]"];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForIndexProperty3.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForIndexProperty3.baseline.jsonc
index ff86ce954f..b7952955f1 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForIndexProperty3.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForIndexProperty3.baseline.jsonc
@@ -1,15 +1,15 @@
 // === findAllReferences ===
 // === /referencesForIndexProperty3.ts ===
 
-// interface Object {[|
-//     /*FIND ALL REFS*/toMyString|]();
+// interface Object {
+//     /*FIND ALL REFS*/[|toMyString|]();
 // }
 // 
 // var y: Object;
 // y.[|toMyString|]();
 // 
 // var x = {};
-// x[[|"toMyString"|]]();
+// x["[|toMyString|]"]();
 
 
 
@@ -17,15 +17,15 @@
 // === findAllReferences ===
 // === /referencesForIndexProperty3.ts ===
 
-// interface Object {[|
-//     toMyString|]();
+// interface Object {
+//     [|toMyString|]();
 // }
 // 
 // var y: Object;
 // y./*FIND ALL REFS*/[|toMyString|]();
 // 
 // var x = {};
-// x[[|"toMyString"|]]();
+// x["[|toMyString|]"]();
 
 
 
@@ -33,12 +33,12 @@
 // === findAllReferences ===
 // === /referencesForIndexProperty3.ts ===
 
-// interface Object {[|
-//     toMyString|]();
+// interface Object {
+//     [|toMyString|]();
 // }
 // 
 // var y: Object;
 // y.[|toMyString|]();
 // 
 // var x = {};
-// x["/*FIND ALL REFS*/[|"toMyString"|]]();
+// x["/*FIND ALL REFS*/[|toMyString|]"]();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties.baseline.jsonc
index d35bd6ed67..8f54db59c2 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties.baseline.jsonc
@@ -1,16 +1,16 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties.ts ===
 
-// interface interface1 {[|
-//     /*FIND ALL REFS*/doStuff|](): void;
+// interface interface1 {
+//     /*FIND ALL REFS*/[|doStuff|](): void;
 // }
 // 
-// interface interface2  extends interface1{[|
-//     doStuff|](): void;
+// interface interface2  extends interface1{
+//     [|doStuff|](): void;
 // }
 // 
-// class class1 implements interface2 {[|
-//     doStuff|]() {
+// class class1 implements interface2 {
+//     [|doStuff|]() {
 // 
 //     }
 // }
@@ -28,16 +28,16 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties.ts ===
 
-// interface interface1 {[|
-//     doStuff|](): void;
+// interface interface1 {
+//     [|doStuff|](): void;
 // }
 // 
-// interface interface2  extends interface1{[|
-//     /*FIND ALL REFS*/doStuff|](): void;
+// interface interface2  extends interface1{
+//     /*FIND ALL REFS*/[|doStuff|](): void;
 // }
 // 
-// class class1 implements interface2 {[|
-//     doStuff|]() {
+// class class1 implements interface2 {
+//     [|doStuff|]() {
 // 
 //     }
 // }
@@ -55,16 +55,16 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties.ts ===
 
-// interface interface1 {[|
-//     doStuff|](): void;
+// interface interface1 {
+//     [|doStuff|](): void;
 // }
 // 
-// interface interface2  extends interface1{[|
-//     doStuff|](): void;
+// interface interface2  extends interface1{
+//     [|doStuff|](): void;
 // }
 // 
-// class class1 implements interface2 {[|
-//     /*FIND ALL REFS*/doStuff|]() {
+// class class1 implements interface2 {
+//     /*FIND ALL REFS*/[|doStuff|]() {
 // 
 //     }
 // }
@@ -82,16 +82,16 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties.ts ===
 
-// interface interface1 {[|
-//     doStuff|](): void;
+// interface interface1 {
+//     [|doStuff|](): void;
 // }
 // 
-// interface interface2  extends interface1{[|
-//     doStuff|](): void;
+// interface interface2  extends interface1{
+//     [|doStuff|](): void;
 // }
 // 
-// class class1 implements interface2 {[|
-//     doStuff|]() {
+// class class1 implements interface2 {
+//     [|doStuff|]() {
 // 
 //     }
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties2.baseline.jsonc
index 4a9cb53984..7a4f317ec3 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties2.baseline.jsonc
@@ -1,19 +1,19 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties2.ts ===
 
-// interface interface1 {[|
-//     /*FIND ALL REFS*/doStuff|](): void;
+// interface interface1 {
+//     /*FIND ALL REFS*/[|doStuff|](): void;
 // }
 // 
-// interface interface2 {[|
-//     doStuff|](): void;
+// interface interface2 {
+//     [|doStuff|](): void;
 // }
 // 
 // interface interface2 extends interface1 {
 // }
 // 
-// class class1 implements interface2 {[|
-//     doStuff|]() {
+// class class1 implements interface2 {
+//     [|doStuff|]() {
 // 
 //     }
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties3.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties3.baseline.jsonc
index d98beac88c..a5eeb3faaf 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties3.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties3.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties3.ts ===
 
-//  interface interface1 extends interface1 {[|
-//     /*FIND ALL REFS*/doStuff|](): void;
+//  interface interface1 extends interface1 {
+//     /*FIND ALL REFS*/[|doStuff|](): void;
 //     propName: string;
 //  }
 // 
@@ -17,8 +17,8 @@
 // === /referencesForInheritedProperties3.ts ===
 
 //  interface interface1 extends interface1 {
-//     doStuff(): void;[|
-//     /*FIND ALL REFS*/propName|]: string;
+//     doStuff(): void;
+//     /*FIND ALL REFS*/[|propName|]: string;
 //  }
 // 
 //  var v: interface1;
@@ -32,8 +32,8 @@
 // === /referencesForInheritedProperties3.ts ===
 
 //  interface interface1 extends interface1 {
-//     doStuff(): void;[|
-//     propName|]: string;
+//     doStuff(): void;
+//     [|propName|]: string;
 //  }
 // 
 //  var v: interface1;
@@ -46,8 +46,8 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties3.ts ===
 
-//  interface interface1 extends interface1 {[|
-//     doStuff|](): void;
+//  interface interface1 extends interface1 {
+//     [|doStuff|](): void;
 //     propName: string;
 //  }
 // 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties4.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties4.baseline.jsonc
index 1de2e1a9e6..ad772764e1 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties4.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties4.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties4.ts ===
 
-//  class class1 extends class1 {[|
-//     /*FIND ALL REFS*/doStuff|]() { }
+//  class class1 extends class1 {
+//     /*FIND ALL REFS*/[|doStuff|]() { }
 //     propName: string;
 //  }
 // 
@@ -17,8 +17,8 @@
 // === /referencesForInheritedProperties4.ts ===
 
 //  class class1 extends class1 {
-//     doStuff() { }[|
-//     /*FIND ALL REFS*/propName|]: string;
+//     doStuff() { }
+//     /*FIND ALL REFS*/[|propName|]: string;
 //  }
 // 
 //  var c: class1;
@@ -31,8 +31,8 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties4.ts ===
 
-//  class class1 extends class1 {[|
-//     doStuff|]() { }
+//  class class1 extends class1 {
+//     [|doStuff|]() { }
 //     propName: string;
 //  }
 // 
@@ -47,8 +47,8 @@
 // === /referencesForInheritedProperties4.ts ===
 
 //  class class1 extends class1 {
-//     doStuff() { }[|
-//     propName|]: string;
+//     doStuff() { }
+//     [|propName|]: string;
 //  }
 // 
 //  var c: class1;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties5.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties5.baseline.jsonc
index 0034250864..6b6dabb357 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties5.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties5.baseline.jsonc
@@ -1,12 +1,12 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties5.ts ===
 
-//  interface interface1 extends interface1 {[|
-//     /*FIND ALL REFS*/doStuff|](): void;
+//  interface interface1 extends interface1 {
+//     /*FIND ALL REFS*/[|doStuff|](): void;
 //     propName: string;
 //  }
-//  interface interface2 extends interface1 {[|
-//     doStuff|](): void;
+//  interface interface2 extends interface1 {
+//     [|doStuff|](): void;
 //     propName: string;
 //  }
 // 
@@ -21,12 +21,12 @@
 // === /referencesForInheritedProperties5.ts ===
 
 //  interface interface1 extends interface1 {
-//     doStuff(): void;[|
-//     /*FIND ALL REFS*/propName|]: string;
+//     doStuff(): void;
+//     /*FIND ALL REFS*/[|propName|]: string;
 //  }
 //  interface interface2 extends interface1 {
-//     doStuff(): void;[|
-//     propName|]: string;
+//     doStuff(): void;
+//     [|propName|]: string;
 //  }
 // 
 //  var v: interface1;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties6.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties6.baseline.jsonc
index 7cddb66af5..09108f9593 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties6.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties6.baseline.jsonc
@@ -1,11 +1,11 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties6.ts ===
 
-// class class1 extends class1 {[|
-//     /*FIND ALL REFS*/doStuff|]() { }
+// class class1 extends class1 {
+//     /*FIND ALL REFS*/[|doStuff|]() { }
 // }
-// class class2 extends class1 {[|
-//     doStuff|]() { }
+// class class2 extends class1 {
+//     [|doStuff|]() { }
 // }
 // 
 // var v: class2;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties7.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties7.baseline.jsonc
index bfc10331b9..c2b2b65e94 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties7.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties7.baseline.jsonc
@@ -1,16 +1,16 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties7.ts ===
 
-//  class class1 extends class1 {[|
-//     /*FIND ALL REFS*/doStuff|]() { }
+//  class class1 extends class1 {
+//     /*FIND ALL REFS*/[|doStuff|]() { }
 //     propName: string;
 //  }
 //  interface interface1 extends interface1 {
 //     doStuff(): void;
 //     propName: string;
 //  }
-//  class class2 extends class1 implements interface1 {[|
-//     doStuff|]() { }
+//  class class2 extends class1 implements interface1 {
+//     [|doStuff|]() { }
 //     propName: string;
 //  }
 // 
@@ -25,16 +25,16 @@
 // === /referencesForInheritedProperties7.ts ===
 
 //  class class1 extends class1 {
-//     doStuff() { }[|
-//     /*FIND ALL REFS*/propName|]: string;
+//     doStuff() { }
+//     /*FIND ALL REFS*/[|propName|]: string;
 //  }
 //  interface interface1 extends interface1 {
 //     doStuff(): void;
 //     propName: string;
 //  }
 //  class class2 extends class1 implements interface1 {
-//     doStuff() { }[|
-//     propName|]: string;
+//     doStuff() { }
+//     [|propName|]: string;
 //  }
 // 
 //  var v: class2;
@@ -51,12 +51,12 @@
 //     doStuff() { }
 //     propName: string;
 //  }
-//  interface interface1 extends interface1 {[|
-//     /*FIND ALL REFS*/doStuff|](): void;
+//  interface interface1 extends interface1 {
+//     /*FIND ALL REFS*/[|doStuff|](): void;
 //     propName: string;
 //  }
-//  class class2 extends class1 implements interface1 {[|
-//     doStuff|]() { }
+//  class class2 extends class1 implements interface1 {
+//     [|doStuff|]() { }
 //     propName: string;
 //  }
 // 
@@ -70,17 +70,15 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties7.ts ===
 
-//  class class1 extends class1 {
-//     doStuff() { }
-//     propName: string;
+// --- (line: 3) skipped ---
 //  }
 //  interface interface1 extends interface1 {
-//     doStuff(): void;[|
-//     /*FIND ALL REFS*/propName|]: string;
+//     doStuff(): void;
+//     /*FIND ALL REFS*/[|propName|]: string;
 //  }
 //  class class2 extends class1 implements interface1 {
-//     doStuff() { }[|
-//     propName|]: string;
+//     doStuff() { }
+//     [|propName|]: string;
 //  }
 // 
 //  var v: class2;
@@ -93,16 +91,16 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties7.ts ===
 
-//  class class1 extends class1 {[|
-//     doStuff|]() { }
+//  class class1 extends class1 {
+//     [|doStuff|]() { }
 //     propName: string;
 //  }
-//  interface interface1 extends interface1 {[|
-//     doStuff|](): void;
+//  interface interface1 extends interface1 {
+//     [|doStuff|](): void;
 //     propName: string;
 //  }
-//  class class2 extends class1 implements interface1 {[|
-//     /*FIND ALL REFS*/doStuff|]() { }
+//  class class2 extends class1 implements interface1 {
+//     /*FIND ALL REFS*/[|doStuff|]() { }
 //     propName: string;
 //  }
 // 
@@ -117,16 +115,16 @@
 // === /referencesForInheritedProperties7.ts ===
 
 //  class class1 extends class1 {
-//     doStuff() { }[|
-//     propName|]: string;
+//     doStuff() { }
+//     [|propName|]: string;
 //  }
 //  interface interface1 extends interface1 {
-//     doStuff(): void;[|
-//     propName|]: string;
+//     doStuff(): void;
+//     [|propName|]: string;
 //  }
 //  class class2 extends class1 implements interface1 {
-//     doStuff() { }[|
-//     /*FIND ALL REFS*/propName|]: string;
+//     doStuff() { }
+//     /*FIND ALL REFS*/[|propName|]: string;
 //  }
 // 
 //  var v: class2;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties8.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties8.baseline.jsonc
index 656520908d..e3ed80d606 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties8.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties8.baseline.jsonc
@@ -1,11 +1,11 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties8.ts ===
 
-// interface C extends D {[|
-//     /*FIND ALL REFS*/propD|]: number;
+// interface C extends D {
+//     /*FIND ALL REFS*/[|propD|]: number;
 // }
-// interface D extends C {[|
-//     propD|]: string;
+// interface D extends C {
+//     [|propD|]: string;
 //     propC: number;
 // }
 // var d: D;
@@ -22,8 +22,8 @@
 //     propD: number;
 // }
 // interface D extends C {
-//     propD: string;[|
-//     /*FIND ALL REFS*/propC|]: number;
+//     propD: string;
+//     /*FIND ALL REFS*/[|propC|]: number;
 // }
 // var d: D;
 // d.propD;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties9.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties9.baseline.jsonc
index b08fb53d2f..bf0a442911 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties9.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForInheritedProperties9.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /referencesForInheritedProperties9.ts ===
 
-//  class D extends C {[|
-//      /*FIND ALL REFS*/prop1|]: string;
+//  class D extends C {
+//      /*FIND ALL REFS*/[|prop1|]: string;
 //  }
 // 
 //  class C extends D {
@@ -18,8 +18,8 @@
 //      prop1: string;
 //  }
 // 
-//  class C extends D {[|
-//      /*FIND ALL REFS*/prop1|]: string;
+//  class C extends D {
+//      /*FIND ALL REFS*/[|prop1|]: string;
 //  }
 // 
 //  var c: C;
@@ -35,8 +35,8 @@
 //      prop1: string;
 //  }
 // 
-//  class C extends D {[|
-//      prop1|]: string;
+//  class C extends D {
+//      [|prop1|]: string;
 //  }
 // 
 //  var c: C;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel.baseline.jsonc
index 09d268e6e1..46a5471d88 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel.baseline.jsonc
@@ -2,8 +2,8 @@
 // === /referencesForLabel.ts ===
 
 // /*FIND ALL REFS*/[|label|]: while (true) {
-//     if (false) break[| label|];
-//     if (true) continue[| label|];
+//     if (false) break [|label|];
+//     if (true) continue [|label|];
 // }
 // 
 // label: while (false) { }
@@ -21,8 +21,8 @@
 // === /referencesForLabel.ts ===
 
 // [|label|]: while (true) {
-//     if (false) break /*FIND ALL REFS*/[| label|];
-//     if (true) continue[| label|];
+//     if (false) break /*FIND ALL REFS*/[|label|];
+//     if (true) continue [|label|];
 // }
 // 
 // label: while (false) { }
@@ -40,8 +40,8 @@
 // === /referencesForLabel.ts ===
 
 // [|label|]: while (true) {
-//     if (false) break[| label|];
-//     if (true) continue /*FIND ALL REFS*/[| label|];
+//     if (false) break [|label|];
+//     if (true) continue /*FIND ALL REFS*/[|label|];
 // }
 // 
 // label: while (false) { }
@@ -56,7 +56,7 @@
 // label: while (true) {
 //     if (false) break label;
 //     if (true) continue label;
-// }[|
+// }
 // 
-// /*FIND ALL REFS*/label|]: while (false) { }
+// /*FIND ALL REFS*/[|label|]: while (false) { }
 // var label = "label";
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel4.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel4.baseline.jsonc
index 9fb06c8f44..8debea0877 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel4.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel4.baseline.jsonc
@@ -3,7 +3,7 @@
 
 // /*FIND ALL REFS*/[|label|]: function foo(label) {
 //     while (true) {
-//         break[| label|];
+//         break [|label|];
 //     }
 // }
 
@@ -20,6 +20,6 @@
 
 // [|label|]: function foo(label) {
 //     while (true) {
-//         break /*FIND ALL REFS*/[| label|];
+//         break /*FIND ALL REFS*/[|label|];
 //     }
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel5.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel5.baseline.jsonc
index f41366162e..199fc94f97 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel5.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel5.baseline.jsonc
@@ -2,13 +2,13 @@
 // === /referencesForLabel5.ts ===
 
 // /*FIND ALL REFS*/[|label|]:  while (true) {
-//             if (false) break[| label|];
+//             if (false) break [|label|];
 //             function blah() {
 // label:          while (true) {
 //                     if (false) break label;
 //                 }
 //             }
-//             if (false) break[| label|];
+//             if (false) break [|label|];
 //         }
 
 
@@ -23,13 +23,13 @@
 // === /referencesForLabel5.ts ===
 
 // [|label|]:  while (true) {
-//             if (false) break /*FIND ALL REFS*/[| label|];
+//             if (false) break /*FIND ALL REFS*/[|label|];
 //             function blah() {
 // label:          while (true) {
 //                     if (false) break label;
 //                 }
 //             }
-//             if (false) break[| label|];
+//             if (false) break [|label|];
 //         }
 
 
@@ -40,9 +40,9 @@
 
 // label:  while (true) {
 //             if (false) break label;
-//             function blah() {[|
-// /*FIND ALL REFS*/label|]:          while (true) {
-//                     if (false) break[| label|];
+//             function blah() {
+// /*FIND ALL REFS*/[|label|]:          while (true) {
+//                     if (false) break [|label|];
 //                 }
 //             }
 //             if (false) break label;
@@ -61,9 +61,9 @@
 
 // label:  while (true) {
 //             if (false) break label;
-//             function blah() {[|
-// label|]:          while (true) {
-//                     if (false) break /*FIND ALL REFS*/[| label|];
+//             function blah() {
+// [|label|]:          while (true) {
+//                     if (false) break /*FIND ALL REFS*/[|label|];
 //                 }
 //             }
 //             if (false) break label;
@@ -81,11 +81,11 @@
 // === /referencesForLabel5.ts ===
 
 // [|label|]:  while (true) {
-//             if (false) break[| label|];
+//             if (false) break [|label|];
 //             function blah() {
 // label:          while (true) {
 //                     if (false) break label;
 //                 }
 //             }
-//             if (false) break /*FIND ALL REFS*/[| label|];
+//             if (false) break /*FIND ALL REFS*/[|label|];
 //         }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel6.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel6.baseline.jsonc
index 2f0fb95d34..014e1b71e1 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel6.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForLabel6.baseline.jsonc
@@ -12,8 +12,8 @@
 // === findAllReferences ===
 // === /referencesForLabel6.ts ===
 
-// labela: while (true) {[|
-// /*FIND ALL REFS*/labelb|]:     while (false) { break[| labelb|]; }
+// labela: while (true) {
+// /*FIND ALL REFS*/[|labelb|]:     while (false) { break [|labelb|]; }
 //             break labelc;
 // }
 
@@ -28,7 +28,7 @@
 // === findAllReferences ===
 // === /referencesForLabel6.ts ===
 
-// labela: while (true) {[|
-// labelb:     while (false) { break /*FIND ALL REFS*/|]:     while (false) { break[| labelb|]; }
+// labela: while (true) {
+// labelb:     while (false) { break /*FIND ALL REFS*/[|labelb|]:     while (false) { break [|labelb|]; }
 //             break labelc;
 // }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations.baseline.jsonc
index b17e210ca3..b530dce8f8 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations.baseline.jsonc
@@ -6,7 +6,7 @@
 // === findAllReferences ===
 // === /referencesForMergedDeclarations.ts ===
 
-// interface /*FIND ALL REFS*/[| Foo|] {
+// interface /*FIND ALL REFS*/[|Foo|] {
 // }
 // 
 // module Foo {
@@ -17,7 +17,7 @@
 // }
 // 
 // var f1: Foo.Bar;
-// var f2:[| Foo|];
+// var f2: [|Foo|];
 // Foo.bind(this);
 
 
@@ -34,14 +34,14 @@
 // interface Foo {
 // }
 // 
-// module /*FIND ALL REFS*/[| Foo|] {
+// module /*FIND ALL REFS*/[|Foo|] {
 //     export interface Bar { }
 // }
 // 
 // function Foo(): void {
 // }
 // 
-// var f1:[| Foo|].Bar;
+// var f1: [|Foo|].Bar;
 // var f2: Foo;
 // Foo.bind(this);
 
@@ -60,12 +60,12 @@
 //     export interface Bar { }
 // }
 // 
-// function /*FIND ALL REFS*/[| Foo|](): void {
+// function /*FIND ALL REFS*/[|Foo|](): void {
 // }
 // 
 // var f1: Foo.Bar;
-// var f2: Foo;[|
-// Foo|].bind(this);
+// var f2: Foo;
+// [|Foo|].bind(this);
 
 
 
@@ -76,14 +76,14 @@
 // interface Foo {
 // }
 // 
-// module[| Foo|] {
+// module [|Foo|] {
 //     export interface Bar { }
 // }
 // 
 // function Foo(): void {
 // }
 // 
-// var f1: /*FIND ALL REFS*/[| Foo|].Bar;
+// var f1: /*FIND ALL REFS*/[|Foo|].Bar;
 // var f2: Foo;
 // Foo.bind(this);
 
@@ -93,7 +93,7 @@
 // === findAllReferences ===
 // === /referencesForMergedDeclarations.ts ===
 
-// interface[| Foo|] {
+// interface [|Foo|] {
 // }
 // 
 // module Foo {
@@ -104,7 +104,7 @@
 // }
 // 
 // var f1: Foo.Bar;
-// var f2: /*FIND ALL REFS*/[| Foo|];
+// var f2: /*FIND ALL REFS*/[|Foo|];
 // Foo.bind(this);
 
 
@@ -117,9 +117,9 @@
 //     export interface Bar { }
 // }
 // 
-// function[| Foo|](): void {
+// function [|Foo|](): void {
 // }
 // 
 // var f1: Foo.Bar;
-// var f2: Foo;[|
-// /*FIND ALL REFS*/Foo|].bind(this);
+// var f2: Foo;
+// /*FIND ALL REFS*/[|Foo|].bind(this);
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations2.baseline.jsonc
index f8d8bbcc2f..823452fb63 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations2.baseline.jsonc
@@ -10,10 +10,10 @@
 // 
 // function ATest() { }
 // 
-// import /*FIND ALL REFS*/[| alias|] = ATest; // definition
+// import /*FIND ALL REFS*/[|alias|] = ATest; // definition
 // 
-// var a:[| alias|].Bar;[| // namespace
-// alias|].call(this); // value
+// var a: [|alias|].Bar; // namespace
+// [|alias|].call(this); // value
 
 
 
@@ -25,10 +25,10 @@
 // 
 // function ATest() { }
 // 
-// import[| alias|] = ATest; // definition
+// import [|alias|] = ATest; // definition
 // 
-// var a: /*FIND ALL REFS*/[| alias|].Bar;[| // namespace
-// alias|].call(this); // value
+// var a: /*FIND ALL REFS*/[|alias|].Bar; // namespace
+// [|alias|].call(this); // value
 
 
 
@@ -40,7 +40,7 @@
 // 
 // function ATest() { }
 // 
-// import[| alias|] = ATest; // definition
+// import [|alias|] = ATest; // definition
 // 
-// var a:[| alias|].Bar;[| // namespace
-// /*FIND ALL REFS*/alias|].call(this); // value
+// var a: [|alias|].Bar; // namespace
+// /*FIND ALL REFS*/[|alias|].call(this); // value
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations3.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations3.baseline.jsonc
index e3d7f5b00a..34f1c62143 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations3.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations3.baseline.jsonc
@@ -6,14 +6,14 @@
 //     method() { }
 // }
 // 
-// module /*FIND ALL REFS*/[| testClass|] {
+// module /*FIND ALL REFS*/[|testClass|] {
 //     export interface Bar {
 // 
 //     }
 // }
 // 
 // var c1: testClass;
-// var c2:[| testClass|].Bar;
+// var c2: [|testClass|].Bar;
 // testClass.staticMethod();
 // testClass.prototype.method();
 // testClass.bind(this);
@@ -25,7 +25,7 @@
 // === findAllReferences ===
 // === /referencesForMergedDeclarations3.ts ===
 
-// class /*FIND ALL REFS*/[| testClass|] {
+// class /*FIND ALL REFS*/[|testClass|] {
 //     static staticMethod() { }
 //     method() { }
 // }
@@ -36,9 +36,9 @@
 //     }
 // }
 // 
-// var c1:[| testClass|];
-// var c2: testClass.Bar;[|
-// testClass|].staticMethod();[|
-// testClass|].prototype.method();[|
-// testClass|].bind(this);
-// new[| testClass|]();
+// var c1: [|testClass|];
+// var c2: testClass.Bar;
+// [|testClass|].staticMethod();
+// [|testClass|].prototype.method();
+// [|testClass|].bind(this);
+// new [|testClass|]();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations4.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations4.baseline.jsonc
index fc6ea58a92..783f54a93b 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations4.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations4.baseline.jsonc
@@ -6,25 +6,25 @@
 // === findAllReferences ===
 // === /referencesForMergedDeclarations4.ts ===
 
-// class /*FIND ALL REFS*/[| testClass|] {
+// class /*FIND ALL REFS*/[|testClass|] {
 //     static staticMethod() { }
 //     method() { }
 // }
 // 
-// module[| testClass|] {
+// module [|testClass|] {
 //     export interface Bar {
 // 
 //     }
 //     export var s = 0;
 // }
 // 
-// var c1:[| testClass|];
-// var c2:[| testClass|].Bar;[|
-// testClass|].staticMethod();[|
-// testClass|].prototype.method();[|
-// testClass|].bind(this);[|
-// testClass|].s;
-// new[| testClass|]();
+// var c1: [|testClass|];
+// var c2: [|testClass|].Bar;
+// [|testClass|].staticMethod();
+// [|testClass|].prototype.method();
+// [|testClass|].bind(this);
+// [|testClass|].s;
+// new [|testClass|]();
 
 
 
@@ -37,25 +37,25 @@
 // === findAllReferences ===
 // === /referencesForMergedDeclarations4.ts ===
 
-// class[| testClass|] {
+// class [|testClass|] {
 //     static staticMethod() { }
 //     method() { }
 // }
 // 
-// module /*FIND ALL REFS*/[| testClass|] {
+// module /*FIND ALL REFS*/[|testClass|] {
 //     export interface Bar {
 // 
 //     }
 //     export var s = 0;
 // }
 // 
-// var c1:[| testClass|];
-// var c2:[| testClass|].Bar;[|
-// testClass|].staticMethod();[|
-// testClass|].prototype.method();[|
-// testClass|].bind(this);[|
-// testClass|].s;
-// new[| testClass|]();
+// var c1: [|testClass|];
+// var c2: [|testClass|].Bar;
+// [|testClass|].staticMethod();
+// [|testClass|].prototype.method();
+// [|testClass|].bind(this);
+// [|testClass|].s;
+// new [|testClass|]();
 
 
 
@@ -63,25 +63,25 @@
 // === findAllReferences ===
 // === /referencesForMergedDeclarations4.ts ===
 
-// class[| testClass|] {
+// class [|testClass|] {
 //     static staticMethod() { }
 //     method() { }
 // }
 // 
-// module[| testClass|] {
+// module [|testClass|] {
 //     export interface Bar {
 // 
 //     }
 //     export var s = 0;
 // }
 // 
-// var c1: /*FIND ALL REFS*/[| testClass|];
-// var c2:[| testClass|].Bar;[|
-// testClass|].staticMethod();[|
-// testClass|].prototype.method();[|
-// testClass|].bind(this);[|
-// testClass|].s;
-// new[| testClass|]();
+// var c1: /*FIND ALL REFS*/[|testClass|];
+// var c2: [|testClass|].Bar;
+// [|testClass|].staticMethod();
+// [|testClass|].prototype.method();
+// [|testClass|].bind(this);
+// [|testClass|].s;
+// new [|testClass|]();
 
 
 
@@ -89,25 +89,25 @@
 // === findAllReferences ===
 // === /referencesForMergedDeclarations4.ts ===
 
-// class[| testClass|] {
+// class [|testClass|] {
 //     static staticMethod() { }
 //     method() { }
 // }
 // 
-// module[| testClass|] {
+// module [|testClass|] {
 //     export interface Bar {
 // 
 //     }
 //     export var s = 0;
 // }
 // 
-// var c1:[| testClass|];
-// var c2: /*FIND ALL REFS*/[| testClass|].Bar;[|
-// testClass|].staticMethod();[|
-// testClass|].prototype.method();[|
-// testClass|].bind(this);[|
-// testClass|].s;
-// new[| testClass|]();
+// var c1: [|testClass|];
+// var c2: /*FIND ALL REFS*/[|testClass|].Bar;
+// [|testClass|].staticMethod();
+// [|testClass|].prototype.method();
+// [|testClass|].bind(this);
+// [|testClass|].s;
+// new [|testClass|]();
 
 
 
@@ -115,25 +115,25 @@
 // === findAllReferences ===
 // === /referencesForMergedDeclarations4.ts ===
 
-// class[| testClass|] {
+// class [|testClass|] {
 //     static staticMethod() { }
 //     method() { }
 // }
 // 
-// module[| testClass|] {
+// module [|testClass|] {
 //     export interface Bar {
 // 
 //     }
 //     export var s = 0;
 // }
 // 
-// var c1:[| testClass|];
-// var c2:[| testClass|].Bar;[|
-// /*FIND ALL REFS*/testClass|].staticMethod();[|
-// testClass|].prototype.method();[|
-// testClass|].bind(this);[|
-// testClass|].s;
-// new[| testClass|]();
+// var c1: [|testClass|];
+// var c2: [|testClass|].Bar;
+// /*FIND ALL REFS*/[|testClass|].staticMethod();
+// [|testClass|].prototype.method();
+// [|testClass|].bind(this);
+// [|testClass|].s;
+// new [|testClass|]();
 
 
 
@@ -141,25 +141,25 @@
 // === findAllReferences ===
 // === /referencesForMergedDeclarations4.ts ===
 
-// class[| testClass|] {
+// class [|testClass|] {
 //     static staticMethod() { }
 //     method() { }
 // }
 // 
-// module[| testClass|] {
+// module [|testClass|] {
 //     export interface Bar {
 // 
 //     }
 //     export var s = 0;
 // }
 // 
-// var c1:[| testClass|];
-// var c2:[| testClass|].Bar;[|
-// testClass|].staticMethod();[|
-// /*FIND ALL REFS*/testClass|].prototype.method();[|
-// testClass|].bind(this);[|
-// testClass|].s;
-// new[| testClass|]();
+// var c1: [|testClass|];
+// var c2: [|testClass|].Bar;
+// [|testClass|].staticMethod();
+// /*FIND ALL REFS*/[|testClass|].prototype.method();
+// [|testClass|].bind(this);
+// [|testClass|].s;
+// new [|testClass|]();
 
 
 
@@ -167,25 +167,25 @@
 // === findAllReferences ===
 // === /referencesForMergedDeclarations4.ts ===
 
-// class[| testClass|] {
+// class [|testClass|] {
 //     static staticMethod() { }
 //     method() { }
 // }
 // 
-// module[| testClass|] {
+// module [|testClass|] {
 //     export interface Bar {
 // 
 //     }
 //     export var s = 0;
 // }
 // 
-// var c1:[| testClass|];
-// var c2:[| testClass|].Bar;[|
-// testClass|].staticMethod();[|
-// testClass|].prototype.method();[|
-// /*FIND ALL REFS*/testClass|].bind(this);[|
-// testClass|].s;
-// new[| testClass|]();
+// var c1: [|testClass|];
+// var c2: [|testClass|].Bar;
+// [|testClass|].staticMethod();
+// [|testClass|].prototype.method();
+// /*FIND ALL REFS*/[|testClass|].bind(this);
+// [|testClass|].s;
+// new [|testClass|]();
 
 
 
@@ -193,25 +193,25 @@
 // === findAllReferences ===
 // === /referencesForMergedDeclarations4.ts ===
 
-// class[| testClass|] {
+// class [|testClass|] {
 //     static staticMethod() { }
 //     method() { }
 // }
 // 
-// module[| testClass|] {
+// module [|testClass|] {
 //     export interface Bar {
 // 
 //     }
 //     export var s = 0;
 // }
 // 
-// var c1:[| testClass|];
-// var c2:[| testClass|].Bar;[|
-// testClass|].staticMethod();[|
-// testClass|].prototype.method();[|
-// testClass|].bind(this);[|
-// /*FIND ALL REFS*/testClass|].s;
-// new[| testClass|]();
+// var c1: [|testClass|];
+// var c2: [|testClass|].Bar;
+// [|testClass|].staticMethod();
+// [|testClass|].prototype.method();
+// [|testClass|].bind(this);
+// /*FIND ALL REFS*/[|testClass|].s;
+// new [|testClass|]();
 
 
 
@@ -219,22 +219,22 @@
 // === findAllReferences ===
 // === /referencesForMergedDeclarations4.ts ===
 
-// class[| testClass|] {
+// class [|testClass|] {
 //     static staticMethod() { }
 //     method() { }
 // }
 // 
-// module[| testClass|] {
+// module [|testClass|] {
 //     export interface Bar {
 // 
 //     }
 //     export var s = 0;
 // }
 // 
-// var c1:[| testClass|];
-// var c2:[| testClass|].Bar;[|
-// testClass|].staticMethod();[|
-// testClass|].prototype.method();[|
-// testClass|].bind(this);[|
-// testClass|].s;
-// new /*FIND ALL REFS*/[| testClass|]();
+// var c1: [|testClass|];
+// var c2: [|testClass|].Bar;
+// [|testClass|].staticMethod();
+// [|testClass|].prototype.method();
+// [|testClass|].bind(this);
+// [|testClass|].s;
+// new /*FIND ALL REFS*/[|testClass|]();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations5.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations5.baseline.jsonc
index 00daaadada..0fe019045e 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations5.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations5.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /referencesForMergedDeclarations5.ts ===
 
-// interface /*FIND ALL REFS*/[| Foo|] { }
+// interface /*FIND ALL REFS*/[|Foo|] { }
 // module Foo { export interface Bar { } }
 // function Foo() { }
 // 
@@ -14,7 +14,7 @@
 // === /referencesForMergedDeclarations5.ts ===
 
 // interface Foo { }
-// module /*FIND ALL REFS*/[| Foo|] { export interface Bar { } }
+// module /*FIND ALL REFS*/[|Foo|] { export interface Bar { } }
 // function Foo() { }
 // 
 // export = Foo;
@@ -27,9 +27,9 @@
 
 // interface Foo { }
 // module Foo { export interface Bar { } }
-// function /*FIND ALL REFS*/[| Foo|]() { }
+// function /*FIND ALL REFS*/[|Foo|]() { }
 // 
-// export =[| Foo|];
+// export = [|Foo|];
 
 
 
@@ -39,6 +39,6 @@
 
 // interface Foo { }
 // module Foo { export interface Bar { } }
-// function[| Foo|]() { }
+// function [|Foo|]() { }
 // 
-// export = /*FIND ALL REFS*/[| Foo|];
+// export = /*FIND ALL REFS*/[|Foo|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations6.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations6.baseline.jsonc
index 99919e9393..6b2e494b70 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations6.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations6.baseline.jsonc
@@ -7,14 +7,14 @@
 // === /referencesForMergedDeclarations6.ts ===
 
 // interface Foo { }
-// module /*FIND ALL REFS*/[| Foo|] {
+// module /*FIND ALL REFS*/[|Foo|] {
 //     export interface Bar { }
 //     export module Bar { export interface Baz { } }
 //     export function Bar() { }
 // }
 // 
 // // module
-// import a1 =[| Foo|];
+// import a1 = [|Foo|];
 
 
 
@@ -23,11 +23,11 @@
 // === /referencesForMergedDeclarations6.ts ===
 
 // interface Foo { }
-// module[| Foo|] {
+// module [|Foo|] {
 //     export interface Bar { }
 //     export module Bar { export interface Baz { } }
 //     export function Bar() { }
 // }
 // 
 // // module
-// import a1 = /*FIND ALL REFS*/[| Foo|];
+// import a1 = /*FIND ALL REFS*/[|Foo|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations7.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations7.baseline.jsonc
index 2e180271ca..65002364fe 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations7.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations7.baseline.jsonc
@@ -3,7 +3,7 @@
 
 // interface Foo { }
 // module Foo {
-//     export interface /*FIND ALL REFS*/[| Bar|] { }
+//     export interface /*FIND ALL REFS*/[|Bar|] { }
 //     export module Bar { export interface Baz { } }
 //     export function Bar() { }
 // }
@@ -18,7 +18,7 @@
 // interface Foo { }
 // module Foo {
 //     export interface Bar { }
-//     export module /*FIND ALL REFS*/[| Bar|] { export interface Baz { } }
+//     export module /*FIND ALL REFS*/[|Bar|] { export interface Baz { } }
 //     export function Bar() { }
 // }
 // 
@@ -35,7 +35,7 @@
 // module Foo {
 //     export interface Bar { }
 //     export module Bar { export interface Baz { } }
-//     export function /*FIND ALL REFS*/[| Bar|]() { }
+//     export function /*FIND ALL REFS*/[|Bar|]() { }
 // }
 // 
 // // module, value and type
@@ -50,7 +50,7 @@
 // interface Foo { }
 // module Foo {
 //     export interface Bar { }
-//     export module[| Bar|] { export interface Baz { } }
+//     export module [|Bar|] { export interface Baz { } }
 //     export function Bar() { }
 // }
 // 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations8.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations8.baseline.jsonc
index d0264584d1..692610742a 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations8.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForMergedDeclarations8.baseline.jsonc
@@ -9,7 +9,7 @@
 // interface Foo { }
 // module Foo {
 //     export interface Bar { }
-//     export module /*FIND ALL REFS*/[| Bar|] { export interface Baz { } }
+//     export module /*FIND ALL REFS*/[|Bar|] { export interface Baz { } }
 //     export function Bar() { }
 // }
 // 
@@ -24,9 +24,9 @@
 
 // interface Foo { }
 // module Foo {
-//     export interface[| Bar|] { }
-//     export module[| Bar|] { export interface Baz { } }
-//     export function[| Bar|]() { }
+//     export interface [|Bar|] { }
+//     export module [|Bar|] { export interface Baz { } }
+//     export function [|Bar|]() { }
 // }
 // 
 // // module
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForNumericLiteralPropertyNames.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForNumericLiteralPropertyNames.baseline.jsonc
index 13e9ba9401..c21f9d1a71 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForNumericLiteralPropertyNames.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForNumericLiteralPropertyNames.baseline.jsonc
@@ -2,7 +2,7 @@
 // === /referencesForNumericLiteralPropertyNames.ts ===
 
 // class Foo {
-//     public /*FIND ALL REFS*/[| 12|]: any;
+//     public /*FIND ALL REFS*/[|12|]: any;
 // }
 // 
 // var x: Foo;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForObjectLiteralProperties.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForObjectLiteralProperties.baseline.jsonc
index 1b722e46a8..c4b651e95e 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForObjectLiteralProperties.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForObjectLiteralProperties.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /referencesForObjectLiteralProperties.ts ===
 
-// var x = { /*FIND ALL REFS*/[| add|]: 0, b: "string" };
-// x[[|"add"|]];
+// var x = { /*FIND ALL REFS*/[|add|]: 0, b: "string" };
+// x["[|add|]"];
 // x.[|add|];
 // var y = x;
 // y.[|add|];
@@ -13,8 +13,8 @@
 // === findAllReferences ===
 // === /referencesForObjectLiteralProperties.ts ===
 
-// var x = {[| add|]: 0, b: "string" };
-// x["/*FIND ALL REFS*/[|"add"|]];
+// var x = { [|add|]: 0, b: "string" };
+// x["/*FIND ALL REFS*/[|add|]"];
 // x.[|add|];
 // var y = x;
 // y.[|add|];
@@ -25,8 +25,8 @@
 // === findAllReferences ===
 // === /referencesForObjectLiteralProperties.ts ===
 
-// var x = {[| add|]: 0, b: "string" };
-// x[[|"add"|]];
+// var x = { [|add|]: 0, b: "string" };
+// x["[|add|]"];
 // x./*FIND ALL REFS*/[|add|];
 // var y = x;
 // y.[|add|];
@@ -37,8 +37,8 @@
 // === findAllReferences ===
 // === /referencesForObjectLiteralProperties.ts ===
 
-// var x = {[| add|]: 0, b: "string" };
-// x[[|"add"|]];
+// var x = { [|add|]: 0, b: "string" };
+// x["[|add|]"];
 // x.[|add|];
 // var y = x;
 // y./*FIND ALL REFS*/[|add|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForOverrides.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForOverrides.baseline.jsonc
index 69c860e2e4..f23de46f3f 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForOverrides.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForOverrides.baseline.jsonc
@@ -4,11 +4,11 @@
 // module FindRef3 {
 // 	module SimpleClassTest {
 // 		export class Foo {
-// 			public /*FIND ALL REFS*/[| foo|](): void {
+// 			public /*FIND ALL REFS*/[|foo|](): void {
 // 			}
 // 		}
 // 		export class Bar extends Foo {
-// 			public[| foo|](): void {
+// 			public [|foo|](): void {
 // 			}
 // 		}
 // 	}
@@ -31,15 +31,14 @@
 // === findAllReferences ===
 // === /referencesForOverrides.ts ===
 
-// --- (line: 10) skipped ---
-// 	}
+// --- (line: 11) skipped ---
 // 
 // 	module SimpleInterfaceTest {
-// 		export interface IFoo {[|
-// 			/*FIND ALL REFS*/ifoo|](): void;
+// 		export interface IFoo {
+// 			/*FIND ALL REFS*/[|ifoo|](): void;
 // 		}
-// 		export interface IBar extends IFoo {[|
-// 			ifoo|](): void;
+// 		export interface IBar extends IFoo {
+// 			[|ifoo|](): void;
 // 		}
 // 	}
 // 
@@ -62,15 +61,14 @@
 // === findAllReferences ===
 // === /referencesForOverrides.ts ===
 
-// --- (line: 19) skipped ---
-// 	}
+// --- (line: 20) skipped ---
 // 
 // 	module SimpleClassInterfaceTest {
-// 		export interface IFoo {[|
-// 			/*FIND ALL REFS*/icfoo|](): void;
+// 		export interface IFoo {
+// 			/*FIND ALL REFS*/[|icfoo|](): void;
 // 		}
 // 		export class Bar implements IFoo {
-// 			public[| icfoo|](): void {
+// 			public [|icfoo|](): void {
 // 			}
 // 		}
 // 	}
@@ -93,21 +91,20 @@
 // === findAllReferences ===
 // === /referencesForOverrides.ts ===
 
-// --- (line: 29) skipped ---
-// 	}
+// --- (line: 30) skipped ---
 // 
 // 	module Test {
-// 		export interface IBase {[|
-// 			/*FIND ALL REFS*/field|]: string;
+// 		export interface IBase {
+// 			/*FIND ALL REFS*/[|field|]: string;
 // 			method(): void;
 // 		}
 // 
-// 		export interface IBlah extends IBase {[|
-// 			field|]: string;
+// 		export interface IBlah extends IBase {
+// 			[|field|]: string;
 // 		}
 // 
-// 		export interface IBlah2 extends IBlah {[|
-// 			field|]: string;
+// 		export interface IBlah2 extends IBlah {
+// 			[|field|]: string;
 // 		}
 // 
 // 		export interface IDerived extends IBlah2 {
@@ -115,12 +112,12 @@
 // 		}
 // 
 // 		export class Bar implements IDerived {
-// 			public[| field|]: string;
+// 			public [|field|]: string;
 // 			public method(): void { }
 // 		}
 // 
 // 		export class BarBlah extends Bar {
-// 			public[| field|]: string;
+// 			public [|field|]: string;
 // 		}
 // 	}
 // 
@@ -142,29 +139,27 @@
 // === findAllReferences ===
 // === /referencesForOverrides.ts ===
 
-// --- (line: 30) skipped ---
-// 
+// --- (line: 31) skipped ---
 // 	module Test {
 // 		export interface IBase {
-// 			field: string;[|
-// 			/*FIND ALL REFS*/method|](): void;
+// 			field: string;
+// 			/*FIND ALL REFS*/[|method|](): void;
 // 		}
 // 
 // 		export interface IBlah extends IBase {
 // // --- (line: 39) skipped ---
 
 
-// --- (line: 42) skipped ---
-// 			field: string;
+// --- (line: 43) skipped ---
 // 		}
 // 
-// 		export interface IDerived extends IBlah2 {[|
-// 			method|](): void;
+// 		export interface IDerived extends IBlah2 {
+// 			[|method|](): void;
 // 		}
 // 
 // 		export class Bar implements IDerived {
 // 			public field: string;
-// 			public[| method|](): void { }
+// 			public [|method|](): void { }
 // 		}
 // 
 // 		export class BarBlah extends Bar {
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForPropertiesOfGenericType.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForPropertiesOfGenericType.baseline.jsonc
index 52afb5b4fb..f6074b0c5a 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForPropertiesOfGenericType.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForPropertiesOfGenericType.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /referencesForPropertiesOfGenericType.ts ===
 
-// interface IFoo<T> {[|
-//     /*FIND ALL REFS*/doSomething|](v: T): T;
+// interface IFoo<T> {
+//     /*FIND ALL REFS*/[|doSomething|](v: T): T;
 // }
 // 
 // var x: IFoo<string>;
@@ -17,8 +17,8 @@
 // === findAllReferences ===
 // === /referencesForPropertiesOfGenericType.ts ===
 
-// interface IFoo<T> {[|
-//     doSomething|](v: T): T;
+// interface IFoo<T> {
+//     [|doSomething|](v: T): T;
 // }
 // 
 // var x: IFoo<string>;
@@ -33,8 +33,8 @@
 // === findAllReferences ===
 // === /referencesForPropertiesOfGenericType.ts ===
 
-// interface IFoo<T> {[|
-//     doSomething|](v: T): T;
+// interface IFoo<T> {
+//     [|doSomething|](v: T): T;
 // }
 // 
 // var x: IFoo<string>;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStatic.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStatic.baseline.jsonc
index 94d16cef9d..0f1ecaf3ce 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStatic.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStatic.baseline.jsonc
@@ -9,7 +9,7 @@
 // var n = 43;
 // 
 // class foo {
-//     static /*FIND ALL REFS*/[| n|] = '';
+//     static /*FIND ALL REFS*/[|n|] = '';
 // 
 //     public bar() {
 //         foo.[|n|] = "'";
@@ -39,7 +39,7 @@
 // var n = 43;
 // 
 // class foo {
-//     static[| n|] = '';
+//     static [|n|] = '';
 // 
 //     public bar() {
 //         foo./*FIND ALL REFS*/[|n|] = "'";
@@ -69,7 +69,7 @@
 // var n = 43;
 // 
 // class foo {
-//     static[| n|] = '';
+//     static [|n|] = '';
 // 
 //     public bar() {
 //         foo.[|n|] = "'";
@@ -99,7 +99,7 @@
 // var n = 43;
 // 
 // class foo {
-//     static[| n|] = '';
+//     static [|n|] = '';
 // 
 //     public bar() {
 //         foo.[|n|] = "'";
@@ -129,7 +129,7 @@
 // var n = 43;
 // 
 // class foo {
-//     static[| n|] = '';
+//     static [|n|] = '';
 // 
 //     public bar() {
 //         foo.[|n|] = "'";
@@ -159,7 +159,7 @@
 // var n = 43;
 // 
 // class foo {
-//     static[| n|] = '';
+//     static [|n|] = '';
 // 
 //     public bar() {
 //         foo.[|n|] = "'";
@@ -189,7 +189,7 @@
 // var n = 43;
 // 
 // class foo {
-//     static[| n|] = '';
+//     static [|n|] = '';
 // 
 //     public bar() {
 //         foo.[|n|] = "'";
@@ -219,7 +219,7 @@
 // var n = 43;
 // 
 // class foo {
-//     static[| n|] = '';
+//     static [|n|] = '';
 // 
 //     public bar() {
 //         foo.[|n|] = "'";
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStaticsAndMembersWithSameNames.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStaticsAndMembersWithSameNames.baseline.jsonc
index 914c40aba7..fdeb89029f 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStaticsAndMembersWithSameNames.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStaticsAndMembersWithSameNames.baseline.jsonc
@@ -3,8 +3,8 @@
 
 // module FindRef4 {
 // 	module MixedStaticsClassTest {
-// 		export class Foo {[|
-// 			/*FIND ALL REFS*/bar|]: Foo;
+// 		export class Foo {
+// 			/*FIND ALL REFS*/[|bar|]: Foo;
 // 			static bar: Foo;
 // 
 // 			public foo(): void {
@@ -36,7 +36,7 @@
 // 	module MixedStaticsClassTest {
 // 		export class Foo {
 // 			bar: Foo;
-// 			static /*FIND ALL REFS*/[| bar|]: Foo;
+// 			static /*FIND ALL REFS*/[|bar|]: Foo;
 // 
 // 			public foo(): void {
 // 			}
@@ -66,7 +66,7 @@
 // 			bar: Foo;
 // 			static bar: Foo;
 // 
-// 			public /*FIND ALL REFS*/[| foo|](): void {
+// 			public /*FIND ALL REFS*/[|foo|](): void {
 // 			}
 // 			public static foo(): void {
 // 			}
@@ -97,7 +97,7 @@
 // 
 // 			public foo(): void {
 // 			}
-// 			public static /*FIND ALL REFS*/[| foo|](): void {
+// 			public static /*FIND ALL REFS*/[|foo|](): void {
 // 			}
 // 		}
 // 	}
@@ -123,7 +123,7 @@
 // 			bar: Foo;
 // 			static bar: Foo;
 // 
-// 			public[| foo|](): void {
+// 			public [|foo|](): void {
 // 			}
 // 			public static foo(): void {
 // 			}
@@ -147,8 +147,8 @@
 
 // module FindRef4 {
 // 	module MixedStaticsClassTest {
-// 		export class Foo {[|
-// 			bar|]: Foo;
+// 		export class Foo {
+// 			[|bar|]: Foo;
 // 			static bar: Foo;
 // 
 // 			public foo(): void {
@@ -175,7 +175,7 @@
 // 
 // 			public foo(): void {
 // 			}
-// 			public static[| foo|](): void {
+// 			public static [|foo|](): void {
 // 			}
 // 		}
 // 	}
@@ -201,7 +201,7 @@
 // 	module MixedStaticsClassTest {
 // 		export class Foo {
 // 			bar: Foo;
-// 			static[| bar|]: Foo;
+// 			static [|bar|]: Foo;
 // 
 // 			public foo(): void {
 // 			}
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames.baseline.jsonc
index 2ad311474a..b4eed576ab 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames.baseline.jsonc
@@ -2,11 +2,11 @@
 // === /referencesForStringLiteralPropertyNames.ts ===
 
 // class Foo {
-//     public "/*FIND ALL REFS*/[| "ss"|]: any;
+//     public "/*FIND ALL REFS*/[|ss|]": any;
 // }
 // 
 // var x: Foo;
 // x.[|ss|];
-// x[[|"ss"|]];
+// x["[|ss|]"];
 // x = { "ss": 0 };
 // x = { ss: 0 };
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames2.baseline.jsonc
index 033f8de8ee..970e7d9bfc 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames2.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /referencesForStringLiteralPropertyNames2.ts ===
 
-// class Foo {[|
-//     /*FIND ALL REFS*/"blah"|]() { return 0; }
+// class Foo {
+//     /*FIND ALL REFS*/"[|blah|]"() { return 0; }
 // }
 // 
 // var x: Foo;
@@ -14,8 +14,8 @@
 // === findAllReferences ===
 // === /referencesForStringLiteralPropertyNames2.ts ===
 
-// class Foo {[|
-//     "/*FIND ALL REFS*/blah"|]() { return 0; }
+// class Foo {
+//     "/*FIND ALL REFS*/[|blah|]"() { return 0; }
 // }
 // 
 // var x: Foo;
@@ -27,8 +27,8 @@
 // === findAllReferences ===
 // === /referencesForStringLiteralPropertyNames2.ts ===
 
-// class Foo {[|
-//     "blah"|]() { return 0; }
+// class Foo {
+//     "[|blah|]"() { return 0; }
 // }
 // 
 // var x: Foo;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames3.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames3.baseline.jsonc
index 5e70ce6c41..7cd632b740 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames3.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames3.baseline.jsonc
@@ -7,8 +7,8 @@
 // === /referencesForStringLiteralPropertyNames3.ts ===
 
 // class Foo2 {
-//     get "/*FIND ALL REFS*/[| "42"|]() { return 0; }
-//     set[| 42|](n) { }
+//     get "/*FIND ALL REFS*/[|42|]"() { return 0; }
+//     set [|42|](n) { }
 // }
 // 
 // var y: Foo2;
@@ -26,8 +26,8 @@
 // === /referencesForStringLiteralPropertyNames3.ts ===
 
 // class Foo2 {
-//     get[| "42"|]() { return 0; }
-//     set /*FIND ALL REFS*/[| 42|](n) { }
+//     get "[|42|]"() { return 0; }
+//     set /*FIND ALL REFS*/[|42|](n) { }
 // }
 // 
 // var y: Foo2;
@@ -40,8 +40,8 @@
 // === /referencesForStringLiteralPropertyNames3.ts ===
 
 // class Foo2 {
-//     get[| "42"|]() { return 0; }
-//     set[| 42|](n) { }
+//     get "[|42|]"() { return 0; }
+//     set [|42|](n) { }
 // }
 // 
 // var y: Foo2;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames4.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames4.baseline.jsonc
index 554d2a2b83..8cb9891027 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames4.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames4.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /referencesForStringLiteralPropertyNames4.ts ===
 
-// var x = { "/*FIND ALL REFS*/[| "someProperty"|]: 0 }
-// x[[|"someProperty"|]] = 3;
+// var x = { "/*FIND ALL REFS*/[|someProperty|]": 0 }
+// x["[|someProperty|]"] = 3;
 // x.[|someProperty|] = 5;
 
 
@@ -11,6 +11,6 @@
 // === findAllReferences ===
 // === /referencesForStringLiteralPropertyNames4.ts ===
 
-// var x = {[| "someProperty"|]: 0 }
-// x[/*FIND ALL REFS*/[|"someProperty"|]] = 3;
+// var x = { "[|someProperty|]": 0 }
+// x[/*FIND ALL REFS*/"[|someProperty|]"] = 3;
 // x.[|someProperty|] = 5;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames5.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames5.baseline.jsonc
index 6000d5ccb5..cb3b350388 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames5.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames5.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /referencesForStringLiteralPropertyNames5.ts ===
 
-// var x = { "/*FIND ALL REFS*/[| "someProperty"|]: 0 }
-// x[[|"someProperty"|]] = 3;
+// var x = { "/*FIND ALL REFS*/[|someProperty|]": 0 }
+// x["[|someProperty|]"] = 3;
 // x.[|someProperty|] = 5;
 
 
@@ -11,6 +11,6 @@
 // === findAllReferences ===
 // === /referencesForStringLiteralPropertyNames5.ts ===
 
-// var x = {[| "someProperty"|]: 0 }
-// x["/*FIND ALL REFS*/[|"someProperty"|]] = 3;
+// var x = { "[|someProperty|]": 0 }
+// x["/*FIND ALL REFS*/[|someProperty|]"] = 3;
 // x.[|someProperty|] = 5;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames6.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames6.baseline.jsonc
index 2e81a9530a..2a63bb7088 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames6.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames6.baseline.jsonc
@@ -3,7 +3,7 @@
 
 // const x = function () { return 111111; }
 // x./*FIND ALL REFS*/[|someProperty|] = 5;
-// x[[|"someProperty"|]] = 3;
+// x["[|someProperty|]"] = 3;
 
 
 
@@ -13,4 +13,4 @@
 
 // const x = function () { return 111111; }
 // x.[|someProperty|] = 5;
-// x["/*FIND ALL REFS*/[|"someProperty"|]] = 3;
+// x["/*FIND ALL REFS*/[|someProperty|]"] = 3;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames7.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames7.baseline.jsonc
index d86ba2a43d..5ec03d47fc 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames7.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForStringLiteralPropertyNames7.baseline.jsonc
@@ -1,8 +1,8 @@
 // === findAllReferences ===
 // === /foo.js ===
 
-// var x = { "/*FIND ALL REFS*/[| "someProperty"|]: 0 }
-// x[[|"someProperty"|]] = 3;
+// var x = { "/*FIND ALL REFS*/[|someProperty|]": 0 }
+// x["[|someProperty|]"] = 3;
 // x.[|someProperty|] = 5;
 
 
@@ -11,6 +11,6 @@
 // === findAllReferences ===
 // === /foo.js ===
 
-// var x = {[| "someProperty"|]: 0 }
-// x["/*FIND ALL REFS*/[|"someProperty"|]] = 3;
+// var x = { "[|someProperty|]": 0 }
+// x["/*FIND ALL REFS*/[|someProperty|]"] = 3;
 // x.[|someProperty|] = 5;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForTypeKeywords.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForTypeKeywords.baseline.jsonc
index 460a47eacf..fc8ec49dae 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForTypeKeywords.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForTypeKeywords.baseline.jsonc
@@ -14,7 +14,7 @@
 // interface I {}
 // function f<T extends I>() {}
 // type A1<T, U> = T extends U ? 1 : 0;
-// type A2<T> = T extends /*FIND ALL REFS*/[| infer|] U ? 1 : 0;
+// type A2<T> = T extends /*FIND ALL REFS*/[|infer|] U ? 1 : 0;
 // type A3<T> = { [P in keyof T]: 1 };
 // type A4<T> = keyof T;
 // type A5<T> = readonly T[];
@@ -34,8 +34,8 @@
 // function f<T extends I>() {}
 // type A1<T, U> = T extends U ? 1 : 0;
 // type A2<T> = T extends infer U ? 1 : 0;
-// type A3<T> = { [P in[| keyof|] T]: 1 };
-// type A4<T> = /*FIND ALL REFS*/[| keyof|] T;
+// type A3<T> = { [P in [|keyof|] T]: 1 };
+// type A4<T> = /*FIND ALL REFS*/[|keyof|] T;
 // type A5<T> = readonly T[];
 
 
@@ -48,4 +48,4 @@
 // type A2<T> = T extends infer U ? 1 : 0;
 // type A3<T> = { [P in keyof T]: 1 };
 // type A4<T> = keyof T;
-// type A5<T> = /*FIND ALL REFS*/[| readonly|] T[];
+// type A5<T> = /*FIND ALL REFS*/[|readonly|] T[];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForUnionProperties.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForUnionProperties.baseline.jsonc
index 3cc682251e..4db0a2d74d 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesForUnionProperties.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesForUnionProperties.baseline.jsonc
@@ -2,7 +2,7 @@
 // === /referencesForUnionProperties.ts ===
 
 // interface One {
-//     common: { /*FIND ALL REFS*/[| a|]: number; };
+//     common: { /*FIND ALL REFS*/[|a|]: number; };
 // }
 // 
 // interface Base {
@@ -25,13 +25,13 @@
 //     common: { a: number; };
 // }
 // 
-// interface Base {[|
-//     /*FIND ALL REFS*/a|]: string;
+// interface Base {
+//     /*FIND ALL REFS*/[|a|]: string;
 //     b: string;
 // }
 // 
-// interface HasAOrB extends Base {[|
-//     a|]: string;
+// interface HasAOrB extends Base {
+//     [|a|]: string;
 //     b: string;
 // }
 // 
@@ -50,16 +50,16 @@
 // === /referencesForUnionProperties.ts ===
 
 // interface One {
-//     common: {[| a|]: number; };
+//     common: { [|a|]: number; };
 // }
 // 
-// interface Base {[|
-//     a|]: string;
+// interface Base {
+//     [|a|]: string;
 //     b: string;
 // }
 // 
-// interface HasAOrB extends Base {[|
-//     a|]: string;
+// interface HasAOrB extends Base {
+//     [|a|]: string;
 //     b: string;
 // }
 // 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/ReferencesInConfiguredProject.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/ReferencesInConfiguredProject.baseline.jsonc
index 11cf10cc16..677e1bd466 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/ReferencesInConfiguredProject.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/ReferencesInConfiguredProject.baseline.jsonc
@@ -1,11 +1,11 @@
 // === findAllReferences ===
 // === /home/src/workspaces/project/referencesForGlobals_1.ts ===
 
-// class[| globalClass|] {
+// class [|globalClass|] {
 //     public f() { }
 // }
 
 
 // === /home/src/workspaces/project/referencesForGlobals_2.ts ===
 
-// var c = /*FIND ALL REFS*/[| globalClass|]();
+// var c = /*FIND ALL REFS*/[|globalClass|]();
diff --git a/testdata/baselines/reference/fourslash/findAllRef/RemoteGetReferences.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/RemoteGetReferences.baseline.jsonc
index 2ed1aa2e32..be77d73920 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/RemoteGetReferences.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/RemoteGetReferences.baseline.jsonc
@@ -5,7 +5,7 @@
 // 
 // //Remotes
 // //Type test
-// var remoteclsTest: /*FIND ALL REFS*/[| remotefooCls|];
+// var remoteclsTest: /*FIND ALL REFS*/[|remotefooCls|];
 // 
 // //Arguments
 // remoteclsTest = new remotefooCls(remoteglobalVar);
@@ -76,11 +76,11 @@
 // 
 // //Increments
 // remotefooCls.remoteclsSVar++;
-// remotemodTest.remotemodVar++;[|
-// remoteglobalVar|] =[| remoteglobalVar|] +[| remoteglobalVar|];[|
+// remotemodTest.remotemodVar++;
+// [|remoteglobalVar|] = [|remoteglobalVar|] + [|remoteglobalVar|];
 // 
 // //ETC - Other cases
-// remoteglobalVar|] = 3;
+// [|remoteglobalVar|] = 3;
 // 
 // //Find References misses method param
 // var
@@ -89,53 +89,49 @@
 
 // === /remoteGetReferences_2.ts ===
 
-// var /*FIND ALL REFS*/[| remoteglobalVar|]: number = 2;
+// var /*FIND ALL REFS*/[|remoteglobalVar|]: number = 2;
 // 
 // class remotefooCls {
 // 	//Declare
 // 	remoteclsVar = 1;
 // 	static remoteclsSVar = 1;
 // 
-// 	constructor(public remoteclsParam: number) {[|
+// 	constructor(public remoteclsParam: number) {
 // 		//Increments
-// 		remoteglobalVar|]++;
+// 		[|remoteglobalVar|]++;
 // 		this.remoteclsVar++;
 // 		remotefooCls.remoteclsSVar++;
 // 		this.remoteclsParam++;
 // // --- (line: 14) skipped ---
 
 
-// --- (line: 19) skipped ---
-// 	var remotefnVar = 1;
+// --- (line: 20) skipped ---
 // 
 // 	//Increments
-// 	remotefooCls.remoteclsSVar++;[|
-// 	remoteglobalVar|]++;
+// 	remotefooCls.remoteclsSVar++;
+// 	[|remoteglobalVar|]++;
 // 	remotemodTest.remotemodVar++;
 // 	remotefnVar++;
 // 
-// 	//Return
-// 	return remotex++;
-// }
-// 
-// module remotemodTest {
-// 	//Declare
-// 	export var remotemodVar: number;[|
+// // --- (line: 28) skipped ---
+
+
+// --- (line: 33) skipped ---
+// 	export var remotemodVar: number;
 // 
 // 	//Increments
-// 	remoteglobalVar|]++;
+// 	[|remoteglobalVar|]++;
 // 	remotefooCls.remoteclsSVar++;
 // 	remotemodVar++;
 // 
-// 	class remotetestCls {
-// 		static remoteboo = remotefoo;
-// 	}
-// 
-// 	function remotetestFn(){
-//         static remoteboo = remotefoo;[|
+// // --- (line: 41) skipped ---
+
+
+// --- (line: 45) skipped ---
+//         static remoteboo = remotefoo;
 // 
 // 		//Increments
-// 		remoteglobalVar|]++;
+// 		[|remoteglobalVar|]++;
 // 		remotefooCls.remoteclsSVar++;
 // 		remotemodVar++;
 //     }
@@ -156,14 +152,14 @@
 // 
 // //Remotes
 // //Type test
-// var remoteclsTest:[| remotefooCls|];
+// var remoteclsTest: [|remotefooCls|];
 // 
 // //Arguments
-// remoteclsTest = new[| remotefooCls|](remoteglobalVar);
-// remotefoo(remoteglobalVar);[|
+// remoteclsTest = new [|remotefooCls|](remoteglobalVar);
+// remotefoo(remoteglobalVar);
 // 
 // //Increments
-// remotefooCls|].remoteclsSVar++;
+// [|remotefooCls|].remoteclsSVar++;
 // remotemodTest.remotemodVar++;
 // remoteglobalVar = remoteglobalVar + remoteglobalVar;
 // 
@@ -174,7 +170,7 @@
 
 // var remoteglobalVar: number = 2;
 // 
-// class /*FIND ALL REFS*/[| remotefooCls|] {
+// class /*FIND ALL REFS*/[|remotefooCls|] {
 // 	//Declare
 // 	remoteclsVar = 1;
 // 	static remoteclsSVar = 1;
@@ -182,43 +178,41 @@
 // 	constructor(public remoteclsParam: number) {
 // 		//Increments
 // 		remoteglobalVar++;
-// 		this.remoteclsVar++;[|
-// 		remotefooCls|].remoteclsSVar++;
+// 		this.remoteclsVar++;
+// 		[|remotefooCls|].remoteclsSVar++;
 // 		this.remoteclsParam++;
 // 		remotemodTest.remotemodVar++;
 // 	}
-// }
-// 
-// function remotefoo(remotex: number) {
-// 	//Declare
-// 	var remotefnVar = 1;[|
+// // --- (line: 16) skipped ---
+
+
+// --- (line: 19) skipped ---
+// 	var remotefnVar = 1;
 // 
 // 	//Increments
-// 	remotefooCls|].remoteclsSVar++;
+// 	[|remotefooCls|].remoteclsSVar++;
 // 	remoteglobalVar++;
 // 	remotemodTest.remotemodVar++;
 // 	remotefnVar++;
 // // --- (line: 27) skipped ---
 
 
-// --- (line: 33) skipped ---
-// 	export var remotemodVar: number;
+// --- (line: 34) skipped ---
 // 
 // 	//Increments
-// 	remoteglobalVar++;[|
-// 	remotefooCls|].remoteclsSVar++;
+// 	remoteglobalVar++;
+// 	[|remotefooCls|].remoteclsSVar++;
 // 	remotemodVar++;
 // 
 // 	class remotetestCls {
 // // --- (line: 42) skipped ---
 
 
-// --- (line: 45) skipped ---
-//         static remoteboo = remotefoo;
+// --- (line: 46) skipped ---
 // 
 // 		//Increments
-// 		remoteglobalVar++;[|
-// 		remotefooCls|].remoteclsSVar++;
+// 		remoteglobalVar++;
+// 		[|remotefooCls|].remoteclsSVar++;
 // 		remotemodVar++;
 //     }
 // 
@@ -232,9 +226,9 @@
 
 // var remoteglobalVar: number = 2;
 // 
-// class remotefooCls {[|
+// class remotefooCls {
 // 	//Declare
-// 	/*FIND ALL REFS*/remoteclsVar|] = 1;
+// 	/*FIND ALL REFS*/[|remoteclsVar|] = 1;
 // 	static remoteclsSVar = 1;
 // 
 // 	constructor(public remoteclsParam: number) {
@@ -275,7 +269,7 @@
 // class remotefooCls {
 // 	//Declare
 // 	remoteclsVar = 1;
-// 	static /*FIND ALL REFS*/[| remoteclsSVar|] = 1;
+// 	static /*FIND ALL REFS*/[|remoteclsSVar|] = 1;
 // 
 // 	constructor(public remoteclsParam: number) {
 // 		//Increments
@@ -335,11 +329,11 @@
 // 
 // //Increments
 // remotefooCls.remoteclsSVar++;
-// remotemodTest.remotemodVar++;[|
-// remoteglobalVar|] =[| remoteglobalVar|] +[| remoteglobalVar|];[|
+// remotemodTest.remotemodVar++;
+// [|remoteglobalVar|] = [|remoteglobalVar|] + [|remoteglobalVar|];
 // 
 // //ETC - Other cases
-// remoteglobalVar|] = 3;
+// [|remoteglobalVar|] = 3;
 // 
 // //Find References misses method param
 // var
@@ -348,53 +342,49 @@
 
 // === /remoteGetReferences_2.ts ===
 
-// var[| remoteglobalVar|]: number = 2;
+// var [|remoteglobalVar|]: number = 2;
 // 
 // class remotefooCls {
 // 	//Declare
 // 	remoteclsVar = 1;
 // 	static remoteclsSVar = 1;
 // 
-// 	constructor(public remoteclsParam: number) {[|
+// 	constructor(public remoteclsParam: number) {
 // 		//Increments
-// 		/*FIND ALL REFS*/remoteglobalVar|]++;
+// 		/*FIND ALL REFS*/[|remoteglobalVar|]++;
 // 		this.remoteclsVar++;
 // 		remotefooCls.remoteclsSVar++;
 // 		this.remoteclsParam++;
 // // --- (line: 14) skipped ---
 
 
-// --- (line: 19) skipped ---
-// 	var remotefnVar = 1;
+// --- (line: 20) skipped ---
 // 
 // 	//Increments
-// 	remotefooCls.remoteclsSVar++;[|
-// 	remoteglobalVar|]++;
+// 	remotefooCls.remoteclsSVar++;
+// 	[|remoteglobalVar|]++;
 // 	remotemodTest.remotemodVar++;
 // 	remotefnVar++;
 // 
-// 	//Return
-// 	return remotex++;
-// }
-// 
-// module remotemodTest {
-// 	//Declare
-// 	export var remotemodVar: number;[|
+// // --- (line: 28) skipped ---
+
+
+// --- (line: 33) skipped ---
+// 	export var remotemodVar: number;
 // 
 // 	//Increments
-// 	remoteglobalVar|]++;
+// 	[|remoteglobalVar|]++;
 // 	remotefooCls.remoteclsSVar++;
 // 	remotemodVar++;
 // 
-// 	class remotetestCls {
-// 		static remoteboo = remotefoo;
-// 	}
-// 
-// 	function remotetestFn(){
-//         static remoteboo = remotefoo;[|
+// // --- (line: 41) skipped ---
+
+
+// --- (line: 45) skipped ---
+//         static remoteboo = remotefoo;
 // 
 // 		//Increments
-// 		remoteglobalVar|]++;
+// 		[|remoteglobalVar|]++;
 // 		remotefooCls.remoteclsSVar++;
 // 		remotemodVar++;
 //     }
@@ -408,9 +398,9 @@
 
 // var remoteglobalVar: number = 2;
 // 
-// class remotefooCls {[|
+// class remotefooCls {
 // 	//Declare
-// 	remoteclsVar|] = 1;
+// 	[|remoteclsVar|] = 1;
 // 	static remoteclsSVar = 1;
 // 
 // 	constructor(public remoteclsParam: number) {
@@ -432,14 +422,14 @@
 // 
 // //Remotes
 // //Type test
-// var remoteclsTest:[| remotefooCls|];
+// var remoteclsTest: [|remotefooCls|];
 // 
 // //Arguments
-// remoteclsTest = new[| remotefooCls|](remoteglobalVar);
-// remotefoo(remoteglobalVar);[|
+// remoteclsTest = new [|remotefooCls|](remoteglobalVar);
+// remotefoo(remoteglobalVar);
 // 
 // //Increments
-// remotefooCls|].remoteclsSVar++;
+// [|remotefooCls|].remoteclsSVar++;
 // remotemodTest.remotemodVar++;
 // remoteglobalVar = remoteglobalVar + remoteglobalVar;
 // 
@@ -450,7 +440,7 @@
 
 // var remoteglobalVar: number = 2;
 // 
-// class[| remotefooCls|] {
+// class [|remotefooCls|] {
 // 	//Declare
 // 	remoteclsVar = 1;
 // 	static remoteclsSVar = 1;
@@ -458,43 +448,41 @@
 // 	constructor(public remoteclsParam: number) {
 // 		//Increments
 // 		remoteglobalVar++;
-// 		this.remoteclsVar++;[|
-// 		/*FIND ALL REFS*/remotefooCls|].remoteclsSVar++;
+// 		this.remoteclsVar++;
+// 		/*FIND ALL REFS*/[|remotefooCls|].remoteclsSVar++;
 // 		this.remoteclsParam++;
 // 		remotemodTest.remotemodVar++;
 // 	}
-// }
-// 
-// function remotefoo(remotex: number) {
-// 	//Declare
-// 	var remotefnVar = 1;[|
+// // --- (line: 16) skipped ---
+
+
+// --- (line: 19) skipped ---
+// 	var remotefnVar = 1;
 // 
 // 	//Increments
-// 	remotefooCls|].remoteclsSVar++;
+// 	[|remotefooCls|].remoteclsSVar++;
 // 	remoteglobalVar++;
 // 	remotemodTest.remotemodVar++;
 // 	remotefnVar++;
 // // --- (line: 27) skipped ---
 
 
-// --- (line: 33) skipped ---
-// 	export var remotemodVar: number;
+// --- (line: 34) skipped ---
 // 
 // 	//Increments
-// 	remoteglobalVar++;[|
-// 	remotefooCls|].remoteclsSVar++;
+// 	remoteglobalVar++;
+// 	[|remotefooCls|].remoteclsSVar++;
 // 	remotemodVar++;
 // 
 // 	class remotetestCls {
 // // --- (line: 42) skipped ---
 
 
-// --- (line: 45) skipped ---
-//         static remoteboo = remotefoo;
+// --- (line: 46) skipped ---
 // 
 // 		//Increments
-// 		remoteglobalVar++;[|
-// 		remotefooCls|].remoteclsSVar++;
+// 		remoteglobalVar++;
+// 		[|remotefooCls|].remoteclsSVar++;
 // 		remotemodVar++;
 //     }
 // 
@@ -524,7 +512,7 @@
 // class remotefooCls {
 // 	//Declare
 // 	remoteclsVar = 1;
-// 	static[| remoteclsSVar|] = 1;
+// 	static [|remoteclsSVar|] = 1;
 // 
 // 	constructor(public remoteclsParam: number) {
 // 		//Increments
@@ -579,14 +567,14 @@
 // 
 // //Remotes
 // //Type test
-// var remoteclsTest:[| remotefooCls|];
+// var remoteclsTest: [|remotefooCls|];
 // 
 // //Arguments
-// remoteclsTest = new[| remotefooCls|](remoteglobalVar);
-// remotefoo(remoteglobalVar);[|
+// remoteclsTest = new [|remotefooCls|](remoteglobalVar);
+// remotefoo(remoteglobalVar);
 // 
 // //Increments
-// remotefooCls|].remoteclsSVar++;
+// [|remotefooCls|].remoteclsSVar++;
 // remotemodTest.remotemodVar++;
 // remoteglobalVar = remoteglobalVar + remoteglobalVar;
 // 
@@ -597,7 +585,7 @@
 
 // var remoteglobalVar: number = 2;
 // 
-// class[| remotefooCls|] {
+// class [|remotefooCls|] {
 // 	//Declare
 // 	remoteclsVar = 1;
 // 	static remoteclsSVar = 1;
@@ -605,43 +593,41 @@
 // 	constructor(public remoteclsParam: number) {
 // 		//Increments
 // 		remoteglobalVar++;
-// 		this.remoteclsVar++;[|
-// 		remotefooCls|].remoteclsSVar++;
+// 		this.remoteclsVar++;
+// 		[|remotefooCls|].remoteclsSVar++;
 // 		this.remoteclsParam++;
 // 		remotemodTest.remotemodVar++;
 // 	}
-// }
-// 
-// function remotefoo(remotex: number) {
-// 	//Declare
-// 	var remotefnVar = 1;[|
+// // --- (line: 16) skipped ---
+
+
+// --- (line: 19) skipped ---
+// 	var remotefnVar = 1;
 // 
 // 	//Increments
-// 	/*FIND ALL REFS*/remotefooCls|].remoteclsSVar++;
+// 	/*FIND ALL REFS*/[|remotefooCls|].remoteclsSVar++;
 // 	remoteglobalVar++;
 // 	remotemodTest.remotemodVar++;
 // 	remotefnVar++;
 // // --- (line: 27) skipped ---
 
 
-// --- (line: 33) skipped ---
-// 	export var remotemodVar: number;
+// --- (line: 34) skipped ---
 // 
 // 	//Increments
-// 	remoteglobalVar++;[|
-// 	remotefooCls|].remoteclsSVar++;
+// 	remoteglobalVar++;
+// 	[|remotefooCls|].remoteclsSVar++;
 // 	remotemodVar++;
 // 
 // 	class remotetestCls {
 // // --- (line: 42) skipped ---
 
 
-// --- (line: 45) skipped ---
-//         static remoteboo = remotefoo;
+// --- (line: 46) skipped ---
 // 
 // 		//Increments
-// 		remoteglobalVar++;[|
-// 		remotefooCls|].remoteclsSVar++;
+// 		remoteglobalVar++;
+// 		[|remotefooCls|].remoteclsSVar++;
 // 		remotemodVar++;
 //     }
 // 
@@ -671,7 +657,7 @@
 // class remotefooCls {
 // 	//Declare
 // 	remoteclsVar = 1;
-// 	static[| remoteclsSVar|] = 1;
+// 	static [|remoteclsSVar|] = 1;
 // 
 // 	constructor(public remoteclsParam: number) {
 // 		//Increments
@@ -731,11 +717,11 @@
 // 
 // //Increments
 // remotefooCls.remoteclsSVar++;
-// remotemodTest.remotemodVar++;[|
-// remoteglobalVar|] =[| remoteglobalVar|] +[| remoteglobalVar|];[|
+// remotemodTest.remotemodVar++;
+// [|remoteglobalVar|] = [|remoteglobalVar|] + [|remoteglobalVar|];
 // 
 // //ETC - Other cases
-// remoteglobalVar|] = 3;
+// [|remoteglobalVar|] = 3;
 // 
 // //Find References misses method param
 // var
@@ -744,53 +730,49 @@
 
 // === /remoteGetReferences_2.ts ===
 
-// var[| remoteglobalVar|]: number = 2;
+// var [|remoteglobalVar|]: number = 2;
 // 
 // class remotefooCls {
 // 	//Declare
 // 	remoteclsVar = 1;
 // 	static remoteclsSVar = 1;
 // 
-// 	constructor(public remoteclsParam: number) {[|
+// 	constructor(public remoteclsParam: number) {
 // 		//Increments
-// 		remoteglobalVar|]++;
+// 		[|remoteglobalVar|]++;
 // 		this.remoteclsVar++;
 // 		remotefooCls.remoteclsSVar++;
 // 		this.remoteclsParam++;
 // // --- (line: 14) skipped ---
 
 
-// --- (line: 19) skipped ---
-// 	var remotefnVar = 1;
+// --- (line: 20) skipped ---
 // 
 // 	//Increments
-// 	remotefooCls.remoteclsSVar++;[|
-// 	/*FIND ALL REFS*/remoteglobalVar|]++;
+// 	remotefooCls.remoteclsSVar++;
+// 	/*FIND ALL REFS*/[|remoteglobalVar|]++;
 // 	remotemodTest.remotemodVar++;
 // 	remotefnVar++;
 // 
-// 	//Return
-// 	return remotex++;
-// }
-// 
-// module remotemodTest {
-// 	//Declare
-// 	export var remotemodVar: number;[|
+// // --- (line: 28) skipped ---
+
+
+// --- (line: 33) skipped ---
+// 	export var remotemodVar: number;
 // 
 // 	//Increments
-// 	remoteglobalVar|]++;
+// 	[|remoteglobalVar|]++;
 // 	remotefooCls.remoteclsSVar++;
 // 	remotemodVar++;
 // 
-// 	class remotetestCls {
-// 		static remoteboo = remotefoo;
-// 	}
-// 
-// 	function remotetestFn(){
-//         static remoteboo = remotefoo;[|
+// // --- (line: 41) skipped ---
+
+
+// --- (line: 45) skipped ---
+//         static remoteboo = remotefoo;
 // 
 // 		//Increments
-// 		remoteglobalVar|]++;
+// 		[|remoteglobalVar|]++;
 // 		remotefooCls.remoteclsSVar++;
 // 		remotemodVar++;
 //     }
@@ -811,11 +793,11 @@
 // 
 // //Increments
 // remotefooCls.remoteclsSVar++;
-// remotemodTest.remotemodVar++;[|
-// remoteglobalVar|] =[| remoteglobalVar|] +[| remoteglobalVar|];[|
+// remotemodTest.remotemodVar++;
+// [|remoteglobalVar|] = [|remoteglobalVar|] + [|remoteglobalVar|];
 // 
 // //ETC - Other cases
-// remoteglobalVar|] = 3;
+// [|remoteglobalVar|] = 3;
 // 
 // //Find References misses method param
 // var
@@ -824,53 +806,49 @@
 
 // === /remoteGetReferences_2.ts ===
 
-// var[| remoteglobalVar|]: number = 2;
+// var [|remoteglobalVar|]: number = 2;
 // 
 // class remotefooCls {
 // 	//Declare
 // 	remoteclsVar = 1;
 // 	static remoteclsSVar = 1;
 // 
-// 	constructor(public remoteclsParam: number) {[|
+// 	constructor(public remoteclsParam: number) {
 // 		//Increments
-// 		remoteglobalVar|]++;
+// 		[|remoteglobalVar|]++;
 // 		this.remoteclsVar++;
 // 		remotefooCls.remoteclsSVar++;
 // 		this.remoteclsParam++;
 // // --- (line: 14) skipped ---
 
 
-// --- (line: 19) skipped ---
-// 	var remotefnVar = 1;
+// --- (line: 20) skipped ---
 // 
 // 	//Increments
-// 	remotefooCls.remoteclsSVar++;[|
-// 	remoteglobalVar|]++;
+// 	remotefooCls.remoteclsSVar++;
+// 	[|remoteglobalVar|]++;
 // 	remotemodTest.remotemodVar++;
 // 	remotefnVar++;
 // 
-// 	//Return
-// 	return remotex++;
-// }
-// 
-// module remotemodTest {
-// 	//Declare
-// 	export var remotemodVar: number;[|
+// // --- (line: 28) skipped ---
+
+
+// --- (line: 33) skipped ---
+// 	export var remotemodVar: number;
 // 
 // 	//Increments
-// 	/*FIND ALL REFS*/remoteglobalVar|]++;
+// 	/*FIND ALL REFS*/[|remoteglobalVar|]++;
 // 	remotefooCls.remoteclsSVar++;
 // 	remotemodVar++;
 // 
-// 	class remotetestCls {
-// 		static remoteboo = remotefoo;
-// 	}
-// 
-// 	function remotetestFn(){
-//         static remoteboo = remotefoo;[|
+// // --- (line: 41) skipped ---
+
+
+// --- (line: 45) skipped ---
+//         static remoteboo = remotefoo;
 // 
 // 		//Increments
-// 		remoteglobalVar|]++;
+// 		[|remoteglobalVar|]++;
 // 		remotefooCls.remoteclsSVar++;
 // 		remotemodVar++;
 //     }
@@ -886,14 +864,14 @@
 // 
 // //Remotes
 // //Type test
-// var remoteclsTest:[| remotefooCls|];
+// var remoteclsTest: [|remotefooCls|];
 // 
 // //Arguments
-// remoteclsTest = new[| remotefooCls|](remoteglobalVar);
-// remotefoo(remoteglobalVar);[|
+// remoteclsTest = new [|remotefooCls|](remoteglobalVar);
+// remotefoo(remoteglobalVar);
 // 
 // //Increments
-// remotefooCls|].remoteclsSVar++;
+// [|remotefooCls|].remoteclsSVar++;
 // remotemodTest.remotemodVar++;
 // remoteglobalVar = remoteglobalVar + remoteglobalVar;
 // 
@@ -904,7 +882,7 @@
 
 // var remoteglobalVar: number = 2;
 // 
-// class[| remotefooCls|] {
+// class [|remotefooCls|] {
 // 	//Declare
 // 	remoteclsVar = 1;
 // 	static remoteclsSVar = 1;
@@ -912,43 +890,41 @@
 // 	constructor(public remoteclsParam: number) {
 // 		//Increments
 // 		remoteglobalVar++;
-// 		this.remoteclsVar++;[|
-// 		remotefooCls|].remoteclsSVar++;
+// 		this.remoteclsVar++;
+// 		[|remotefooCls|].remoteclsSVar++;
 // 		this.remoteclsParam++;
 // 		remotemodTest.remotemodVar++;
 // 	}
-// }
-// 
-// function remotefoo(remotex: number) {
-// 	//Declare
-// 	var remotefnVar = 1;[|
+// // --- (line: 16) skipped ---
+
+
+// --- (line: 19) skipped ---
+// 	var remotefnVar = 1;
 // 
 // 	//Increments
-// 	remotefooCls|].remoteclsSVar++;
+// 	[|remotefooCls|].remoteclsSVar++;
 // 	remoteglobalVar++;
 // 	remotemodTest.remotemodVar++;
 // 	remotefnVar++;
 // // --- (line: 27) skipped ---
 
 
-// --- (line: 33) skipped ---
-// 	export var remotemodVar: number;
+// --- (line: 34) skipped ---
 // 
 // 	//Increments
-// 	remoteglobalVar++;[|
-// 	/*FIND ALL REFS*/remotefooCls|].remoteclsSVar++;
+// 	remoteglobalVar++;
+// 	/*FIND ALL REFS*/[|remotefooCls|].remoteclsSVar++;
 // 	remotemodVar++;
 // 
 // 	class remotetestCls {
 // // --- (line: 42) skipped ---
 
 
-// --- (line: 45) skipped ---
-//         static remoteboo = remotefoo;
+// --- (line: 46) skipped ---
 // 
 // 		//Increments
-// 		remoteglobalVar++;[|
-// 		remotefooCls|].remoteclsSVar++;
+// 		remoteglobalVar++;
+// 		[|remotefooCls|].remoteclsSVar++;
 // 		remotemodVar++;
 //     }
 // 
@@ -978,7 +954,7 @@
 // class remotefooCls {
 // 	//Declare
 // 	remoteclsVar = 1;
-// 	static[| remoteclsSVar|] = 1;
+// 	static [|remoteclsSVar|] = 1;
 // 
 // 	constructor(public remoteclsParam: number) {
 // 		//Increments
@@ -1038,11 +1014,11 @@
 // 
 // //Increments
 // remotefooCls.remoteclsSVar++;
-// remotemodTest.remotemodVar++;[|
-// remoteglobalVar|] =[| remoteglobalVar|] +[| remoteglobalVar|];[|
+// remotemodTest.remotemodVar++;
+// [|remoteglobalVar|] = [|remoteglobalVar|] + [|remoteglobalVar|];
 // 
 // //ETC - Other cases
-// remoteglobalVar|] = 3;
+// [|remoteglobalVar|] = 3;
 // 
 // //Find References misses method param
 // var
@@ -1051,53 +1027,49 @@
 
 // === /remoteGetReferences_2.ts ===
 
-// var[| remoteglobalVar|]: number = 2;
+// var [|remoteglobalVar|]: number = 2;
 // 
 // class remotefooCls {
 // 	//Declare
 // 	remoteclsVar = 1;
 // 	static remoteclsSVar = 1;
 // 
-// 	constructor(public remoteclsParam: number) {[|
+// 	constructor(public remoteclsParam: number) {
 // 		//Increments
-// 		remoteglobalVar|]++;
+// 		[|remoteglobalVar|]++;
 // 		this.remoteclsVar++;
 // 		remotefooCls.remoteclsSVar++;
 // 		this.remoteclsParam++;
 // // --- (line: 14) skipped ---
 
 
-// --- (line: 19) skipped ---
-// 	var remotefnVar = 1;
+// --- (line: 20) skipped ---
 // 
 // 	//Increments
-// 	remotefooCls.remoteclsSVar++;[|
-// 	remoteglobalVar|]++;
+// 	remotefooCls.remoteclsSVar++;
+// 	[|remoteglobalVar|]++;
 // 	remotemodTest.remotemodVar++;
 // 	remotefnVar++;
 // 
-// 	//Return
-// 	return remotex++;
-// }
-// 
-// module remotemodTest {
-// 	//Declare
-// 	export var remotemodVar: number;[|
+// // --- (line: 28) skipped ---
+
+
+// --- (line: 33) skipped ---
+// 	export var remotemodVar: number;
 // 
 // 	//Increments
-// 	remoteglobalVar|]++;
+// 	[|remoteglobalVar|]++;
 // 	remotefooCls.remoteclsSVar++;
 // 	remotemodVar++;
 // 
-// 	class remotetestCls {
-// 		static remoteboo = remotefoo;
-// 	}
-// 
-// 	function remotetestFn(){
-//         static remoteboo = remotefoo;[|
+// // --- (line: 41) skipped ---
+
+
+// --- (line: 45) skipped ---
+//         static remoteboo = remotefoo;
 // 
 // 		//Increments
-// 		/*FIND ALL REFS*/remoteglobalVar|]++;
+// 		/*FIND ALL REFS*/[|remoteglobalVar|]++;
 // 		remotefooCls.remoteclsSVar++;
 // 		remotemodVar++;
 //     }
@@ -1113,14 +1085,14 @@
 // 
 // //Remotes
 // //Type test
-// var remoteclsTest:[| remotefooCls|];
+// var remoteclsTest: [|remotefooCls|];
 // 
 // //Arguments
-// remoteclsTest = new[| remotefooCls|](remoteglobalVar);
-// remotefoo(remoteglobalVar);[|
+// remoteclsTest = new [|remotefooCls|](remoteglobalVar);
+// remotefoo(remoteglobalVar);
 // 
 // //Increments
-// remotefooCls|].remoteclsSVar++;
+// [|remotefooCls|].remoteclsSVar++;
 // remotemodTest.remotemodVar++;
 // remoteglobalVar = remoteglobalVar + remoteglobalVar;
 // 
@@ -1131,7 +1103,7 @@
 
 // var remoteglobalVar: number = 2;
 // 
-// class[| remotefooCls|] {
+// class [|remotefooCls|] {
 // 	//Declare
 // 	remoteclsVar = 1;
 // 	static remoteclsSVar = 1;
@@ -1139,43 +1111,41 @@
 // 	constructor(public remoteclsParam: number) {
 // 		//Increments
 // 		remoteglobalVar++;
-// 		this.remoteclsVar++;[|
-// 		remotefooCls|].remoteclsSVar++;
+// 		this.remoteclsVar++;
+// 		[|remotefooCls|].remoteclsSVar++;
 // 		this.remoteclsParam++;
 // 		remotemodTest.remotemodVar++;
 // 	}
-// }
-// 
-// function remotefoo(remotex: number) {
-// 	//Declare
-// 	var remotefnVar = 1;[|
+// // --- (line: 16) skipped ---
+
+
+// --- (line: 19) skipped ---
+// 	var remotefnVar = 1;
 // 
 // 	//Increments
-// 	remotefooCls|].remoteclsSVar++;
+// 	[|remotefooCls|].remoteclsSVar++;
 // 	remoteglobalVar++;
 // 	remotemodTest.remotemodVar++;
 // 	remotefnVar++;
 // // --- (line: 27) skipped ---
 
 
-// --- (line: 33) skipped ---
-// 	export var remotemodVar: number;
+// --- (line: 34) skipped ---
 // 
 // 	//Increments
-// 	remoteglobalVar++;[|
-// 	remotefooCls|].remoteclsSVar++;
+// 	remoteglobalVar++;
+// 	[|remotefooCls|].remoteclsSVar++;
 // 	remotemodVar++;
 // 
 // 	class remotetestCls {
 // // --- (line: 42) skipped ---
 
 
-// --- (line: 45) skipped ---
-//         static remoteboo = remotefoo;
+// --- (line: 46) skipped ---
 // 
 // 		//Increments
-// 		remoteglobalVar++;[|
-// 		/*FIND ALL REFS*/remotefooCls|].remoteclsSVar++;
+// 		remoteglobalVar++;
+// 		/*FIND ALL REFS*/[|remotefooCls|].remoteclsSVar++;
 // 		remotemodVar++;
 //     }
 // 
@@ -1205,7 +1175,7 @@
 // class remotefooCls {
 // 	//Declare
 // 	remoteclsVar = 1;
-// 	static[| remoteclsSVar|] = 1;
+// 	static [|remoteclsSVar|] = 1;
 // 
 // 	constructor(public remoteclsParam: number) {
 // 		//Increments
diff --git a/testdata/baselines/reference/fourslash/findAllRef/RenameJsExports02.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/RenameJsExports02.baseline.jsonc
index 2a0dbd0bf6..acdb42aec6 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/RenameJsExports02.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/RenameJsExports02.baseline.jsonc
@@ -1,7 +1,7 @@
 // === findAllReferences ===
 // === /a.js ===
 
-// module.exports = class /*FIND ALL REFS*/[| A|] {}
+// module.exports = class /*FIND ALL REFS*/[|A|] {}
 
 
 
@@ -9,4 +9,4 @@
 // === findAllReferences ===
 // === /b.js ===
 
-// const /*FIND ALL REFS*/[| A|] = require("./a");
+// const /*FIND ALL REFS*/[|A|] = require("./a");
diff --git a/testdata/baselines/reference/fourslash/findAllRef/RenameJsExports03.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/RenameJsExports03.baseline.jsonc
index 3c9886a36a..e0fd047e6b 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/RenameJsExports03.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/RenameJsExports03.baseline.jsonc
@@ -1,10 +1,10 @@
 // === findAllReferences ===
 // === /a.js ===
 
-// class /*FIND ALL REFS*/[| A|] {
+// class /*FIND ALL REFS*/[|A|] {
 //     constructor() { }
 // }
-// module.exports =[| A|];
+// module.exports = [|A|];
 
 
 
@@ -12,10 +12,10 @@
 // === findAllReferences ===
 // === /a.js ===
 
-// class[| A|] {
+// class [|A|] {
 //     /*FIND ALL REFS*/constructor() { }
 // }
-// module.exports =[| A|];
+// module.exports = [|A|];
 
 
 
@@ -23,8 +23,8 @@
 // === findAllReferences ===
 // === /b.js ===
 
-// const /*FIND ALL REFS*/[| A|] = require("./a");
-// new[| A|];
+// const /*FIND ALL REFS*/[|A|] = require("./a");
+// new [|A|];
 
 
 
@@ -32,5 +32,5 @@
 // === findAllReferences ===
 // === /b.js ===
 
-// const[| A|] = require("./a");
-// new /*FIND ALL REFS*/[| A|];
+// const [|A|] = require("./a");
+// new /*FIND ALL REFS*/[|A|];
diff --git a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences1.baseline.jsonc
index f3309371d8..df65620b6f 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences1.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences1.baseline.jsonc
@@ -3,8 +3,8 @@
 
 //  declare module JSX {
 //      interface Element { }
-//      interface IntrinsicElements {[|
-//          /*FIND ALL REFS*/div|]: {
+//      interface IntrinsicElements {
+//          /*FIND ALL REFS*/[|div|]: {
 //              name?: string;
 //              isOpen?: boolean;
 //          };
@@ -26,8 +26,8 @@
 
 //  declare module JSX {
 //      interface Element { }
-//      interface IntrinsicElements {[|
-//          div|]: {
+//      interface IntrinsicElements {
+//          [|div|]: {
 //              name?: string;
 //              isOpen?: boolean;
 //          };
diff --git a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences10.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences10.baseline.jsonc
index 6f419cb815..0b6ea0c89d 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences10.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences10.baseline.jsonc
@@ -1,12 +1,11 @@
 // === findAllReferences ===
 // === /file.tsx ===
 
-// --- (line: 7) skipped ---
-//      children?: string;
+// --- (line: 8) skipped ---
 //      className?: string;
 //  }
-//  interface ButtonProps extends ClickableProps {[|
-//      /*FIND ALL REFS*/onClick|](event?: React.MouseEvent<HTMLButtonElement>): void;
+//  interface ButtonProps extends ClickableProps {
+//      /*FIND ALL REFS*/[|onClick|](event?: React.MouseEvent<HTMLButtonElement>): void;
 //  }
 //  interface LinkProps extends ClickableProps {
 //      goTo: string;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences11.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences11.baseline.jsonc
index 297eaf314e..8e1dfbe19f 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences11.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences11.baseline.jsonc
@@ -5,4 +5,4 @@
 //  declare function MainButton(buttonProps: ButtonProps): JSX.Element;
 //  declare function MainButton(linkProps: LinkProps): JSX.Element;
 //  declare function MainButton(props: ButtonProps | LinkProps): JSX.Element;
-//  let opt = <MainButton /*FIND ALL REFS*/[| wrong|] />;
+//  let opt = <MainButton /*FIND ALL REFS*/[|wrong|] />;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences2.baseline.jsonc
index 490a011b54..86ad70002b 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences2.baseline.jsonc
@@ -4,8 +4,8 @@
 //  declare module JSX {
 //      interface Element { }
 //      interface IntrinsicElements {
-//          div: {[|
-//              /*FIND ALL REFS*/name|]?: string;
+//          div: {
+//              /*FIND ALL REFS*/[|name|]?: string;
 //              isOpen?: boolean;
 //          };
 //          span: { n: string; };
diff --git a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences3.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences3.baseline.jsonc
index 50126b88ec..57c04e416b 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences3.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences3.baseline.jsonc
@@ -1,12 +1,11 @@
 // === findAllReferences ===
 // === /file.tsx ===
 
-// --- (line: 4) skipped ---
-//      interface ElementAttributesProperty { props }
+// --- (line: 5) skipped ---
 //  }
 //  class MyClass {
-//    props: {[|
-//      /*FIND ALL REFS*/name|]?: string;
+//    props: {
+//      /*FIND ALL REFS*/[|name|]?: string;
 //      size?: number;
 //  }
 // 
diff --git a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences4.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences4.baseline.jsonc
index 4b39e5b74d..072653a1f5 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences4.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences4.baseline.jsonc
@@ -10,7 +10,7 @@
 //      }
 //      interface ElementAttributesProperty { props }
 //  }
-//  class /*FIND ALL REFS*/[| MyClass|] {
+//  class /*FIND ALL REFS*/[|MyClass|] {
 //    props: {
 //      name?: string;
 //      size?: number;
@@ -34,7 +34,7 @@
 //      }
 //      interface ElementAttributesProperty { props }
 //  }
-//  class[| MyClass|] {
+//  class [|MyClass|] {
 //    props: {
 //      name?: string;
 //      size?: number;
@@ -53,7 +53,7 @@
 //      }
 //      interface ElementAttributesProperty { props }
 //  }
-//  class[| MyClass|] {
+//  class [|MyClass|] {
 //    props: {
 //      name?: string;
 //      size?: number;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences5.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences5.baseline.jsonc
index d31a7aef93..3c1a2ab52f 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences5.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences5.baseline.jsonc
@@ -10,7 +10,7 @@
 //      propString: string
 //      optional?: boolean
 //  }
-//  declare function /*FIND ALL REFS*/[| Opt|](attributes: OptionPropBag): JSX.Element;
+//  declare function /*FIND ALL REFS*/[|Opt|](attributes: OptionPropBag): JSX.Element;
 //  let opt = <[|Opt|] />;
 //  let opt1 = <[|Opt|] propx={100} propString />;
 //  let opt2 = <[|Opt|] propx={100} optional/>;
@@ -32,7 +32,7 @@
 //      propString: string
 //      optional?: boolean
 //  }
-//  declare function[| Opt|](attributes: OptionPropBag): JSX.Element;
+//  declare function [|Opt|](attributes: OptionPropBag): JSX.Element;
 //  let opt = </*FIND ALL REFS*/[|Opt|] />;
 //  let opt1 = <[|Opt|] propx={100} propString />;
 //  let opt2 = <[|Opt|] propx={100} optional/>;
@@ -54,7 +54,7 @@
 //      propString: string
 //      optional?: boolean
 //  }
-//  declare function[| Opt|](attributes: OptionPropBag): JSX.Element;
+//  declare function [|Opt|](attributes: OptionPropBag): JSX.Element;
 //  let opt = <[|Opt|] />;
 //  let opt1 = </*FIND ALL REFS*/[|Opt|] propx={100} propString />;
 //  let opt2 = <[|Opt|] propx={100} optional/>;
@@ -76,7 +76,7 @@
 //      propString: string
 //      optional?: boolean
 //  }
-//  declare function[| Opt|](attributes: OptionPropBag): JSX.Element;
+//  declare function [|Opt|](attributes: OptionPropBag): JSX.Element;
 //  let opt = <[|Opt|] />;
 //  let opt1 = <[|Opt|] propx={100} propString />;
 //  let opt2 = </*FIND ALL REFS*/[|Opt|] propx={100} optional/>;
@@ -98,7 +98,7 @@
 //      propString: string
 //      optional?: boolean
 //  }
-//  declare function[| Opt|](attributes: OptionPropBag): JSX.Element;
+//  declare function [|Opt|](attributes: OptionPropBag): JSX.Element;
 //  let opt = <[|Opt|] />;
 //  let opt1 = <[|Opt|] propx={100} propString />;
 //  let opt2 = <[|Opt|] propx={100} optional/>;
@@ -120,7 +120,7 @@
 //      propString: string
 //      optional?: boolean
 //  }
-//  declare function[| Opt|](attributes: OptionPropBag): JSX.Element;
+//  declare function [|Opt|](attributes: OptionPropBag): JSX.Element;
 //  let opt = <[|Opt|] />;
 //  let opt1 = <[|Opt|] propx={100} propString />;
 //  let opt2 = <[|Opt|] propx={100} optional/>;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences6.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences6.baseline.jsonc
index 49d089d753..3e0b7e2016 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences6.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences6.baseline.jsonc
@@ -5,4 +5,4 @@
 //      optional?: boolean
 //  }
 //  declare function Opt(attributes: OptionPropBag): JSX.Element;
-//  let opt = <Opt /*FIND ALL REFS*/[| wrong|] />;
+//  let opt = <Opt /*FIND ALL REFS*/[|wrong|] />;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences7.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences7.baseline.jsonc
index 5441bef6b1..99ce269af9 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences7.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences7.baseline.jsonc
@@ -1,12 +1,11 @@
 // === findAllReferences ===
 // === /file.tsx ===
 
-// --- (line: 3) skipped ---
-//      }
+// --- (line: 4) skipped ---
 //      interface ElementAttributesProperty { props; }
 //  }
-//  interface OptionPropBag {[|
-//      /*FIND ALL REFS*/propx|]: number
+//  interface OptionPropBag {
+//      /*FIND ALL REFS*/[|propx|]: number
 //      propString: string
 //      optional?: boolean
 //  }
diff --git a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences8.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences8.baseline.jsonc
index 66f674e81e..320c7d26d2 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences8.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences8.baseline.jsonc
@@ -10,9 +10,9 @@
 //  interface LinkProps extends ClickableProps {
 //      goTo: string;
 //  }
-//  declare function /*FIND ALL REFS*/[| MainButton|](buttonProps: ButtonProps): JSX.Element;
-//  declare function[| MainButton|](linkProps: LinkProps): JSX.Element;
-//  declare function[| MainButton|](props: ButtonProps | LinkProps): JSX.Element;
+//  declare function /*FIND ALL REFS*/[|MainButton|](buttonProps: ButtonProps): JSX.Element;
+//  declare function [|MainButton|](linkProps: LinkProps): JSX.Element;
+//  declare function [|MainButton|](props: ButtonProps | LinkProps): JSX.Element;
 //  let opt = <[|MainButton|] />;
 //  let opt = <[|MainButton|] children="chidlren" />;
 //  let opt = <[|MainButton|] onClick={()=>{}} />;
@@ -35,9 +35,9 @@
 //  interface LinkProps extends ClickableProps {
 //      goTo: string;
 //  }
-//  declare function[| MainButton|](buttonProps: ButtonProps): JSX.Element;
-//  declare function /*FIND ALL REFS*/[| MainButton|](linkProps: LinkProps): JSX.Element;
-//  declare function[| MainButton|](props: ButtonProps | LinkProps): JSX.Element;
+//  declare function [|MainButton|](buttonProps: ButtonProps): JSX.Element;
+//  declare function /*FIND ALL REFS*/[|MainButton|](linkProps: LinkProps): JSX.Element;
+//  declare function [|MainButton|](props: ButtonProps | LinkProps): JSX.Element;
 //  let opt = <[|MainButton|] />;
 //  let opt = <[|MainButton|] children="chidlren" />;
 //  let opt = <[|MainButton|] onClick={()=>{}} />;
@@ -60,9 +60,9 @@
 //  interface LinkProps extends ClickableProps {
 //      goTo: string;
 //  }
-//  declare function[| MainButton|](buttonProps: ButtonProps): JSX.Element;
-//  declare function[| MainButton|](linkProps: LinkProps): JSX.Element;
-//  declare function /*FIND ALL REFS*/[| MainButton|](props: ButtonProps | LinkProps): JSX.Element;
+//  declare function [|MainButton|](buttonProps: ButtonProps): JSX.Element;
+//  declare function [|MainButton|](linkProps: LinkProps): JSX.Element;
+//  declare function /*FIND ALL REFS*/[|MainButton|](props: ButtonProps | LinkProps): JSX.Element;
 //  let opt = <[|MainButton|] />;
 //  let opt = <[|MainButton|] children="chidlren" />;
 //  let opt = <[|MainButton|] onClick={()=>{}} />;
@@ -85,9 +85,9 @@
 //  interface LinkProps extends ClickableProps {
 //      goTo: string;
 //  }
-//  declare function[| MainButton|](buttonProps: ButtonProps): JSX.Element;
-//  declare function[| MainButton|](linkProps: LinkProps): JSX.Element;
-//  declare function[| MainButton|](props: ButtonProps | LinkProps): JSX.Element;
+//  declare function [|MainButton|](buttonProps: ButtonProps): JSX.Element;
+//  declare function [|MainButton|](linkProps: LinkProps): JSX.Element;
+//  declare function [|MainButton|](props: ButtonProps | LinkProps): JSX.Element;
 //  let opt = </*FIND ALL REFS*/[|MainButton|] />;
 //  let opt = <[|MainButton|] children="chidlren" />;
 //  let opt = <[|MainButton|] onClick={()=>{}} />;
@@ -110,9 +110,9 @@
 //  interface LinkProps extends ClickableProps {
 //      goTo: string;
 //  }
-//  declare function[| MainButton|](buttonProps: ButtonProps): JSX.Element;
-//  declare function[| MainButton|](linkProps: LinkProps): JSX.Element;
-//  declare function[| MainButton|](props: ButtonProps | LinkProps): JSX.Element;
+//  declare function [|MainButton|](buttonProps: ButtonProps): JSX.Element;
+//  declare function [|MainButton|](linkProps: LinkProps): JSX.Element;
+//  declare function [|MainButton|](props: ButtonProps | LinkProps): JSX.Element;
 //  let opt = <[|MainButton|] />;
 //  let opt = </*FIND ALL REFS*/[|MainButton|] children="chidlren" />;
 //  let opt = <[|MainButton|] onClick={()=>{}} />;
@@ -135,9 +135,9 @@
 //  interface LinkProps extends ClickableProps {
 //      goTo: string;
 //  }
-//  declare function[| MainButton|](buttonProps: ButtonProps): JSX.Element;
-//  declare function[| MainButton|](linkProps: LinkProps): JSX.Element;
-//  declare function[| MainButton|](props: ButtonProps | LinkProps): JSX.Element;
+//  declare function [|MainButton|](buttonProps: ButtonProps): JSX.Element;
+//  declare function [|MainButton|](linkProps: LinkProps): JSX.Element;
+//  declare function [|MainButton|](props: ButtonProps | LinkProps): JSX.Element;
 //  let opt = <[|MainButton|] />;
 //  let opt = <[|MainButton|] children="chidlren" />;
 //  let opt = </*FIND ALL REFS*/[|MainButton|] onClick={()=>{}} />;
@@ -160,9 +160,9 @@
 //  interface LinkProps extends ClickableProps {
 //      goTo: string;
 //  }
-//  declare function[| MainButton|](buttonProps: ButtonProps): JSX.Element;
-//  declare function[| MainButton|](linkProps: LinkProps): JSX.Element;
-//  declare function[| MainButton|](props: ButtonProps | LinkProps): JSX.Element;
+//  declare function [|MainButton|](buttonProps: ButtonProps): JSX.Element;
+//  declare function [|MainButton|](linkProps: LinkProps): JSX.Element;
+//  declare function [|MainButton|](props: ButtonProps | LinkProps): JSX.Element;
 //  let opt = <[|MainButton|] />;
 //  let opt = <[|MainButton|] children="chidlren" />;
 //  let opt = <[|MainButton|] onClick={()=>{}} />;
@@ -185,9 +185,9 @@
 //  interface LinkProps extends ClickableProps {
 //      goTo: string;
 //  }
-//  declare function[| MainButton|](buttonProps: ButtonProps): JSX.Element;
-//  declare function[| MainButton|](linkProps: LinkProps): JSX.Element;
-//  declare function[| MainButton|](props: ButtonProps | LinkProps): JSX.Element;
+//  declare function [|MainButton|](buttonProps: ButtonProps): JSX.Element;
+//  declare function [|MainButton|](linkProps: LinkProps): JSX.Element;
+//  declare function [|MainButton|](props: ButtonProps | LinkProps): JSX.Element;
 //  let opt = <[|MainButton|] />;
 //  let opt = <[|MainButton|] children="chidlren" />;
 //  let opt = <[|MainButton|] onClick={()=>{}} />;
@@ -210,9 +210,9 @@
 //  interface LinkProps extends ClickableProps {
 //      goTo: string;
 //  }
-//  declare function[| MainButton|](buttonProps: ButtonProps): JSX.Element;
-//  declare function[| MainButton|](linkProps: LinkProps): JSX.Element;
-//  declare function[| MainButton|](props: ButtonProps | LinkProps): JSX.Element;
+//  declare function [|MainButton|](buttonProps: ButtonProps): JSX.Element;
+//  declare function [|MainButton|](linkProps: LinkProps): JSX.Element;
+//  declare function [|MainButton|](props: ButtonProps | LinkProps): JSX.Element;
 //  let opt = <[|MainButton|] />;
 //  let opt = <[|MainButton|] children="chidlren" />;
 //  let opt = <[|MainButton|] onClick={()=>{}} />;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences9.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences9.baseline.jsonc
index c77bf08c09..8d8013277b 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences9.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferences9.baseline.jsonc
@@ -1,12 +1,11 @@
 // === findAllReferences ===
 // === /file.tsx ===
 
-// --- (line: 10) skipped ---
-//  interface ButtonProps extends ClickableProps {
+// --- (line: 11) skipped ---
 //      onClick(event?: React.MouseEvent<HTMLButtonElement>): void;
 //  }
-//  interface LinkProps extends ClickableProps {[|
-//      /*FIND ALL REFS*/goTo|]: string;
+//  interface LinkProps extends ClickableProps {
+//      /*FIND ALL REFS*/[|goTo|]: string;
 //  }
 //  declare function MainButton(buttonProps: ButtonProps): JSX.Element;
 //  declare function MainButton(linkProps: LinkProps): JSX.Element;
diff --git a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferencesUnionElementType1.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferencesUnionElementType1.baseline.jsonc
index 22a475f103..c93274031b 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferencesUnionElementType1.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferencesUnionElementType1.baseline.jsonc
@@ -10,7 +10,7 @@
 //  function SFC2(prop: { x: boolean }) {
 //      return <h1>World </h1>;
 //  }
-//  var /*FIND ALL REFS*/[| SFCComp|] = SFC1 || SFC2;
+//  var /*FIND ALL REFS*/[|SFCComp|] = SFC1 || SFC2;
 //  <[|SFCComp|] x={ "hi" } />
 
 
@@ -28,5 +28,5 @@
 //  function SFC2(prop: { x: boolean }) {
 //      return <h1>World </h1>;
 //  }
-//  var[| SFCComp|] = SFC1 || SFC2;
+//  var [|SFCComp|] = SFC1 || SFC2;
 //  </*FIND ALL REFS*/[|SFCComp|] x={ "hi" } />
diff --git a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferencesUnionElementType2.baseline.jsonc b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferencesUnionElementType2.baseline.jsonc
index 4015993a1b..3def294dea 100644
--- a/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferencesUnionElementType2.baseline.jsonc
+++ b/testdata/baselines/reference/fourslash/findAllRef/TsxFindAllReferencesUnionElementType2.baseline.jsonc
@@ -10,7 +10,7 @@
 //      }
 //      private method() { }
 //  }
-//  var /*FIND ALL REFS*/[| RCComp|] = RC1 || RC2;
+//  var /*FIND ALL REFS*/[|RCComp|] = RC1 || RC2;
 //  <[|RCComp|] />
 
 
@@ -28,5 +28,5 @@
 //      }
 //      private method() { }
 //  }
-//  var[| RCComp|] = RC1 || RC2;
+//  var [|RCComp|] = RC1 || RC2;
 //  </*FIND ALL REFS*/[|RCComp|] />