Skip to content

Simplify filterText computation + fixes #1414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Simplify filterText computation + fixes #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b91edc1
WIP: fix private identifiers in completions
gabritto Jul 15, 2025
790adfb
finish private id tests and simplification
gabritto Jul 16, 2025
647399a
more tests for filter text + parser fix
gabritto Jul 17, 2025
0fcdff0
fix tests, refactor completion filter text
gabritto Jul 17, 2025
ca58712
Merge branch 'main' into gabritto/vscodetests
gabritto Jul 17, 2025
2fcbc8e
update failing tests
gabritto Jul 17, 2025
2d80c44
remove unused baseline
gabritto Jul 17, 2025
05f3f1d
Merge branch 'main' into gabritto/vscodetests
gabritto Jul 17, 2025
a03dd09
rename function and fix comment
gabritto Jul 18, 2025
34c8805
Merge branch 'main' into gabritto/vscodetests
gabritto Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions internal/fourslash/_scripts/failingTests.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ TestCompletionEntryForArgumentConstrainedToString
TestCompletionEntryForArrayElementConstrainedToString
TestCompletionEntryForArrayElementConstrainedToString2
TestCompletionEntryForClassMembers_StaticWhenBaseTypeIsNotResolved
TestCompletionEntryForPropertyFromUnionOfModuleType
TestCompletionEntryForUnionProperty
TestCompletionEntryForUnionProperty2
TestCompletionExportFrom
Expand Down Expand Up @@ -67,17 +66,12 @@ TestCompletionInNamedImportLocation
TestCompletionInUncheckedJSFile
TestCompletionInfoWithExplicitTypeArguments
TestCompletionJSDocNamePath
TestCompletionListAfterRegularExpressionLiteral01
TestCompletionListAfterRegularExpressionLiteral1
TestCompletionListAfterStringLiteral1
TestCompletionListAndMemberListOnCommentedDot
TestCompletionListAndMemberListOnCommentedWhiteSpace
TestCompletionListBuilderLocations_VariableDeclarations
TestCompletionListCladule
TestCompletionListClassMembers
TestCompletionListForDerivedType1
TestCompletionListForExportEquals
TestCompletionListForRest
TestCompletionListForTransitivelyExportedMembers01
TestCompletionListForTransitivelyExportedMembers04
TestCompletionListFunctionExpression
Expand Down Expand Up @@ -107,16 +101,11 @@ TestCompletionListInUnclosedTemplate01
TestCompletionListInUnclosedTemplate02
TestCompletionListInvalidMemberNames2
TestCompletionListInvalidMemberNames_withExistingIdentifier
TestCompletionListObjectMembers
TestCompletionListObjectMembersInTypeLocationWithTypeof
TestCompletionListOfGenericSymbol
TestCompletionListOnAliases
TestCompletionListOnAliases2
TestCompletionListPrivateNames
TestCompletionListPrivateNamesAccessors
TestCompletionListPrivateNamesMethods
TestCompletionListStaticMembers
TestCompletionListStaticProtectedMembers
TestCompletionListStaticProtectedMembers2
TestCompletionListStaticProtectedMembers3
TestCompletionListStringParenthesizedExpression
Expand All @@ -130,13 +119,9 @@ TestCompletionOfAwaitPromise6
TestCompletionOfInterfaceAndVar
TestCompletionPreferredSuggestions1
TestCompletionWithConditionalOperatorMissingColon
TestCompletionWithDotFollowedByNamespaceKeyword
TestCompletionsAfterJSDoc
TestCompletionsAugmentedTypesClass2
TestCompletionsBeforeRestArg1
TestCompletionsDefaultExport
TestCompletionsECMAPrivateMember
TestCompletionsECMAPrivateMemberTriggerCharacter
TestCompletionsExportImport
TestCompletionsGenericTypeWithMultipleBases1
TestCompletionsInRequire
Expand All @@ -159,7 +144,6 @@ TestCompletionsLiterals
TestCompletionsMergedDeclarations1
TestCompletionsNamespaceMergedWithClass
TestCompletionsNewTarget
TestCompletionsOptionalKindModifier
TestCompletionsOptionalMethod
TestCompletionsOverridingMethod1
TestCompletionsOverridingMethod10
Expand Down Expand Up @@ -188,7 +172,6 @@ TestCompletionsTriggerCharacter
TestCompletionsTypeOnlyNamespace
TestCompletionsUniqueSymbol1
TestCompletionsWithDeprecatedTag5
TestCompletionsWithDeprecatedTag6
TestCompletionsWithStringReplacementMode1
TestDoubleUnderscoreCompletions
TestExportDefaultClass
Expand All @@ -207,21 +190,13 @@ TestFindAllRefsReExport_broken
TestFindAllRefs_importType_typeofImport
TestFindReferencesAfterEdit
TestGenericTypeWithMultipleBases1MultiFile
TestGetJavaScriptCompletions1
TestGetJavaScriptCompletions10
TestGetJavaScriptCompletions11
TestGetJavaScriptCompletions12
TestGetJavaScriptCompletions13
TestGetJavaScriptCompletions14
TestGetJavaScriptCompletions15
TestGetJavaScriptCompletions18
TestGetJavaScriptCompletions19
TestGetJavaScriptCompletions2
TestGetJavaScriptCompletions20
TestGetJavaScriptCompletions21
TestGetJavaScriptCompletions3
TestGetJavaScriptCompletions4
TestGetJavaScriptCompletions5
TestGetJavaScriptCompletions8
TestGetJavaScriptCompletions9
TestGetJavaScriptGlobalCompletions1
Expand All @@ -248,17 +223,14 @@ TestImportStatementCompletions4
TestImportStatementCompletions_noPatternAmbient
TestImportStatementCompletions_pnpmTransitive
TestImportTypeMemberCompletions
TestJavaScriptClass4
TestJavaScriptModules12
TestJavaScriptModules13
TestJavaScriptModules14
TestJavaScriptModules19
TestJavascriptModules20
TestJavascriptModules21
TestJavascriptModulesTypeImport
TestJsDocFunctionSignatures3
TestJsDocFunctionTypeCompletionsNoCrash
TestJsDocGenerics1
TestJsdocExtendsTagCompletion
TestJsdocImplementsTagCompletion
TestJsdocImportTagCompletion1
Expand All @@ -277,17 +249,12 @@ TestJsdocTypedefTagNamespace
TestJsdocTypedefTagTypeExpressionCompletion
TestJsxFindAllReferencesOnRuntimeImportWithPaths1
TestLocalGetReferences
TestMemberCompletionOnTypeParameters
TestMemberListErrorRecovery
TestMemberListInReopenedEnum
TestMemberListInWithBlock
TestMemberListOfClass
TestMemberListOfExportedClass
TestMemberListOfModuleAfterInvalidCharater
TestMemberListOnConstructorType
TestMemberListOnExplicitThis
TestMemberListOnThisInClassWithPrivates
TestModuleMembersOfGenericType
TestNodeModulesImportCompletions1
TestPathCompletionsAllowModuleAugmentationExtensions
TestPathCompletionsAllowTsExtensions
Expand Down
17 changes: 3 additions & 14 deletions internal/fourslash/tests/basicEdit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,9 @@ p/*a*/`
Items: &fourslash.CompletionsExpectedItems{
Exact: []fourslash.CompletionsExpectedItem{
&lsproto.CompletionItem{
Label: "x",
Kind: ptrTo(lsproto.CompletionItemKindField),
SortText: ptrTo(string(ls.SortTextLocationPriority)),
InsertText: ptrTo(".x"),
FilterText: ptrTo(".x"),
TextEdit: &lsproto.TextEditOrInsertReplaceEdit{
TextEdit: &lsproto.TextEdit{
NewText: ".x",
Range: lsproto.Range{
Start: lsproto.Position{Line: 6, Character: 1},
End: lsproto.Position{Line: 6, Character: 2},
},
},
},
Label: "x",
Kind: ptrTo(lsproto.CompletionItemKindField),
SortText: ptrTo(string(ls.SortTextLocationPriority)),
},
"y",
},
Expand Down
17 changes: 3 additions & 14 deletions internal/fourslash/tests/basicInterfaceMembers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,9 @@ p./*a*/`
Items: &fourslash.CompletionsExpectedItems{
Exact: []fourslash.CompletionsExpectedItem{
&lsproto.CompletionItem{
Label: "x",
Kind: ptrTo(lsproto.CompletionItemKindField),
SortText: ptrTo(string(ls.SortTextLocationPriority)),
InsertText: ptrTo(".x"),
FilterText: ptrTo(".x"),
TextEdit: &lsproto.TextEditOrInsertReplaceEdit{
TextEdit: &lsproto.TextEdit{
NewText: ".x",
Range: lsproto.Range{
Start: lsproto.Position{Line: 6, Character: 1},
End: lsproto.Position{Line: 6, Character: 2},
},
},
},
Label: "x",
Kind: ptrTo(lsproto.CompletionItemKindField),
SortText: ptrTo(string(ls.SortTextLocationPriority)),
},
"y",
},
Expand Down
17 changes: 3 additions & 14 deletions internal/fourslash/tests/basicMultifileCompletions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,9 @@ const test = foo./*1*/`
Items: &fourslash.CompletionsExpectedItems{
Includes: []fourslash.CompletionsExpectedItem{
&lsproto.CompletionItem{
Label: "bar",
Kind: ptrTo(lsproto.CompletionItemKindField),
SortText: ptrTo(string(ls.SortTextLocationPriority)),
FilterText: ptrTo(".bar"),
InsertText: ptrTo(".bar"),
TextEdit: &lsproto.TextEditOrInsertReplaceEdit{
TextEdit: &lsproto.TextEdit{
NewText: ".bar",
Range: lsproto.Range{
Start: lsproto.Position{Line: 1, Character: 16},
End: lsproto.Position{Line: 1, Character: 17},
},
},
},
Label: "bar",
Kind: ptrTo(lsproto.CompletionItemKindField),
SortText: ptrTo(string(ls.SortTextLocationPriority)),
},
},
},
Expand Down
Loading
Loading