Skip to content

Update to 7th JSON Schema draft and fix typos #3237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jassielof wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −8
Open

Update to 7th JSON Schema draft and fix typos #3237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "http://json-schema.org/draft-04/schema",
"$schema": "https://json-schema.org/draft-07/schema",
"title": "ZLS Config",
"description": "Configuration file for ZLS",
"type": "object",
Expand All @@ -20,7 +20,7 @@
"default": true
},
"enable_build_on_save": {
"description": "Whether to enable build-on-save diagnostics. Will be automatically enabled if the `build.zig` has declared a 'check' step.\n\nFor more infromation, checkout the [Build-On-Save](https://zigtools.org/zls/guides/build-on-save/) Guide.",
"description": "Whether to enable build-on-save diagnostics. Will be automatically enabled if the `build.zig` has declared a 'check' step.\n\nFor more information, checkout the [Build-On-Save](https://zigtools.org/zls/guides/build-on-save/) Guide.",
"type": "boolean",
"default": null
},
Expand Down Expand Up @@ -78,7 +78,7 @@
"default": false
},
"force_autofix": {
"description": "Work around editors that do not support 'source.fixall' code actions on save. This option may delivered a substandard user experience. Please refer to the installation guide to see which editors natively support code actions on save.",
"description": "Work around editors that do not support 'source.fixall' code actions on save. This option may deliver a substandard user experience. Please refer to the installation guide to see which editors natively support code actions on save.",
"type": "boolean",
"default": false
},
Expand Down
4 changes: 2 additions & 2 deletions src/Config.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ completion_label_details: bool = true,

/// Whether to enable build-on-save diagnostics. Will be automatically enabled if the `build.zig` has declared a 'check' step.
///
/// For more infromation, checkout the [Build-On-Save](https://zigtools.org/zls/guides/build-on-save/) Guide.
/// For more information, checkout the [Build-On-Save](https://zigtools.org/zls/guides/build-on-save/) Guide.
enable_build_on_save: ?bool = null,

/// Specify which arguments should be passed to Zig when running build-on-save.
Expand Down Expand Up @@ -51,7 +51,7 @@ inlay_hints_hide_redundant_param_names: bool = false,
/// Hides inlay hints when parameter name matches the last token of a parameter node (e.g. `foo: bar.foo`, `foo: &foo`)
inlay_hints_hide_redundant_param_names_last_token: bool = false,

/// Work around editors that do not support 'source.fixall' code actions on save. This option may delivered a substandard user experience. Please refer to the installation guide to see which editors natively support code actions on save.
/// Work around editors that do not support 'source.fixall' code actions on save. This option may deliver a substandard user experience. Please refer to the installation guide to see which editors natively support code actions on save.
force_autofix: bool = false,

/// Enables warnings for style guideline mismatches
Expand Down
4 changes: 2 additions & 2 deletions src/tools/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
{
"name": "enable_build_on_save",
"description": "Whether to enable build-on-save diagnostics. Will be automatically enabled if the `build.zig` has declared a 'check' step.\n\nFor more infromation, checkout the [Build-On-Save](https://zigtools.org/zls/guides/build-on-save/) Guide.",
"description": "Whether to enable build-on-save diagnostics. Will be automatically enabled if the `build.zig` has declared a 'check' step.\n\nFor more information, checkout the [Build-On-Save](https://zigtools.org/zls/guides/build-on-save/) Guide.",
"type": "?bool",
"default": null
},
Expand Down Expand Up @@ -85,7 +85,7 @@
},
{
"name": "force_autofix",
"description": "Work around editors that do not support 'source.fixall' code actions on save. This option may delivered a substandard user experience. Please refer to the installation guide to see which editors natively support code actions on save.",
"description": "Work around editors that do not support 'source.fixall' code actions on save. This option may deliver a substandard user experience. Please refer to the installation guide to see which editors natively support code actions on save.",
"type": "bool",
"default": false
},
Expand Down
2 changes: 1 addition & 1 deletion src/tools/config_gen.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const Config = struct {
};

const Schema = struct {
@"$schema": []const u8 = "http://json-schema.org/draft-04/schema",
@"$schema": []const u8 = "https://json-schema.org/draft-07/schema",
title: []const u8 = "ZLS Config",
description: []const u8 = "Configuration file for ZLS",
type: []const u8 = "object",
Expand Down