Revamp user preferences serialization/deserialization

internal/fourslash/_scripts/convertFourslash.mts

@@ -1619,6 +1619,7 @@ function stringToTristate(s: string): string {
 
 function parseUserPreferences(arg: ts.ObjectLiteralExpression): string | undefined {
     const inlayHintPreferences: string[] = [];
+    const moduleSpecifierPreferences: string[] = [];
     const preferences: string[] = [];
     for (const prop of arg.properties) {
         if (ts.isPropertyAssignment(prop)) {
@@ -1643,19 +1644,19 @@ function parseUserPreferences(arg: ts.ObjectLiteralExpression): string | undefin
                         }
                         regexes.push(getGoStringLiteral(strElem.text));
                     }
-                    preferences.push(`AutoImportSpecifierExcludeRegexes: []string{${regexes.join(", ")}}`);
+                    moduleSpecifierPreferences.push(`AutoImportSpecifierExcludeRegexes: []string{${regexes.join(", ")}}`);
                     break;
                 case "importModuleSpecifierPreference":
                     if (!ts.isStringLiteralLike(prop.initializer)) {
                         return undefined;
                     }
-                    preferences.push(`ImportModuleSpecifierPreference: ${prop.initializer.getText()}`);
+                    moduleSpecifierPreferences.push(`ImportModuleSpecifierPreference: ${prop.initializer.getText()}`);
                     break;
                 case "importModuleSpecifierEnding":
                     if (!ts.isStringLiteralLike(prop.initializer)) {
                         return undefined;
                     }
-                    preferences.push(`ImportModuleSpecifierEnding: ${prop.initializer.getText()}`);
+                    moduleSpecifierPreferences.push(`ImportModuleSpecifierEnding: ${prop.initializer.getText()}`);
                     break;
                 case "includePackageJsonAutoImports":
                     if (!ts.isStringLiteralLike(prop.initializer)) {
@@ -1736,6 +1737,9 @@ function parseUserPreferences(arg: ts.ObjectLiteralExpression): string | undefin
     if (inlayHintPreferences.length > 0) {
         preferences.push(`InlayHints: lsutil.InlayHintsPreferences{${inlayHintPreferences.join(",")}}`);
     }
+    if (moduleSpecifierPreferences.length > 0) {
+        preferences.push(`ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{${moduleSpecifierPreferences.join(",")}}`);
+    }
     if (preferences.length === 0) {
         return "nil /*preferences*/";
     }

internal/fourslash/fourslash.go

@@ -232,7 +232,7 @@ func NewFourslash(t *testing.T, capabilities *lsproto.ClientCapabilities, conten
 		in:              inputWriter,
 		out:             outputReader,
 		testData:        &testData,
-		userPreferences: lsutil.NewDefaultUserPreferences(), // !!! parse default preferences for fourslash case?
+		userPreferences: lsutil.DefaultUserPreferences,
 		vfs:             fs,
 		scriptInfos:     scriptInfos,
 		converters:      converters,
@@ -657,7 +657,7 @@ func (f *FourslashTest) Configure(t *testing.T, config *lsutil.UserPreferences)
 }
 
 func (f *FourslashTest) ConfigureWithReset(t *testing.T, config *lsutil.UserPreferences) (reset func()) {
-	originalConfig := f.userPreferences.Copy()
+	originalConfig := f.userPreferences
 	f.Configure(t, config)
 	return func() {
 		f.Configure(t, originalConfig)
@@ -1271,7 +1271,7 @@ func (f *FourslashTest) VerifyApplyCodeActionFromCompletion(t *testing.T, marker
 		userPreferences = options.UserPreferences
 	} else {
 		// Default preferences: enables auto-imports
-		userPreferences = lsutil.NewDefaultUserPreferences()
+		userPreferences = lsutil.DefaultUserPreferences
 	}
 
 	reset := f.ConfigureWithReset(t, userPreferences)
@@ -3126,10 +3126,8 @@ func (f *FourslashTest) BaselineAutoImportsCompletions(t *testing.T, markerNames
 	reset := f.ConfigureWithReset(t, &lsutil.UserPreferences{
 		IncludeCompletionsForModuleExports:    core.TSTrue,
 		IncludeCompletionsForImportStatements: core.TSTrue,
-		ImportModuleSpecifierEnding:           f.userPreferences.ImportModuleSpecifierEnding,
-		ImportModuleSpecifierPreference:       f.userPreferences.ImportModuleSpecifierPreference,
+		ModuleSpecifier:                       f.userPreferences.ModuleSpecifier,
 		AutoImportFileExcludePatterns:         f.userPreferences.AutoImportFileExcludePatterns,
-		AutoImportSpecifierExcludeRegexes:     f.userPreferences.AutoImportSpecifierExcludeRegexes,
 		PreferTypeOnlyAutoImports:             f.userPreferences.PreferTypeOnlyAutoImports,
 	})
 	defer reset()
@@ -3417,7 +3415,7 @@ func (f *FourslashTest) VerifyBaselineInlayHints(
 
 	preferences := testPreferences
 	if preferences == nil {
-		preferences = lsutil.NewDefaultUserPreferences()
+		preferences = lsutil.DefaultUserPreferences
 	}
 	reset := f.ConfigureWithReset(t, preferences)
 	defer reset()
@@ -3737,11 +3735,11 @@ type VerifyWorkspaceSymbolCase struct {
 
 // `verify.navigateTo` in Strada.
 func (f *FourslashTest) VerifyWorkspaceSymbol(t *testing.T, cases []*VerifyWorkspaceSymbolCase) {
-	originalPreferences := f.userPreferences.Copy()
+	originalPreferences := f.userPreferences
 	for _, testCase := range cases {
 		preferences := testCase.Preferences
 		if preferences == nil {
-			preferences = lsutil.NewDefaultUserPreferences()
+			preferences = lsutil.DefaultUserPreferences
 		}
 		f.Configure(t, preferences)
 		result := sendRequest(t, f, lsproto.WorkspaceSymbolInfo, &lsproto.WorkspaceSymbolParams{Query: testCase.Pattern})

internal/fourslash/tests/autoImportSpecifierExcludeRegexes_test.go

@@ -24,7 +24,9 @@ ignoredSym/*2*/`
 	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	defer done()
 	f.Configure(t, &lsutil.UserPreferences{
-		AutoImportSpecifierExcludeRegexes:     []string{".*ignoreme.*"},
+		ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{
+			AutoImportSpecifierExcludeRegexes: []string{".*ignoreme.*"},
+		},
 		IncludeCompletionsForModuleExports:    core.TSTrue,
 		IncludeCompletionsForImportStatements: core.TSTrue,
 	})

internal/fourslash/tests/gen/autoImportCrossProject_baseUrl_toDist_test.go

@@ -46,5 +46,5 @@ export function saveMe() {
 	defer done()
 	f.MarkTestAsStradaServer()
 	f.GoToFile(t, "/home/src/workspaces/project/web/src/Helper.ts")
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"../../common/src/MyModule"}, &lsutil.UserPreferences{ImportModuleSpecifierPreference: "non-relative"})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"../../common/src/MyModule"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierPreference: "non-relative"}})
 }

internal/fourslash/tests/gen/autoImportCrossProject_paths_toDist2_test.go

@@ -48,5 +48,5 @@ export function saveMe() {
 	defer done()
 	f.MarkTestAsStradaServer()
 	f.GoToFile(t, "/home/src/workspaces/project/web/src/Helper.ts")
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"@common/MyModule"}, &lsutil.UserPreferences{ImportModuleSpecifierPreference: "non-relative"})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"@common/MyModule"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierPreference: "non-relative"}})
 }

internal/fourslash/tests/gen/autoImportPackageJsonImportsCaseSensitivity_test.go

@@ -27,5 +27,5 @@ export function add(a: number, b: number) {}
 add/*imports*/;`
 	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	defer done()
-	f.VerifyImportFixModuleSpecifiers(t, "imports", []string{"#src/add.ts"}, &lsutil.UserPreferences{ImportModuleSpecifierPreference: "non-relative"})
+	f.VerifyImportFixModuleSpecifiers(t, "imports", []string{"#src/add.ts"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierPreference: "non-relative"}})
 }

internal/fourslash/tests/gen/autoImportPackageJsonImportsPreference1_test.go

@@ -25,5 +25,5 @@ export function something(name: string): any;
 something/**/`
 	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	defer done()
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"./src/a/b/c/something"}, &lsutil.UserPreferences{ImportModuleSpecifierPreference: "relative"})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"./src/a/b/c/something"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierPreference: "relative"}})
 }

internal/fourslash/tests/gen/autoImportPackageJsonImportsPreference2_test.go

@@ -25,5 +25,5 @@ export function something(name: string): any;
 something/**/`
 	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	defer done()
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"./src/a/b/c/something"}, &lsutil.UserPreferences{ImportModuleSpecifierPreference: "project-relative"})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"./src/a/b/c/something"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierPreference: "project-relative"}})
 }

internal/fourslash/tests/gen/autoImportPackageJsonImportsPreference3_test.go

@@ -25,5 +25,5 @@ export function something(name: string): any;
 something/**/`
 	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	defer done()
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"#a/b/c/something"}, &lsutil.UserPreferences{ImportModuleSpecifierPreference: "non-relative"})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"#a/b/c/something"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierPreference: "non-relative"}})
 }

internal/fourslash/tests/gen/autoImportPaths_test.go

@@ -33,5 +33,5 @@ bar/**/
 export const bar = 0;`
 	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	defer done()
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"package2/file1"}, &lsutil.UserPreferences{ImportModuleSpecifierPreference: "shortest"})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"package2/file1"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierPreference: "shortest"}})
 }

