userpreferences snapshot

Author: iisaduan

internal/project/session.go

@@ -347,15 +347,16 @@ func (s *Session) Snapshot() (*Snapshot, func()) {
 
 func (s *Session) GetLanguageService(ctx context.Context, uri lsproto.DocumentUri) (*ls.LanguageService, error) {
 	var snapshot *Snapshot
-	fileChanges, overlays, ataChanges, updateConfig := s.flushChanges(ctx)
-	updateSnapshot := !fileChanges.IsEmpty() || len(ataChanges) > 0 || updateConfig
+	fileChanges, overlays, ataChanges, newConfig := s.flushChanges(ctx)
+	updateSnapshot := !fileChanges.IsEmpty() || len(ataChanges) > 0 || newConfig != nil
 	if updateSnapshot {
 		// If there are pending file changes, we need to update the snapshot.
 		// Sending the requested URI ensures that the project for this URI is loaded.
 		snapshot = s.UpdateSnapshot(ctx, overlays, SnapshotChange{
 			reason:        UpdateReasonRequestedLanguageServicePendingChanges,
 			fileChanges:   fileChanges,
 			ataChanges:    ataChanges,
+			newConfig:     newConfig,
 			requestedURIs: []lsproto.DocumentUri{uri},
 		})
 	} else {
@@ -519,7 +520,7 @@ func (s *Session) Close() {
 	s.backgroundQueue.Close()
 }
 
-func (s *Session) flushChanges(ctx context.Context) (FileChangeSummary, map[tspath.Path]*overlay, map[tspath.Path]*ATAStateChange, bool) {
+func (s *Session) flushChanges(ctx context.Context) (FileChangeSummary, map[tspath.Path]*overlay, map[tspath.Path]*ATAStateChange, *ls.UserPreferences) {
 	s.pendingFileChangesMu.Lock()
 	defer s.pendingFileChangesMu.Unlock()
 	s.pendingATAChangesMu.Lock()
@@ -528,10 +529,13 @@ func (s *Session) flushChanges(ctx context.Context) (FileChangeSummary, map[tspa
 	s.pendingATAChanges = make(map[tspath.Path]*ATAStateChange)
 	fileChanges, overlays := s.flushChangesLocked(ctx)
 	s.pendingConfigChangesMu.Lock()
-	updateConfig := s.pendingConfigChanges
+	var newConfig *ls.UserPreferences
+	if s.pendingConfigChanges {
+		newConfig = s.userPreferences.Copy()
+	}
 	s.pendingConfigChanges = false
 	defer s.pendingConfigChangesMu.Unlock()
-	return fileChanges, overlays, pendingATAChanges, updateConfig
+	return fileChanges, overlays, pendingATAChanges, newConfig
 }
 
 // flushChangesLocked should only be called with s.pendingFileChangesMu held.

internal/project/snapshot.go

@@ -133,6 +133,7 @@ type SnapshotChange struct {
 	// It should only be set the value in the next snapshot should be changed. If nil, the
 	// value from the previous snapshot will be copied to the new snapshot.
 	compilerOptionsForInferredProjects *core.CompilerOptions
+	newConfig						*ls.UserPreferences
 	// ataChanges contains ATA-related changes to apply to projects in the new snapshot.
 	ataChanges map[tspath.Path]*ATAStateChange
 	apiRequest *APISnapshotRequest
@@ -251,6 +252,11 @@ func (s *Snapshot) Clone(ctx context.Context, change SnapshotChange, overlays ma
 			}
 		}
 	}
+	
+	userPreferences := s.userPreferences
+	if change.newConfig != nil {
+		userPreferences = change.newConfig
+	}
 
 	snapshotFS, _ := fs.Finalize()
 	newSnapshot := NewSnapshot(
@@ -261,7 +267,7 @@ func (s *Snapshot) Clone(ctx context.Context, change SnapshotChange, overlays ma
 		session.extendedConfigCache,
 		nil,
 		compilerOptionsForInferredProjects,
-		session.userPreferences,
+		userPreferences,
 		s.toPath,
 	)
 	newSnapshot.parentId = s.id