didchangeconfigure

Author: iisaduan

internal/fourslash/fourslash.go

@@ -282,7 +282,7 @@ func sendRequest[Params, Resp any](t *testing.T, f *FourslashTest, info lsproto.
 			req := lsproto.ResponseMessage{
 				ID:      req.ID,
 				JSONRPC: req.JSONRPC,
-				Result:  []any{&f.userPreferences},
+				Result:  []any{f.userPreferences},
 			}
 			f.writeMsg(t, req.Message())
 			resp = f.readMsg(t)

internal/fourslash/tests/autoImportCompletion_test.go

@@ -43,6 +43,8 @@ a/**/
 	f.VerifyCompletions(t, "", &fourslash.CompletionsExpectedList{
 		UserPreferences: &ls.UserPreferences{
 			// completion autoimport preferences off; this tests if fourslash server communication correctly registers changes in user preferences
+			IncludeCompletionsForModuleExports:    core.TSUnknown,
+			IncludeCompletionsForImportStatements: core.TSUnknown,
 		},
 		IsIncomplete: false,
 		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{

internal/ls/userpreferences.go

@@ -349,7 +349,21 @@ func (p *UserPreferences) ModuleSpecifierPreferences() modulespecifiers.UserPref
 }
 
 // ------ Parsing Config Response -------
-func (p *UserPreferences) Parse(config map[string]interface{}) {
+
+// returns non-nil if should break loop
+func (p *UserPreferences) Parse(item any) *UserPreferences {
+	if item == nil {
+		// continue
+	} else if config, ok := item.(map[string]any); ok {
+		p.parseWorker(config)
+	} else if item, ok := item.(*UserPreferences); ok {
+		// case for fourslash
+		return item.CopyOrDefault()
+	}
+	return nil
+}
+
+func (p *UserPreferences) parseWorker(config map[string]interface{}) {
 	// Process unstable preferences first so that they do not overwrite stable properties
 	if unstable, ok := config["unstable"]; ok {
 		// unstable properties must be named the same as userPreferences
@@ -526,14 +540,21 @@ func parseBoolWithDefault(val any, defaultV bool) bool {
 	return defaultV
 }
 
+func parseIntWithDefault(val any, defaultV int) int {
+	if v, ok := val.(int); ok {
+		return v
+	}
+	return defaultV
+}
+
 func (p *UserPreferences) set(name string, value any) {
 	switch strings.ToLower(name) {
 	case "quotePreference":
 		p.QuotePreference = parseQuotePreference(value)
 	case "lazyconfiguredprojectsfromexternalproject":
 		p.LazyConfiguredProjectsFromExternalProject = parseBoolWithDefault(value, false)
-	// case "maximumhoverlength":
-	// 	p.MaximumHoverLength = tsoptions.ParseInt(value, 500)
+	case "maximumhoverlength":
+		p.MaximumHoverLength = parseIntWithDefault(value, 500)
 	case "includecompletionsformoduleexports":
 		p.IncludeCompletionsForModuleExports = tsoptions.ParseTristate(value)
 	case "includecompletionsforimportstatements":

internal/lsp/server.go

@@ -218,7 +218,7 @@ func (s *Server) RefreshDiagnostics(ctx context.Context) error {
 	return nil
 }
 
-func (s *Server) Configure(ctx context.Context) (*ls.UserPreferences, error) {
+func (s *Server) RequestConfiguration(ctx context.Context) (*ls.UserPreferences, error) {
 	result, err := s.sendRequest(ctx, lsproto.MethodWorkspaceConfiguration, &lsproto.ConfigurationParams{
 		Items: []*lsproto.ConfigurationItem{
 			{
@@ -233,14 +233,8 @@ func (s *Server) Configure(ctx context.Context) (*ls.UserPreferences, error) {
 	s.Log(fmt.Sprintf("\n\nconfiguration: %+v, %T\n\n", configs, configs))
 	userPreferences := ls.NewDefaultUserPreferences()
 	for _, item := range configs {
-		if item == nil {
-			// continue
-		} else if config, ok := item.(map[string]any); ok {
-			userPreferences.Parse(config)
-		} else if item, ok := item.(ls.UserPreferences); ok {
-			// case for fourslash
-			userPreferences = &item
-			break
+		if parsed := userPreferences.Parse(item); parsed != nil {
+			return parsed, nil
 		}
 	}
 	return userPreferences, nil
@@ -696,11 +690,15 @@ func (s *Server) handleInitialized(ctx context.Context, params *lsproto.Initiali
 		NpmExecutor: s,
 		ParseCache:  s.parseCache,
 	})
-	userPreferences, err := s.Configure(ctx)
-	if err != nil {
-		return err
+
+	// request userPreferences if not provided at initialization
+	if s.session.UserPreferences() == nil {
+		userPreferences, err := s.RequestConfiguration(ctx)
+		if err != nil {
+			return err
+		}
+		s.session.Configure(userPreferences)
 	}
-	s.session.Configure(userPreferences)
 	// !!! temporary; remove when we have `handleDidChangeConfiguration`/implicit project config support
 	if s.compilerOptionsForInferredProjects != nil {
 		s.session.DidChangeCompilerOptionsForInferredProjects(ctx, s.compilerOptionsForInferredProjects)
@@ -719,12 +717,11 @@ func (s *Server) handleExit(ctx context.Context, params any) error {
 }
 
 func (s *Server) handleDidChangeWorkspaceConfiguration(ctx context.Context, params *lsproto.DidChangeConfigurationParams) error {
-	// !!! update user preferences
-	// !!! only usable by fourslash
-	if item, ok := params.Settings.(*ls.UserPreferences); ok {
-		// case for fourslash
-		s.session.Configure(item)
+	userPreferences := s.session.UserPreferences().CopyOrDefault()
+	if parsed := userPreferences.Parse(params.Settings); parsed != nil {
+		userPreferences = parsed
 	}
+	s.session.Configure(userPreferences)
 	return nil
 }
 

internal/project/session.go

@@ -176,6 +176,10 @@ func (s *Session) GetCurrentDirectory() string {
 	return s.options.CurrentDirectory
 }
 
+func (s *Session) UserPreferences() *ls.UserPreferences {
+	return s.userPreferences
+}
+
 // Trace implements module.ResolutionHost
 func (s *Session) Trace(msg string) {
 	panic("ATA module resolution should not use tracing")