Merge pull request #7 from belian-earth:format-on-save

Format-on-save

Author: h-a-graham

README.md

@@ -28,6 +28,7 @@ Write DuckDB SQL with full IDE support right inside R strings. Take full advanta
 -   🔌 **R Connection Picker** - Select specific connection objects (supports `:memory:`)
 -   🔄 **Auto-Refresh** - Detects schema changes automatically
 -   🌈 **Visual Distinction** - Themed background colors for SQL strings
+-   ✨ **SQL Auto-Format** - Format SQL with glue interpolation support
 -   ✈️ **Air Formatter Support** - Works with multi-line SQL
 
 ------------------------------------------------------------------------
@@ -105,15 +106,19 @@ Optional settings (`.vscode/settings.json`):
 {
   "duckdb-r-editor.defaultExtensions": ["spatial", "httpfs"],
   "duckdb-r-editor.autoRefreshSchema": true,
-  "duckdb-r-editor.useSemanticHighlighting": true
+  "duckdb-r-editor.useSemanticHighlighting": true,
+  "duckdb-r-editor.sqlFormattingStyle": "standard",
+  "duckdb-r-editor.sqlKeywordCase": "upper"
 }
 ```
 
-**Available Settings:** 
+**Available Settings:**
 - `enableAutoComplete` - Enable autocomplete (default: true)
--   `useSemanticHighlighting` - syntax highlighting (default: true)
--  `defaultExtensions` - Extensions to auto-load (default: \[\])
--  `autoRefreshSchema` - Auto-detect schema changes (default: true)
+- `useSemanticHighlighting` - Syntax highlighting (default: true)
+- `defaultExtensions` - Extensions to auto-load (default: \[\])
+- `autoRefreshSchema` - Auto-detect schema changes (default: true)
+- `sqlFormattingStyle` - Format style: `standard`, `tabularLeft`, `tabularRight` (default: standard)
+- `sqlKeywordCase` - Keyword case: `preserve`, `upper`, `lower` (default: preserve)
 
 ------------------------------------------------------------------------
 
@@ -124,6 +129,7 @@ Access via Command Palette (`Cmd/Ctrl + Shift + P`):
 -   **Connect to DuckDB Database** - Select R connection for schema
 -   **Disconnect from Database** - Clear connection
 -   **Refresh DuckDB Schema** - Manually update schema
+-   **Format SQL String** - Format SQL at cursor (preserves glue interpolations)
 -   **Load DuckDB Extension (One-Time)** - Load official extension until restart
 
 ------------------------------------------------------------------------

package-lock.json

@@ -2,7 +2,7 @@
   "name": "duckdb-r-editor",
   "displayName": "DuckDB R Editor (Positron)",
   "description": "Positron-exclusive SQL editor for R. Queries your active R DuckDB connection for schema - no file locking! 900+ DuckDB functions with intelligent autocomplete.",
-  "version": "0.6.4",
+  "version": "0.7.0",
   "publisher": "belian-earth",
   "license": "MIT",
   "repository": {
@@ -67,6 +67,36 @@
           "type": "boolean",
           "default": true,
           "description": "Automatically refresh schema when R code references the connection object. Keeps autocomplete in sync with database changes without manual refresh commands."
+        },
+        "duckdb-r-editor.sqlFormattingStyle": {
+          "type": "string",
+          "enum": [
+            "standard",
+            "tabularLeft",
+            "tabularRight"
+          ],
+          "default": "standard",
+          "description": "SQL formatting style. 'standard': traditional formatting, 'tabularLeft': align keywords to the left, 'tabularRight': align keywords to the right.",
+          "enumDescriptions": [
+            "Traditional SQL formatting with standard indentation",
+            "Tabular format with keywords aligned to the left",
+            "Tabular format with keywords aligned to the right"
+          ]
+        },
+        "duckdb-r-editor.sqlKeywordCase": {
+          "type": "string",
+          "enum": [
+            "preserve",
+            "upper",
+            "lower"
+          ],
+          "default": "preserve",
+          "description": "Transform SQL keyword casing. 'preserve': keep original case, 'upper': convert to UPPERCASE, 'lower': convert to lowercase.",
+          "enumDescriptions": [
+            "Keep original keyword casing",
+            "Convert keywords to UPPERCASE",
+            "Convert keywords to lowercase"
+          ]
         }
       }
     },
@@ -86,6 +116,10 @@
       {
         "command": "duckdb-r-editor.loadExtension",
         "title": "DuckDB R Editor: Load DuckDB Extension (One-Time)"
+      },
+      {
+        "command": "duckdb-r-editor.formatSQL",
+        "title": "DuckDB R Editor: Format SQL in R String"
       }
     ]
   },
@@ -114,6 +148,7 @@
   },
   "dependencies": {
     "@posit-dev/positron": "^0.2.2",
-    "duckdb": "^0.10.0"
+    "duckdb": "^0.10.0",
+    "sql-formatter": "^15.7.0"
   }
-}
+}

package.json

@@ -15,6 +15,7 @@ import { RCodeExecutor } from './utils/rCodeExecutor';
 import { EXTENSION_ID, OUTPUT_CHANNEL_NAME, TIMING } from './constants';
 import { getErrorMessage, isErrorType } from './utils/errorHandler';
 import { RCodeTemplates } from './utils/rCodeTemplates';
+import { SQLFormatter } from './utils/sqlFormatter';
 
 // Module-level state
 let schemaProvider: PositronSchemaProvider | undefined;
@@ -278,6 +279,24 @@ export async function activate(context: vscode.ExtensionContext) {
     }
   );
 
+  const formatSQLCommand = vscode.commands.registerCommand(
+    'duckdb-r-editor.formatSQL',
+    async () => {
+      const editor = vscode.window.activeTextEditor;
+      if (!editor) {
+        vscode.window.showWarningMessage('No active text editor');
+        return;
+      }
+
+      if (editor.document.languageId !== 'r') {
+        vscode.window.showWarningMessage('SQL formatting is only available in R files');
+        return;
+      }
+
+      await SQLFormatter.formatSQLAtCursor(editor.document, editor.selection.active);
+    }
+  );
+
   // Register diagnostic provider
   context.subscriptions.push(
     vscode.languages.registerCodeActionsProvider(
@@ -315,7 +334,8 @@ export async function activate(context: vscode.ExtensionContext) {
     connectCommand,
     disconnectCommand,
     refreshSchemaCommand,
-    loadExtensionCommand
+    loadExtensionCommand,
+    formatSQLCommand
   );
 
   // Setup auto-refresh on code execution