Skip to content

Commit ea1a2d4

Browse files
committed
progress
1 parent 406b637 commit ea1a2d4

File tree

6 files changed

+14
-15
lines changed

6 files changed

+14
-15
lines changed

crates/pgls_configuration/src/linter/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ use serde::{Deserialize, Serialize};
1212
#[partial(cfg_attr(feature = "schema", derive(schemars::JsonSchema)))]
1313
#[partial(serde(rename_all = "camelCase", default, deny_unknown_fields))]
1414
pub struct LinterConfiguration {
15-
# [doc = concat ! ("if `false`, it disables the feature and the " , "linter" , " won't be executed. `true` by default")]
15+
#[doc = r" if `false`, it disables the feature and the linter won't be executed. `true` by default"]
1616
#[partial(bpaf(hide))]
1717
pub enabled: bool,
1818
#[doc = r" List of rules"]
1919
#[partial(bpaf(pure(Default::default()), optional, hide))]
2020
pub rules: Rules,
21-
# [doc = concat ! ("A list of Unix shell style patterns. The " , "linter" , " will ignore files/folders that will match these patterns.")]
21+
#[doc = r" A list of Unix shell style patterns. The linter will ignore files/folders that will match these patterns."]
2222
#[partial(bpaf(hide))]
2323
pub ignore: StringSet,
24-
# [doc = concat ! ("A list of Unix shell style patterns. The " , "linter" , " will include files/folders that will match these patterns.")]
24+
#[doc = r" A list of Unix shell style patterns. The linter will include files/folders that will match these patterns."]
2525
#[partial(bpaf(hide))]
2626
pub include: StringSet,
2727
}

crates/pgls_configuration/src/splinter/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ use serde::{Deserialize, Serialize};
1212
#[partial(cfg_attr(feature = "schema", derive(schemars::JsonSchema)))]
1313
#[partial(serde(rename_all = "camelCase", default, deny_unknown_fields))]
1414
pub struct SplinterConfiguration {
15-
# [doc = concat ! ("if `false`, it disables the feature and the " , "splinter" , " won't be executed. `true` by default")]
15+
#[doc = r" if `false`, it disables the feature and the linter won't be executed. `true` by default"]
1616
#[partial(bpaf(hide))]
1717
pub enabled: bool,
1818
#[doc = r" List of rules"]
1919
#[partial(bpaf(pure(Default::default()), optional, hide))]
2020
pub rules: Rules,
21-
# [doc = concat ! ("A list of Unix shell style patterns. The " , "splinter" , " will ignore files/folders that will match these patterns.")]
21+
#[doc = r" A list of Unix shell style patterns. The linter will ignore files/folders that will match these patterns."]
2222
#[partial(bpaf(hide))]
2323
pub ignore: StringSet,
24-
# [doc = concat ! ("A list of Unix shell style patterns. The " , "splinter" , " will include files/folders that will match these patterns.")]
24+
#[doc = r" A list of Unix shell style patterns. The linter will include files/folders that will match these patterns."]
2525
#[partial(bpaf(hide))]
2626
pub include: StringSet,
2727
}

justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ serve-docs:
108108
# to lint the queries.
109109
ready:
110110
git diff --exit-code --quiet
111+
cargo run -p xtask_codegen -- splinter
111112
cargo run -p xtask_codegen -- configuration
112113
cargo run -p docs_codegen
113114
cargo run -p xtask_codegen -- bindings
114-
cargo run -p xtask_codegen -- splinter
115115
cargo sqlx prepare --workspace
116116
just lint-fix
117117
just format

packages/@postgres-language-server/backend-jsonrpc/src/workspace.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,11 +381,11 @@ export interface PartialLinterConfiguration {
381381
*/
382382
enabled?: boolean;
383383
/**
384-
* A list of Unix shell style patterns. The formatter will ignore files/folders that will match these patterns.
384+
* A list of Unix shell style patterns. The linter will ignore files/folders that will match these patterns.
385385
*/
386386
ignore?: StringSet;
387387
/**
388-
* A list of Unix shell style patterns. The formatter will include files/folders that will match these patterns.
388+
* A list of Unix shell style patterns. The linter will include files/folders that will match these patterns.
389389
*/
390390
include?: StringSet;
391391
/**

packages/@postgrestools/backend-jsonrpc/src/workspace.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,11 +381,11 @@ export interface PartialLinterConfiguration {
381381
*/
382382
enabled?: boolean;
383383
/**
384-
* A list of Unix shell style patterns. The formatter will ignore files/folders that will match these patterns.
384+
* A list of Unix shell style patterns. The linter will ignore files/folders that will match these patterns.
385385
*/
386386
ignore?: StringSet;
387387
/**
388-
* A list of Unix shell style patterns. The formatter will include files/folders that will match these patterns.
388+
* A list of Unix shell style patterns. The linter will include files/folders that will match these patterns.
389389
*/
390390
include?: StringSet;
391391
/**

xtask/codegen/src/generate_configuration.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ fn generate_lint_mod_file(tool: &ToolConfig) -> String {
174174
let partial_config_struct = Ident::new(&tool.partial_config_struct_name(), Span::call_site());
175175
let generated_file = tool.generated_file().trim_end_matches(".rs");
176176
let generated_file_ident = Ident::new(generated_file, Span::call_site());
177-
let tool_name = tool.name;
178177

179178
let content = quote! {
180179
//! Generated file, do not edit by hand, see `xtask/codegen`
@@ -192,19 +191,19 @@ fn generate_lint_mod_file(tool: &ToolConfig) -> String {
192191
#[partial(cfg_attr(feature = "schema", derive(schemars::JsonSchema)))]
193192
#[partial(serde(rename_all = "camelCase", default, deny_unknown_fields))]
194193
pub struct #config_struct {
195-
#[doc = concat!("if `false`, it disables the feature and the ", #tool_name, " won't be executed. `true` by default")]
194+
/// if `false`, it disables the feature and the linter won't be executed. `true` by default
196195
#[partial(bpaf(hide))]
197196
pub enabled: bool,
198197

199198
/// List of rules
200199
#[partial(bpaf(pure(Default::default()), optional, hide))]
201200
pub rules: Rules,
202201

203-
#[doc = concat!("A list of Unix shell style patterns. The ", #tool_name, " will ignore files/folders that will match these patterns.")]
202+
/// A list of Unix shell style patterns. The linter will ignore files/folders that will match these patterns.
204203
#[partial(bpaf(hide))]
205204
pub ignore: StringSet,
206205

207-
#[doc = concat!("A list of Unix shell style patterns. The ", #tool_name, " will include files/folders that will match these patterns.")]
206+
/// A list of Unix shell style patterns. The linter will include files/folders that will match these patterns.
208207
#[partial(bpaf(hide))]
209208
pub include: StringSet,
210209
}

0 commit comments

Comments
 (0)