fix crash

Author: iisaduan

internal/ls/lsutil/configuration.go

@@ -14,15 +14,15 @@ type UserConfig struct {
 // if `userPreferences` is nil, this function will return a config with default userPreferences
 func NewUserConfig(userPreferences *UserPreferences) *UserConfig {
 	return &UserConfig{
-		js: userPreferences.CopyOrDefault(),
-		ts: userPreferences.CopyOrDefault(),
+		js: userPreferences.Copy(),
+		ts: userPreferences.Copy(),
 	}
 }
 
 func (c *UserConfig) Copy() *UserConfig {
 	return &UserConfig{
-		ts: c.ts.CopyOrDefault(),
-		js: c.js.CopyOrDefault(),
+		ts: c.ts.Copy(),
+		js: c.js.Copy(),
 	}
 }
 
@@ -46,16 +46,26 @@ func (a *UserConfig) Merge(b *UserConfig) *UserConfig {
 }
 
 func (c *UserConfig) TS() *UserPreferences {
-	return c.ts
+	if c.ts != nil {
+		return c.ts
+	} else if c.js != nil {
+		return c.js
+	}
+	return NewDefaultUserPreferences()
 }
 
 func (c *UserConfig) JS() *UserPreferences {
-	return c.js
+	if c.js != nil {
+		return c.js
+	} else if c.ts != nil {
+		return c.ts
+	}
+	return NewDefaultUserPreferences()
 }
 
 func (c *UserConfig) GetPreferences(activeFile string) *UserPreferences {
 	fileEnding := strings.TrimPrefix(tspath.GetAnyExtensionFromPath(activeFile, nil, true), ".")
-	if tspath.ExtensionIsTs(fileEnding) {
+	if activeFile == "" || tspath.ExtensionIsTs(fileEnding) {
 		if c.ts != nil {
 			return c.ts
 		} else if c.js != nil {
@@ -72,13 +82,12 @@ func (c *UserConfig) GetPreferences(activeFile string) *UserPreferences {
 }
 
 func ParseNewUserConfig(items []any) *UserConfig {
-	defaultPref := NewUserConfig(nil)
-	c := NewUserConfig(nil)
+	defaultPref := NewUserConfig(NewDefaultUserPreferences())
+	c := &UserConfig{}
 	for i, item := range items {
 		if item == nil {
 			// continue
 		} else if config, ok := item.(map[string]any); ok {
-			newConfig := &UserConfig{}
 			switch i {
 			case 0:
 				// if provided, parse and set "js/ts" as base config
@@ -87,13 +96,11 @@ func ParseNewUserConfig(items []any) *UserConfig {
 				continue
 			case 1:
 				// typescript
-				newConfig.ts = defaultPref.ts.ParseWorker(config)
+				c.ts = defaultPref.ts.ParseWorker(config)
 			case 2:
 				// javascript
-				newConfig.js = defaultPref.js.ParseWorker(config)
+				c.js = defaultPref.js.ParseWorker(config)
 			}
-
-			c = c.Merge(newConfig)
 		} else if item, ok := item.(*UserPreferences); ok {
 			// case for fourslash -- fourslash sends the entire userPreferences over
 			// !!! support format and js/ts distinction?

internal/ls/lsutil/userpreferences.go

@@ -626,7 +626,7 @@ func parseIntWithDefault(val any, defaultV int) int {
 
 func (p *UserPreferences) Set(name string, value any) bool {
 	switch strings.ToLower(name) {
-	case "quotePreference":
+	case "quotepreference":
 		p.QuotePreference = parseQuotePreference(value)
 	case "lazyconfiguredprojectsfromexternalproject":
 		p.LazyConfiguredProjectsFromExternalProject = parseBoolWithDefault(value, false)

internal/project/session_test.go

@@ -904,6 +904,50 @@ func TestSession(t *testing.T) {
 		assert.Equal(t, len(codeLensRefreshCalls), 1, "expected one RefreshCodeLens call after code lens preference change")
 		assert.Equal(t, len(inlayHintsRefreshCalls), 1, "expected one RefreshInlayHints call after inlay hints preference change")
 	})
+	t.Run("config parsing", func(t *testing.T) {
+		t.Parallel()
+		files := map[string]any{
+			"/src/tsconfig.json": "{}",
+			"/src/index.ts":      "export const x = 1;",
+		}
+		session, _ := projecttestutil.Setup(files)
+		session.DidOpenFile(context.Background(), "file:///src/index.ts", 1, files["/src/index.ts"].(string), lsproto.LanguageKindTypeScript)
+		_, err := session.GetLanguageService(context.Background(), lsproto.DocumentUri("file:///src/index.ts"))
+		assert.NilError(t, err)
+
+		configMap1 := map[string]any{
+			"UseAliasesForRename":       true,
+			"QuotePreference":           "single",
+			"OrganizeImportsIgnoreCase": true,
+		}
+		// set "typescript" options only
+		session.Configure(lsutil.ParseNewUserConfig([]any{nil, configMap1, nil}))
+		actualConfig1 := session.Config()
+		expectedPrefs1 := lsutil.NewDefaultUserPreferences()
+		expectedPrefs1.UseAliasesForRename = core.TSTrue
+		expectedPrefs1.QuotePreference = lsutil.QuotePreferenceSingle
+		expectedPrefs1.OrganizeImportsIgnoreCase = core.TSTrue
+
+		// "javascript" options should default to ts
+		assert.DeepEqual(t, *actualConfig1.TS(), *expectedPrefs1)
+		assert.DeepEqual(t, *actualConfig1.JS(), *expectedPrefs1)
+
+		configMap2 := map[string]any{
+			"UseAliasesForRename":       false,
+			"QuotePreference":           "double",
+			"OrganizeImportsIgnoreCase": false,
+		}
+		// set "javascript" options only
+		session.Configure(lsutil.ParseNewUserConfig([]any{nil, nil, configMap2}))
+		actualConfig2 := session.Config()
+		expectedPrefs2 := lsutil.NewDefaultUserPreferences()
+		expectedPrefs2.UseAliasesForRename = core.TSFalse
+		expectedPrefs2.QuotePreference = lsutil.QuotePreferenceDouble
+		expectedPrefs2.OrganizeImportsIgnoreCase = core.TSFalse
+		// "typescript" options should not change
+		assert.DeepEqual(t, *actualConfig2.TS(), *expectedPrefs1)
+		assert.DeepEqual(t, *actualConfig2.JS(), *expectedPrefs2)
+	})
 }
 
 func ptrTo[T any](v T) *T {

internal/project/snapshot.go

@@ -385,14 +385,14 @@ func (s *Snapshot) Clone(ctx context.Context, change SnapshotChange, overlays ma
 	for path, overlay := range overlays {
 		openFiles[path] = overlay.FileName()
 	}
-	oldAutoImports := s.AutoImports
-	if oldAutoImports == nil {
-		oldAutoImports = autoimport.NewRegistry(s.toPath, s.allUserPreferences.TS())
-	}
 	prepareAutoImports := tspath.Path("")
 	if change.ResourceRequest.AutoImports != "" {
 		prepareAutoImports = change.ResourceRequest.AutoImports.Path(s.UseCaseSensitiveFileNames())
 	}
+	oldAutoImports := s.AutoImports
+	if oldAutoImports == nil {
+		oldAutoImports = autoimport.NewRegistry(s.toPath, s.allUserPreferences.GetPreferences(string(prepareAutoImports)))
+	}
 	var autoImportsWatch *WatchedFiles[map[tspath.Path]string]
 	autoImports, err := oldAutoImports.Clone(ctx, autoimport.RegistryChange{
 		RequestedFile:   prepareAutoImports,
@@ -401,7 +401,7 @@ func (s *Snapshot) Clone(ctx context.Context, change SnapshotChange, overlays ma
 		Created:         change.fileChanges.Created,
 		Deleted:         change.fileChanges.Deleted,
 		RebuiltPrograms: projectsWithNewProgramStructure,
-		UserPreferences: config.TS(),
+		UserPreferences: config.GetPreferences(string(prepareAutoImports)),
 	}, autoImportHost, logger.Fork("UpdateAutoImports"))
 	if err == nil {
 		autoImportsWatch = s.autoImportsWatch.Clone(autoImports.NodeModulesDirectories())