Formatter settings

Signed-off-by: worksofliam <[email protected]>
codefori · Sep 21, 2024 · 296a251 · 296a251
1 parent 4b89edc
commit 296a251
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/contributes.json b/src/contributes.json
@@ -30,30 +30,30 @@
         "properties": {
           "vscode-db2i.sqlFormat.identifierCase": {
             "type": "string",
-            "description": "SQL identifiers",
+            "description": "Format SQL identifiers into a certain case",
             "default": "preserve",
             "enum": [
               "lower",
               "upper",
               "preserve"
-            ],
-            "enumDescriptions": [
-              "Format SQL identifiers in lowercase",
-              "Format SQL identifiers in uppercase",
-              "Preserve the current formatting of SQL identifiers"
             ]
           },
           "vscode-db2i.sqlFormat.keywordCase": {
             "type": "string",
-            "description": "SQL keywords",
+            "description": "Format SQL keywords into a certain case",
             "default": "lower",
             "enum": [
               "lower",
               "upper"
-            ],
-            "enumDescriptions": [
-              "Format reserved SQL keywords in lowercase",
-              "Format reserved SQL keywords in uppercase"
+            ]
+          },
+          "vscode-db2i.sqlFormat.spaceBetweenStatements": {
+            "type": "string",
+            "description": "Add space between statements.",
+            "default": "true",
+            "enum": [
+              "true",
+              "false"
             ]
           }
         }

diff --git a/src/language/providers/formatProvider.ts b/src/language/providers/formatProvider.ts
@@ -7,13 +7,14 @@ export const formatProvider = languages.registerDocumentFormattingEditProvider({
   async provideDocumentFormattingEdits(document, options, token) {
     const identifierCase: CaseOptions = <CaseOptions>(Configuration.get(`sqlFormat.identifierCase`) || `preserve`);
     const keywordCase: CaseOptions = <CaseOptions>(Configuration.get(`sqlFormat.keywordCase`) || `lower`);
+    const spaceBetweenStatements: string = (Configuration.get(`sqlFormat.spaceBetweenStatements`) || `false`);
     const formatted = formatSql(
       document.getText(), 
       {
         indentWidth: options.tabSize,
-        identifierCase: identifierCase,
-        keywordCase: keywordCase,
-        spaceBetweenStatements: true
+        identifierCase,
+        keywordCase,
+        spaceBetweenStatements: spaceBetweenStatements === `true`
       }
     );