Skip to content

Commit 75bb3ee

Browse files
committed
Fix fourslash appends
1 parent 6277711 commit 75bb3ee

File tree

1 file changed

+34
-31
lines changed
  • internal/fourslash/tests/util

1 file changed

+34
-31
lines changed

internal/fourslash/tests/util/util.go

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13258,10 +13258,13 @@ var CompletionClassElementKeywords = []fourslash.CompletionsExpectedItem{
1325813258

1325913259
var CompletionClassElementInJSKeywords = getInJSKeywords(CompletionClassElementKeywords)
1326013260

13261-
var CompletionGlobals = sortCompletionItems(append(
13262-
append(CompletionGlobalVars, CompletionGlobalKeywords...),
13263-
CompletionGlobalThisItem,
13264-
CompletionUndefinedVarItem,
13261+
var CompletionGlobals = sortCompletionItems(slices.Concat(
13262+
CompletionGlobalVars,
13263+
CompletionGlobalKeywords,
13264+
[]fourslash.CompletionsExpectedItem{
13265+
CompletionGlobalThisItem,
13266+
CompletionUndefinedVarItem,
13267+
},
1326513268
))
1326613269

1326713270
func sortCompletionItems(items []fourslash.CompletionsExpectedItem) []fourslash.CompletionsExpectedItem {
@@ -13313,26 +13316,24 @@ func sortCompletionItems(items []fourslash.CompletionsExpectedItem) []fourslash.
1331313316
func CompletionGlobalsPlus(items []fourslash.CompletionsExpectedItem, noLib bool) []fourslash.CompletionsExpectedItem {
1331413317
var all []fourslash.CompletionsExpectedItem
1331513318
if noLib {
13316-
all = append(
13317-
append(items, CompletionGlobalThisItem, CompletionUndefinedVarItem),
13318-
CompletionGlobalKeywords...,
13319+
all = slices.Concat(
13320+
items,
13321+
[]fourslash.CompletionsExpectedItem{CompletionGlobalThisItem, CompletionUndefinedVarItem},
13322+
CompletionGlobalKeywords,
1331913323
)
1332013324
} else {
13321-
all = append(items, CompletionGlobals...)
13325+
all = slices.Concat(items, CompletionGlobals)
1332213326
}
1332313327
return sortCompletionItems(all)
1332413328
}
1332513329

1332613330
func CompletionGlobalTypesPlus(items []fourslash.CompletionsExpectedItem) []fourslash.CompletionsExpectedItem {
13327-
return sortCompletionItems(
13328-
append(
13329-
append(
13330-
append(CompletionGlobalTypeDecls, CompletionGlobalThisItem),
13331-
CompletionTypeKeywords...,
13332-
),
13333-
items...,
13334-
),
13335-
)
13331+
return sortCompletionItems(slices.Concat(
13332+
CompletionGlobalTypeDecls,
13333+
[]fourslash.CompletionsExpectedItem{CompletionGlobalThisItem},
13334+
CompletionTypeKeywords,
13335+
items,
13336+
))
1333613337
}
1333713338

1333813339
var CompletionGlobalTypes = CompletionGlobalTypesPlus(nil)
@@ -13364,10 +13365,10 @@ func getInJSKeywords(keywords []fourslash.CompletionsExpectedItem) []fourslash.C
1336413365
var CompletionGlobalInJSKeywords = getInJSKeywords(CompletionGlobalKeywords)
1336513366

1336613367
func CompletionGlobalsInJSPlus(items []fourslash.CompletionsExpectedItem, noLib bool) []fourslash.CompletionsExpectedItem {
13367-
var all []fourslash.CompletionsExpectedItem
13368-
all = append(
13369-
append(items, CompletionGlobalThisItem, CompletionUndefinedVarItem),
13370-
CompletionGlobalInJSKeywords...,
13368+
all := slices.Concat(
13369+
items,
13370+
[]fourslash.CompletionsExpectedItem{CompletionGlobalThisItem, CompletionUndefinedVarItem},
13371+
CompletionGlobalInJSKeywords,
1337113372
)
1337213373
if !noLib {
1337313374
all = append(all, CompletionGlobalVars...)
@@ -13436,35 +13437,37 @@ var CompletionFunctionMembers = []fourslash.CompletionsExpectedItem{
1343613437

1343713438
func CompletionFunctionMembersPlus(items []fourslash.CompletionsExpectedItem) []fourslash.CompletionsExpectedItem {
1343813439
return sortCompletionItems(
13439-
append(
13440+
slices.Concat(
1344013441
CompletionFunctionMembers,
13441-
items...,
13442+
items,
1344213443
),
1344313444
)
1344413445
}
1344513446

13446-
var CompletionFunctionMembersWithPrototype = sortCompletionItems(append(
13447+
var CompletionFunctionMembersWithPrototype = sortCompletionItems(slices.Concat(
1344713448
CompletionFunctionMembers,
13448-
&lsproto.CompletionItem{
13449-
Label: "prototype",
13450-
Kind: PtrTo(lsproto.CompletionItemKindField),
13449+
[]fourslash.CompletionsExpectedItem{
13450+
&lsproto.CompletionItem{
13451+
Label: "prototype",
13452+
Kind: PtrTo(lsproto.CompletionItemKindField),
13453+
},
1345113454
},
1345213455
))
1345313456

1345413457
func CompletionFunctionMembersWithPrototypePlus(items []fourslash.CompletionsExpectedItem) []fourslash.CompletionsExpectedItem {
1345513458
return sortCompletionItems(
13456-
append(
13459+
slices.Concat(
1345713460
CompletionFunctionMembersWithPrototype,
13458-
items...,
13461+
items,
1345913462
),
1346013463
)
1346113464
}
1346213465

1346313466
func CompletionTypeKeywordsPlus(items []fourslash.CompletionsExpectedItem) []fourslash.CompletionsExpectedItem {
1346413467
return sortCompletionItems(
13465-
append(
13468+
slices.Concat(
1346613469
CompletionTypeKeywords,
13467-
items...,
13470+
items,
1346813471
),
1346913472
)
1347013473
}

0 commit comments

Comments
 (0)