default configuration in lsp server without notifications

carlverge · Mar 18, 2024 · d981197 · d981197
1 parent 1f4648f
commit d981197
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 22 deletions.
diff --git a/editor/code/package.json b/editor/code/package.json
@@ -10,7 +10,7 @@
   "license": "Apache License Version 2.0",
   "description": "Jsonnet IDE Support. Autocomplete, lint, format, goto def, signature help.",
   "icon": "images/icon.png",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "engines": {
     "vscode": "^1.75.0"
   },
@@ -97,9 +97,9 @@
         },
         "jsonnet.lsp.diag.evaluate": {
           "type": "boolean",
-          "default": true,
+          "default": false,
           "scope": "resource",
-          "description": "Enable live evaluation diagnostics"
+          "description": "Enable live evaluation diagnostics. (Warning: can expensive)"
         },
         "jsonnet.lsp.fmt.indent": {
           "type": "number",

diff --git a/editor/code/src/extension.ts b/editor/code/src/extension.ts
@@ -57,7 +57,8 @@ async function startClient(binaryPath: string, cfg: WorkspaceConfiguration): Pro
 		clientOptions
 	);
 
-	client.start();
+	await client.start();
+	await client.sendNotification(DidChangeConfigurationNotification.type, {settings: cfg});
 }
 
 function builtinBinaryPath(): string {

diff --git a/pkg/lsp/handler.go b/pkg/lsp/handler.go
@@ -19,24 +19,48 @@ import (
 	"go.lsp.dev/uri"
 )
 
+
+type DiagConfiguration struct {
+	Linter   bool `json:"linter"`
+	Evaluate bool `json:"evaluate"`
+}
+
+type FmtConfiguration struct {
+	Indent           int    `json:"indent"`
+	MaxBlankLines    int    `json:"maxBlankLines"`
+	StringStyle      string `json:"stringStyle"`
+	CommentStyle     string `json:"commentStyle"`
+	PrettyFieldNames bool   `json:"prettyFieldNames"`
+	PadArrays        bool   `json:"padArrays"`
+	PadObjects       bool   `json:"padObjects"`
+	SortImports      bool   `json:"sortImports"`
+	ImplicitPlus     bool   `json:"implicitPlus"`
+}
+
+func defaultConfiguration() *Configuration {
+	return &Configuration{
+		Diag: DiagConfiguration{
+			Linter:   true,
+			Evaluate: false,
+		},
+		Fmt: FmtConfiguration{
+			Indent:           2,
+			StringStyle:      "\"",
+			CommentStyle:     "//",
+			MaxBlankLines:    2,
+			PrettyFieldNames: true,
+			PadArrays:        false,
+			PadObjects:       true,
+			ImplicitPlus:     true,
+			SortImports:      true,
+		},
+	}
+}
+
 type Configuration struct {
-	Diag struct {
-		Linter   bool `json:"linter"`
-		Evaluate bool `json:"evaluate"`
-	} `json:"diag"`
-	JPaths []string `json:"jpaths"`
-
-	Fmt struct {
-		Indent           int    `json:"indent"`
-		MaxBlankLines    int    `json:"maxBlankLines"`
-		StringStyle      string `json:"stringStyle"`
-		CommentStyle     string `json:"commentStyle"`
-		PrettyFieldNames bool   `json:"prettyFieldNames"`
-		PadArrays        bool   `json:"padArrays"`
-		PadObjects       bool   `json:"padObjects"`
-		SortImports      bool   `json:"sortImports"`
-		ImplicitPlus     bool   `json:"implicitPlus"`
-	} `json:"fmt"`
+	Diag   DiagConfiguration `json:"diag"`
+	JPaths []string          `json:"jpaths"`
+	Fmt    FmtConfiguration  `json:"fmt"`
 }
 
 func (c *Configuration) FormatterOptions() formatter.Options {

diff --git a/pkg/lsp/lsp.go b/pkg/lsp/lsp.go
@@ -87,7 +87,7 @@ func RunServer(ctx context.Context, stdout *os.File) error {
 		overlay:        overlay.NewOverlay(),
 		cancel:         cancel,
 		notifier:       notifier,
-		config:         &Configuration{},
+		config:         defaultConfiguration(),
 	}
 
 	handler := srv.Handler()