From d74454456c17fc82519ad5268ff7d65f84d9e187 Mon Sep 17 00:00:00 2001 From: Andy Sutherland Date: Thu, 2 Nov 2023 14:54:56 +0000 Subject: [PATCH 1/3] Add new option: keepNewline --- README.md | 1 + package.json | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/README.md b/README.md index 88f5c1d..c40a734 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ This extension has the following configuration settings: * `pgFormatter.noComment` - Remove any comments (Default: `false`) * `pgFormatter.noGrouping` - Add a newline between statements in transaction regroupement (Default: `false`) * `pgFormatter.noExtraLine` - Do not add an extra empty line at end of the output (Default: `false`) +* `pgFormatter.keepNewline` - Preserve empty line in plpgsql code (Default: `false`) * `pgFormatter.functionCase` - Case of the function names (Options: ["unchanged", "lowercase", "uppercase", "capitalize"]; Default: `"unchanged"`) * `pgFormatter.keywordCase` - Case used for reserved keywords (Options: ["unchanged", "lowercase", "uppercase", "capitalize"]; Default: `"uppercase"`) * `pgFormatter.typeCase` - Case used for data types (Options: ["unchanged", "lowercase", "uppercase", "capitalize"]; Default: `"lowercase"`) diff --git a/package.json b/package.json index db34cd5..0aa87a6 100644 --- a/package.json +++ b/package.json @@ -110,6 +110,11 @@ "default": false, "description": "Do not add an extra empty line at end of the file" }, + "pgFormatter.keepNewline": { + "type": "boolean", + "default": false, + "description": "Preserve empty line in plpgsql code" + }, "pgFormatter.functionCase": { "type": "string", "default": "unchanged", From ebffd6f0eeb10e95c5ce3dbc9cb32873dca3dc60 Mon Sep 17 00:00:00 2001 From: Andy Sutherland Date: Thu, 2 Nov 2023 15:22:14 +0000 Subject: [PATCH 2/3] Addressed comments --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0aa87a6..305db90 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "pgFormatter.keepNewline": { "type": "boolean", "default": false, - "description": "Preserve empty line in plpgsql code" + "description": "Preserve empty lines" }, "pgFormatter.functionCase": { "type": "string", @@ -214,6 +214,6 @@ "vscode-test": "^1.5.0" }, "dependencies": { - "psqlformat": "1.20.0" + "psqlformat": "1.21.0" } } From 2d0d5e073dc54202097b7a4a124595df81bcea2f Mon Sep 17 00:00:00 2001 From: Brady Holt Date: Fri, 3 Nov 2023 12:03:15 -0500 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c40a734..6020804 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ This extension has the following configuration settings: * `pgFormatter.noComment` - Remove any comments (Default: `false`) * `pgFormatter.noGrouping` - Add a newline between statements in transaction regroupement (Default: `false`) * `pgFormatter.noExtraLine` - Do not add an extra empty line at end of the output (Default: `false`) -* `pgFormatter.keepNewline` - Preserve empty line in plpgsql code (Default: `false`) +* `pgFormatter.keepNewline` - Preserve empty lines (Default: `false`) * `pgFormatter.functionCase` - Case of the function names (Options: ["unchanged", "lowercase", "uppercase", "capitalize"]; Default: `"unchanged"`) * `pgFormatter.keywordCase` - Case used for reserved keywords (Options: ["unchanged", "lowercase", "uppercase", "capitalize"]; Default: `"uppercase"`) * `pgFormatter.typeCase` - Case used for data types (Options: ["unchanged", "lowercase", "uppercase", "capitalize"]; Default: `"lowercase"`)