merge

Author: iisaduan

internal/execute/tsc.go

@@ -15,8 +15,8 @@ import (
 	"github.com/microsoft/typescript-go/internal/execute/tsc"
 	"github.com/microsoft/typescript-go/internal/format"
 	"github.com/microsoft/typescript-go/internal/jsonutil"
-	"github.com/microsoft/typescript-go/internal/ls/lsutil"
 	"github.com/microsoft/typescript-go/internal/locale"
+	"github.com/microsoft/typescript-go/internal/ls/lsutil"
 	"github.com/microsoft/typescript-go/internal/parser"
 	"github.com/microsoft/typescript-go/internal/pprof"
 	"github.com/microsoft/typescript-go/internal/tsoptions"

internal/ls/lsutil/formatcodeoptions.go

@@ -101,19 +101,19 @@ func (settings *FormatCodeSettings) Parse(prefs any) bool {
 func (settings *FormatCodeSettings) Set(name string, value any) bool {
 	switch strings.ToLower(name) {
 	case "baseindentsize":
-		settings.BaseIndentSize = ParseIntWithDefault(value, 0)
+		settings.BaseIndentSize = parseIntWithDefault(value, 0)
 	case "indentsize":
-		settings.IndentSize = ParseIntWithDefault(value, 4)
+		settings.IndentSize = parseIntWithDefault(value, 4)
 	case "tabsize":
-		settings.TabSize = ParseIntWithDefault(value, 4)
+		settings.TabSize = parseIntWithDefault(value, 4)
 	case "newlinecharacter":
 		settings.NewLineCharacter = core.GetNewLineKind(tsoptions.ParseString(value)).GetNewLineCharacter()
 	case "converttabstospaces":
-		settings.ConvertTabsToSpaces = ParseBoolWithDefault(value, true)
+		settings.ConvertTabsToSpaces = parseBoolWithDefault(value, true)
 	case "indentstyle":
 		settings.IndentStyle = parseIndentStyle(value)
 	case "trimtrailingwhitespace":
-		settings.TrimTrailingWhitespace = ParseBoolWithDefault(value, true)
+		settings.TrimTrailingWhitespace = parseBoolWithDefault(value, true)
 	case "insertspaceaftercommadelimiter":
 		settings.InsertSpaceAfterCommaDelimiter = tsoptions.ParseTristate(value)
 	case "insertspaceaftersemicoloninformstatements":

internal/lsp/server.go

@@ -270,7 +270,6 @@ func (s *Server) RequestConfiguration(ctx context.Context) (*project.Config, err
 	if err != nil {
 		return &project.Config{}, fmt.Errorf("configure request failed: %w", err)
 	}
-	configs := result.([]any)
 	s.Log(fmt.Sprintf("\n\nconfiguration received: %+v, %T\n\n", configs, configs))
 	return project.ParseConfiguration(configs), nil
 }
@@ -1078,7 +1077,7 @@ func (s *Server) handleDidChangeWorkspaceConfiguration(ctx context.Context, para
 	} else if settings, ok := params.Settings.([]any); ok {
 		s.session.Configure(project.ParseConfiguration(settings))
 	} else if settings, ok := params.Settings.(map[string]any); ok {
-		s.session.Configure(project.ParseConfiguration([]any{settings["typescript", "ts", "javascript", "js"]}))
+		s.session.Configure(project.ParseConfiguration([]any{settings["typescript"], settings["ts"], settings["javascript"], settings["js"]}))
 	}
 	return nil
 }