Add locale-sensitive sorting + completion fixes (#1456)

gabritto · web-flow · commit 62a8b8931900 · 2025-07-30T20:16:58.000Z
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -295,3 +295,37 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ---------------------------------------------------------
+
+---------------------------------------------------------
+
+golang.org/x/text v0.27.0 - BSD-3-Clause
+
+Copyright 2009 The Go Authors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google LLC nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---------------------------------------------------------
diff --git a/go.mod b/go.mod
@@ -9,13 +9,14 @@ require (
 	github.com/peter-evans/patience v0.3.0
 	golang.org/x/sync v0.16.0
 	golang.org/x/sys v0.34.0
+	golang.org/x/text v0.27.0
 	gotest.tools/v3 v3.5.2
 )
 
 require (
 	github.com/matryer/moq v0.5.3 // indirect
-	golang.org/x/mod v0.24.0 // indirect
-	golang.org/x/tools v0.32.0 // indirect
+	golang.org/x/mod v0.25.0 // indirect
+	golang.org/x/tools v0.34.0 // indirect
 	mvdan.cc/gofumpt v0.8.0 // indirect
 )
 
diff --git a/go.sum b/go.sum
@@ -18,14 +18,16 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
-golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
-golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
+golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
 golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
 golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
-golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
+golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
+golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
+golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
+golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
 gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
 gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
 mvdan.cc/gofumpt v0.8.0 h1:nZUCeC2ViFaerTcYKstMmfysj6uhQrA2vJe+2vwGU6k=
diff --git a/internal/astnav/tokens.go b/internal/astnav/tokens.go
@@ -53,7 +53,7 @@ func getTokenAtPosition(
 			prevSubtree = node
 		}
 
-		if node.End() <= position {
+		if node.End() < position || node.Kind != ast.KindEndOfFile && node.End() == position {
 			return -1
 		}
 		if getPosition(node, sourceFile, allowPositionInLeadingTrivia) > position {
diff --git a/internal/core/context.go b/internal/core/context.go
@@ -1,10 +1,17 @@
 package core
 
-import "context"
+import (
+	"context"
+
+	"golang.org/x/text/language"
+)
 
 type key int
 
-var requestIDKey key
+const (
+	requestIDKey key = iota
+	localeKey
+)
 
 func WithRequestID(ctx context.Context, id string) context.Context {
 	return context.WithValue(ctx, requestIDKey, id)
@@ -16,3 +23,14 @@ func GetRequestID(ctx context.Context) string {
 	}
 	return ""
 }
+
+func WithLocale(ctx context.Context, locale language.Tag) context.Context {
+	return context.WithValue(ctx, localeKey, locale)
+}
+
+func GetLocale(ctx context.Context) language.Tag {
+	if locale, ok := ctx.Value(localeKey).(language.Tag); ok {
+		return locale
+	}
+	return language.Und
+}
diff --git a/internal/fourslash/_scripts/failingTests.txt b/internal/fourslash/_scripts/failingTests.txt
@@ -1,5 +1,4 @@
 TestAugmentedTypesClass1
-TestClosedCommentsInConstructor
 TestCodeCompletionEscaping
 TestCompletionAfterQuestionDot
 TestCompletionAutoInsertQuestionDot
@@ -66,21 +65,13 @@ TestCompletionInNamedImportLocation
 TestCompletionInUncheckedJSFile
 TestCompletionInfoWithExplicitTypeArguments
 TestCompletionJSDocNamePath
-TestCompletionListAndMemberListOnCommentedDot
-TestCompletionListAndMemberListOnCommentedWhiteSpace
 TestCompletionListBuilderLocations_VariableDeclarations
-TestCompletionListClassMembers
 TestCompletionListForDerivedType1
-TestCompletionListForExportEquals
-TestCompletionListForTransitivelyExportedMembers01
 TestCompletionListForTransitivelyExportedMembers04
 TestCompletionListFunctionExpression
-TestCompletionListFunctionMembers
 TestCompletionListInArrowFunctionInUnclosedCallSite01
 TestCompletionListInClassExpressionWithTypeParameter
 TestCompletionListInClassStaticBlocks
-TestCompletionListInComments
-TestCompletionListInExtendsClause
 TestCompletionListInImportClause01
 TestCompletionListInImportClause05
 TestCompletionListInImportClause06
@@ -103,10 +94,6 @@ TestCompletionListInvalidMemberNames_withExistingIdentifier
 TestCompletionListObjectMembersInTypeLocationWithTypeof
 TestCompletionListOfGenericSymbol
 TestCompletionListOnAliases
-TestCompletionListOnAliases2
-TestCompletionListStaticMembers
-TestCompletionListStaticProtectedMembers2
-TestCompletionListStaticProtectedMembers3
 TestCompletionListStringParenthesizedExpression
 TestCompletionListStringParenthesizedType
 TestCompletionListWithoutVariableinitializer
@@ -119,12 +106,10 @@ TestCompletionOfInterfaceAndVar
 TestCompletionPreferredSuggestions1
 TestCompletionWithConditionalOperatorMissingColon
 TestCompletionsAfterJSDoc
-TestCompletionsAugmentedTypesClass2
 TestCompletionsBeforeRestArg1
 TestCompletionsExportImport
 TestCompletionsGenericTypeWithMultipleBases1
 TestCompletionsInRequire
-TestCompletionsInterfaceElement
 TestCompletionsJSDocImportTagAttributesEmptyModuleSpecifier1
 TestCompletionsJSDocImportTagAttributesErrorModuleSpecifier1
 TestCompletionsJSDocImportTagEmptyModuleSpecifier1
@@ -141,7 +126,6 @@ TestCompletionsKeyof
 TestCompletionsLiteralFromInferenceWithinInferredType3
 TestCompletionsLiterals
 TestCompletionsMergedDeclarations1
-TestCompletionsNamespaceMergedWithClass
 TestCompletionsNewTarget
 TestCompletionsOptionalMethod
 TestCompletionsOverridingMethod1
@@ -161,21 +145,17 @@ TestCompletionsPaths_kinds
 TestCompletionsPaths_pathMapping
 TestCompletionsPaths_pathMapping_nonTrailingWildcard1
 TestCompletionsPaths_pathMapping_parentDirectory
-TestCompletionsPropertiesPriorities
 TestCompletionsRecommended_union
 TestCompletionsRedeclareModuleAsGlobal
 TestCompletionsStringLiteral_fromTypeConstraint
 TestCompletionsStringsWithTriggerCharacter
 TestCompletionsSymbolMembers
 TestCompletionsTriggerCharacter
-TestCompletionsTypeOnlyNamespace
 TestCompletionsUniqueSymbol1
-TestCompletionsWithDeprecatedTag5
 TestCompletionsWithStringReplacementMode1
 TestDoubleUnderscoreCompletions
 TestExportDefaultClass
 TestExportDefaultFunction
-TestExportEqualCallableInterface
 TestFindAllReferencesTripleSlash
 TestFindAllReferencesUmdModuleAsGlobalConst
 TestFindAllRefsCommonJsRequire
@@ -222,7 +202,6 @@ TestImportCompletions_importsMap5
 TestImportStatementCompletions4
 TestImportStatementCompletions_noPatternAmbient
 TestImportStatementCompletions_pnpmTransitive
-TestImportTypeMemberCompletions
 TestJavascriptModules20
 TestJavascriptModules21
 TestJavascriptModulesTypeImport
@@ -250,10 +229,7 @@ TestJsxFindAllReferencesOnRuntimeImportWithPaths1
 TestLocalGetReferences
 TestMemberListInReopenedEnum
 TestMemberListInWithBlock
-TestMemberListOfClass
 TestMemberListOfExportedClass
-TestMemberListOfModuleAfterInvalidCharater
-TestMemberListOnConstructorType
 TestNodeModulesImportCompletions1
 TestPathCompletionsAllowModuleAugmentationExtensions
 TestPathCompletionsAllowTsExtensions
@@ -326,4 +302,3 @@ TestTsxCompletion14
 TestTsxCompletion15
 TestTsxCompletion8
 TestTsxCompletionNonTagLessThan
-TestUnclosedCommentsInConstructor
diff --git a/internal/fourslash/fourslash.go b/internal/fourslash/fourslash.go
@@ -228,7 +228,9 @@ func (f *FourslashTest) nextID() int32 {
 }
 
 func (f *FourslashTest) initialize(t *testing.T, capabilities *lsproto.ClientCapabilities) {
-	params := &lsproto.InitializeParams{}
+	params := &lsproto.InitializeParams{
+		Locale: ptrTo("en-US"),
+	}
 	params.Capabilities = getCapabilitiesWithDefaults(capabilities)
 	// !!! check for errors?
 	sendRequest(t, f, lsproto.InitializeInfo, params)
diff --git a/internal/fourslash/tests/gen/closedCommentsInConstructor_test.go b/internal/fourslash/tests/gen/closedCommentsInConstructor_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestClosedCommentsInConstructor(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `class Foo {
     constructor(/* /**/ */) { }
diff --git a/internal/fourslash/tests/gen/completionListAndMemberListOnCommentedDot_test.go b/internal/fourslash/tests/gen/completionListAndMemberListOnCommentedDot_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestCompletionListAndMemberListOnCommentedDot(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `module M {
   export class C { public pub = 0; private priv = 1; }
diff --git a/internal/fourslash/tests/gen/completionListAndMemberListOnCommentedWhiteSpace_test.go b/internal/fourslash/tests/gen/completionListAndMemberListOnCommentedWhiteSpace_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestCompletionListAndMemberListOnCommentedWhiteSpace(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `module M {
   export class C { public pub = 0; private priv = 1; }
diff --git a/internal/fourslash/tests/gen/completionListClassMembers_test.go b/internal/fourslash/tests/gen/completionListClassMembers_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestCompletionListClassMembers(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `class Class {
     private privateInstanceMethod() { }
diff --git a/internal/fourslash/tests/gen/completionListForExportEquals_test.go b/internal/fourslash/tests/gen/completionListForExportEquals_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestCompletionListForExportEquals(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: /node_modules/foo/index.d.ts
 export = Foo;
diff --git a/internal/fourslash/tests/gen/completionListForTransitivelyExportedMembers01_test.go b/internal/fourslash/tests/gen/completionListForTransitivelyExportedMembers01_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionListForTransitivelyExportedMembers01(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: A.ts
 export interface I1 { one: number }
diff --git a/internal/fourslash/tests/gen/completionListFunctionMembers_test.go b/internal/fourslash/tests/gen/completionListFunctionMembers_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestCompletionListFunctionMembers(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `function fnc1() {
     var bar = 1;
diff --git a/internal/fourslash/tests/gen/completionListInComments_test.go b/internal/fourslash/tests/gen/completionListInComments_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestCompletionListInComments(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `var foo = '';
 ( // f/**/`
diff --git a/internal/fourslash/tests/gen/completionListInExtendsClause_test.go b/internal/fourslash/tests/gen/completionListInExtendsClause_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestCompletionListInExtendsClause(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `interface IFoo {
     method();
diff --git a/internal/fourslash/tests/gen/completionListOnAliases2_test.go b/internal/fourslash/tests/gen/completionListOnAliases2_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestCompletionListOnAliases2(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `module M {
     export interface I { }
diff --git a/internal/fourslash/tests/gen/completionListStaticMembers_test.go b/internal/fourslash/tests/gen/completionListStaticMembers_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestCompletionListStaticMembers(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `class Foo {
     static a() {}
diff --git a/internal/fourslash/tests/gen/completionListStaticProtectedMembers2_test.go b/internal/fourslash/tests/gen/completionListStaticProtectedMembers2_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestCompletionListStaticProtectedMembers2(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `class Base {
     private static privateMethod() { }
diff --git a/internal/fourslash/tests/gen/completionListStaticProtectedMembers3_test.go b/internal/fourslash/tests/gen/completionListStaticProtectedMembers3_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestCompletionListStaticProtectedMembers3(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `class Base {
     private static privateMethod() { }
diff --git a/internal/fourslash/tests/gen/completionsAugmentedTypesClass2_test.go b/internal/fourslash/tests/gen/completionsAugmentedTypesClass2_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestCompletionsAugmentedTypesClass2(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `class c5b { public foo(){ } }
 module c5b { var y = 2; } // should be ok
diff --git a/internal/fourslash/tests/gen/completionsInterfaceElement_test.go b/internal/fourslash/tests/gen/completionsInterfaceElement_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestCompletionsInterfaceElement(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `const foo = 0;
 interface I {
diff --git a/internal/fourslash/tests/gen/completionsNamespaceMergedWithClass_test.go b/internal/fourslash/tests/gen/completionsNamespaceMergedWithClass_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestCompletionsNamespaceMergedWithClass(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `class C {
     static m() { }
diff --git a/internal/fourslash/tests/gen/completionsPropertiesPriorities_test.go b/internal/fourslash/tests/gen/completionsPropertiesPriorities_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestCompletionsPropertiesPriorities(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @strict: true
 interface I {
diff --git a/internal/fourslash/tests/gen/completionsTypeOnlyNamespace_test.go b/internal/fourslash/tests/gen/completionsTypeOnlyNamespace_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestCompletionsTypeOnlyNamespace(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: /a.ts
 export namespace ns {
diff --git a/internal/fourslash/tests/gen/completionsWithDeprecatedTag5_test.go b/internal/fourslash/tests/gen/completionsWithDeprecatedTag5_test.go
diff --git a/internal/fourslash/tests/gen/exportEqualCallableInterface_test.go b/internal/fourslash/tests/gen/exportEqualCallableInterface_test.go
diff --git a/internal/fourslash/tests/gen/importTypeMemberCompletions_test.go b/internal/fourslash/tests/gen/importTypeMemberCompletions_test.go
diff --git a/internal/fourslash/tests/gen/memberListOfClass_test.go b/internal/fourslash/tests/gen/memberListOfClass_test.go
diff --git a/internal/fourslash/tests/gen/memberListOfModuleAfterInvalidCharater_test.go b/internal/fourslash/tests/gen/memberListOfModuleAfterInvalidCharater_test.go
diff --git a/internal/fourslash/tests/gen/memberListOnConstructorType_test.go b/internal/fourslash/tests/gen/memberListOnConstructorType_test.go
diff --git a/internal/fourslash/tests/gen/unclosedCommentsInConstructor_test.go b/internal/fourslash/tests/gen/unclosedCommentsInConstructor_test.go
diff --git a/internal/fourslash/tests/util/util.go b/internal/fourslash/tests/util/util.go
diff --git a/internal/ls/completions.go b/internal/ls/completions.go
diff --git a/internal/ls/format.go b/internal/ls/format.go
diff --git a/internal/ls/utilities.go b/internal/ls/utilities.go
diff --git a/internal/lsp/server.go b/internal/lsp/server.go

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func getTokenAtPosition(`
`53`	`53`	`prevSubtree = node`
`54`	`54`	`}`
`55`	`55`
`56`		`- if node.End() <= position {`
	`56`	`+ if node.End() < position \|\| node.Kind != ast.KindEndOfFile && node.End() == position {`
`57`	`57`	`return -1`
`58`	`58`	`}`
`59`	`59`	`if getPosition(node, sourceFile, allowPositionInLeadingTrivia) > position {`