internal/fourslash/tests/gen/autoImportSpecifierExcludeRegexes1_test.go

@@ -28,15 +28,15 @@ x/**/`
 	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	defer done()
 	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient", "ambient/utils"}, nil /*preferences*/)
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient"}, &lsutil.UserPreferences{AutoImportSpecifierExcludeRegexes: []string{"utils"}})
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient", "ambient/utils"}, &lsutil.UserPreferences{AutoImportSpecifierExcludeRegexes: []string{"/UTILS/"}})
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient"}, &lsutil.UserPreferences{AutoImportSpecifierExcludeRegexes: []string{"/UTILS/i"}})
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient", "ambient/utils"}, &lsutil.UserPreferences{AutoImportSpecifierExcludeRegexes: []string{"/ambient/utils/"}})
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient"}, &lsutil.UserPreferences{AutoImportSpecifierExcludeRegexes: []string{"/ambient\\/utils/"}})
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient"}, &lsutil.UserPreferences{AutoImportSpecifierExcludeRegexes: []string{"/.*?$"}})
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient"}, &lsutil.UserPreferences{AutoImportSpecifierExcludeRegexes: []string{"^ambient/"}})
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient/utils"}, &lsutil.UserPreferences{AutoImportSpecifierExcludeRegexes: []string{"ambient$"}})
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient", "ambient/utils"}, &lsutil.UserPreferences{AutoImportSpecifierExcludeRegexes: []string{"oops("}})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{AutoImportSpecifierExcludeRegexes: []string{"utils"}}})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient", "ambient/utils"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{AutoImportSpecifierExcludeRegexes: []string{"/UTILS/"}}})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{AutoImportSpecifierExcludeRegexes: []string{"/UTILS/i"}}})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient", "ambient/utils"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{AutoImportSpecifierExcludeRegexes: []string{"/ambient/utils/"}}})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{AutoImportSpecifierExcludeRegexes: []string{"/ambient\\/utils/"}}})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{AutoImportSpecifierExcludeRegexes: []string{"/.*?$"}}})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{AutoImportSpecifierExcludeRegexes: []string{"^ambient/"}}})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient/utils"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{AutoImportSpecifierExcludeRegexes: []string{"ambient$"}}})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"ambient", "ambient/utils"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{AutoImportSpecifierExcludeRegexes: []string{"oops("}}})
 	f.VerifyCompletions(t, "", &fourslash.CompletionsExpectedList{
 		IsIncomplete: false,
 		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{

internal/fourslash/tests/gen/autoImportSpecifierExcludeRegexes2_test.go

@@ -28,8 +28,8 @@ add/**/`
 	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	defer done()
 	f.VerifyImportFixModuleSpecifiers(t, "", []string{"./utils"}, nil /*preferences*/)
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"@app/utils"}, &lsutil.UserPreferences{AutoImportSpecifierExcludeRegexes: []string{"^\\./"}})
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"@app/utils"}, &lsutil.UserPreferences{ImportModuleSpecifierPreference: "non-relative"})
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"./utils"}, &lsutil.UserPreferences{ImportModuleSpecifierPreference: "non-relative", AutoImportSpecifierExcludeRegexes: []string{"^@app/"}})
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{}, &lsutil.UserPreferences{AutoImportSpecifierExcludeRegexes: []string{"utils"}})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"@app/utils"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{AutoImportSpecifierExcludeRegexes: []string{"^\\./"}}})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"@app/utils"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierPreference: "non-relative"}})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"./utils"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierPreference: "non-relative", AutoImportSpecifierExcludeRegexes: []string{"^@app/"}}})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{AutoImportSpecifierExcludeRegexes: []string{"utils"}}})
 }

