Merge pull request #32 from MahdiBM/mmbm-add-on-type-formatting

Add on-type formatting support after hitting "return" on non-empty lines
vknabel · Dec 22, 2023 · 4e1e5d8 · 4e1e5d8
2 parents 33a5346 + 4a76b5e
commit 4e1e5d8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/SwiftFormatEditProvider.ts b/src/SwiftFormatEditProvider.ts
@@ -105,7 +105,8 @@ function format(request: {
 export class SwiftFormatEditProvider
   implements
     vscode.DocumentRangeFormattingEditProvider,
-    vscode.DocumentFormattingEditProvider
+    vscode.DocumentFormattingEditProvider,
+    vscode.OnTypeFormattingEditProvider
 {
   provideDocumentRangeFormattingEdits(
     document: vscode.TextDocument,
@@ -125,4 +126,16 @@ export class SwiftFormatEditProvider
   ) {
     return format({ document, formatting });
   }
+  provideOnTypeFormattingEdits(
+    document: vscode.TextDocument,
+    position: vscode.Position,
+    ch: string,
+    formatting: vscode.FormattingOptions,
+  ) {
+    // Don't format if user has inserted an empty line
+    if (document.lineAt(position.line).text.trim() === "") {
+      return [];
+    }
+    return format({ document, formatting });
+  }
 }
diff --git a/src/extension.ts b/src/extension.ts
@@ -26,6 +26,11 @@ export function activate(context: vscode.ExtensionContext) {
       swiftSelector,
       editProvider,
     );
+    vscode.languages.registerOnTypeFormattingEditProvider(
+      swiftSelector,
+      editProvider,
+      "\n",
+    );
   });
 }