internal/fourslash/tests/gen/autoImportSpecifierExcludeRegexes3_test.go

@@ -31,5 +31,5 @@ add/**/`
 	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	defer done()
 	f.VerifyImportFixModuleSpecifiers(t, "", []string{"pkg", "pkg/utils"}, nil /*preferences*/)
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"pkg/utils"}, &lsutil.UserPreferences{AutoImportSpecifierExcludeRegexes: []string{"^pkg$"}})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"pkg/utils"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{AutoImportSpecifierExcludeRegexes: []string{"^pkg$"}}})
 }

internal/fourslash/tests/gen/importNameCodeFixJsEnding_test.go

@@ -23,5 +23,5 @@ export declare function customElement(name: string): any;
 customElement/**/`
 	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	defer done()
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"lit/decorators.js"}, &lsutil.UserPreferences{ImportModuleSpecifierEnding: "js"})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"lit/decorators.js"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierEnding: "js"}})
 }

internal/fourslash/tests/gen/importNameCodeFixNewImportBaseUrl1_test.go

@@ -34,5 +34,5 @@ f1();`,
 		`import { f1 } from "b/x";
 
 f1();`,
-	}, &lsutil.UserPreferences{ImportModuleSpecifierPreference: "non-relative"})
+	}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierPreference: "non-relative"}})
 }

internal/fourslash/tests/gen/importNameCodeFixNewImportBaseUrl2_test.go

@@ -34,5 +34,5 @@ f1();`,
 		`import { f1 } from "../b/x";
 
 f1();`,
-	}, &lsutil.UserPreferences{ImportModuleSpecifierPreference: "relative"})
+	}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierPreference: "relative"}})
 }

internal/fourslash/tests/gen/importNameCodeFix_barrelExport2_test.go

@@ -35,6 +35,6 @@ export { A } from "../foo/a";
 export * from "./a";`
 	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	defer done()
-	f.VerifyImportFixModuleSpecifiers(t, "sibling", []string{"proj/foo/a", "proj/src/utils", "proj", "proj/foo"}, &lsutil.UserPreferences{ImportModuleSpecifierPreference: "non-relative"})
-	f.VerifyImportFixModuleSpecifiers(t, "parent", []string{"proj/foo", "proj/foo/a", "proj/src/utils", "proj"}, &lsutil.UserPreferences{ImportModuleSpecifierPreference: "non-relative"})
+	f.VerifyImportFixModuleSpecifiers(t, "sibling", []string{"proj/foo/a", "proj/src/utils", "proj", "proj/foo"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierPreference: "non-relative"}})
+	f.VerifyImportFixModuleSpecifiers(t, "parent", []string{"proj/foo", "proj/foo/a", "proj/src/utils", "proj"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierPreference: "non-relative"}})
 }

internal/fourslash/tests/gen/importNameCodeFix_barrelExport3_test.go

@@ -31,6 +31,6 @@ A/*parent*/
 export * from "./a";`
 	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	defer done()
-	f.VerifyImportFixModuleSpecifiers(t, "sibling", []string{"./a", "./index", "../index"}, &lsutil.UserPreferences{ImportModuleSpecifierEnding: "index"})
-	f.VerifyImportFixModuleSpecifiers(t, "parent", []string{"../foo/a", "../foo/index", "../index"}, &lsutil.UserPreferences{ImportModuleSpecifierEnding: "index"})
+	f.VerifyImportFixModuleSpecifiers(t, "sibling", []string{"./a", "./index", "../index"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierEnding: "index"}})
+	f.VerifyImportFixModuleSpecifiers(t, "parent", []string{"../foo/a", "../foo/index", "../index"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierEnding: "index"}})
 }

internal/fourslash/tests/gen/importNameCodeFix_pathsWithExtension_test.go

@@ -32,5 +32,5 @@ export function helloWorld() {}
 helloWorld/**/`
 	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	defer done()
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"#internals/example"}, &lsutil.UserPreferences{ImportModuleSpecifierEnding: "js"})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"#internals/example"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierEnding: "js"}})
 }

internal/fourslash/tests/gen/importNameCodeFix_typesVersions_test.go

@@ -36,5 +36,5 @@ import {} from "unified";
 x/**/`
 	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	defer done()
-	f.VerifyImportFixModuleSpecifiers(t, "", []string{"unified", "unified/types/ts3.444/index.js"}, &lsutil.UserPreferences{ImportModuleSpecifierEnding: "js"})
+	f.VerifyImportFixModuleSpecifiers(t, "", []string{"unified", "unified/types/ts3.444/index.js"}, &lsutil.UserPreferences{ModuleSpecifier: lsutil.ModuleSpecifierUserPreferences{ImportModuleSpecifierEnding: "js"}})
 }